changed date checking code

put sh/debug back to priv 9

diff --git a/Changes b/Changes
index 7c93f082b488e781518b228cb314f5ca011867e2..04752f0e29c217dd964885da1155a5c85c2ea36e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,8 @@
+25Aug99=======================================================================
+1. check the date of a WWV much more carefully.
+24Aug99=======================================================================
+1. Prevented spots with lowercase callsigns being forwarded. This opens a
+much bigger can of worms which I shall have to address later.
 17Aug99=======================================================================
 1. all protocol except PC29 containing %XX characters will be dumped.
 2. Changed console.pl so that if you start typing it moves the top window

diff --git a/cmd/show/debug.pl b/cmd/show/debug.pl
index 0d560a4e8cdb4e03958aba847633e43fe31d0d3f..1c496dab0f4f48637fcf162d86aa6e8483eec19e 100644 (file)
--- a/cmd/show/debug.pl
+++ b/cmd/show/debug.pl
@@ -7,7 +7,7 @@
 use DXDebug;
 
 my $self = shift;
-#return (0) if ($self->priv < 9); # only console users allowed
+return (0) if ($self->priv < 9); # only console users allowed
 
 my $set = join ' ', dbglist();   # generate space delimited list
 

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ebc23561dae10ac0c7cf4760836870b96b01cbd9..b8ac3ead62ddc313c35edf2ef04fb91d220ffba2 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -28,13 +28,14 @@ use Local;
 use Carp;
 
 use strict;
-use vars qw($me $pc11_max_age $pc11_dup_age $pc23_dup_age 
-                       %spotdup %wwvdup $last_hour %pings %rcmds 
+use vars qw($me $pc11_max_age $pc23_max_age $pc11_dup_age $pc23_dup_age
+                       %spotdup %wwvdup $last_hour %pings %rcmds
                        %nodehops @baddx $baddxfn $pc12_dup_age
                        %anndup $allowzero);
 
 $me = undef;                                   # the channel id for this cluster
 $pc11_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc11
+$pc23_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc23
 $pc11_dup_age = 24*3600;               # the maximum time to keep the spot dup list for
 $pc23_dup_age = 24*3600;               # the maximum time to keep the wwv dup list for
 $pc12_dup_age = 24*3600;               # the maximum time to keep the ann dup list for
@@ -512,7 +513,7 @@ sub normal
                                dbg('chan', "Dup WWV Spot ignored\n");
                                return;
                        }
-                       if ($d > $main::systime + 900 || $field[2] < 0 || $field[2] > 23) {
+                       if ($d < $main::systime - $pc23_max_age || $d > $main::systime + 900 || $field[2] < 0 || $field[2] > 23) {
                                dbg('chan', "WWV Date ($field[1] $field[2]) out of range");
                                return;
                        }