X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=11d37f259f473f1c3a01f7568bd1698a68f7012f;hb=87ba7daa22b255b3492fc697121928e85d901e0e;hp=78e0e0d1262a984052057cd3f872bf546b358394;hpb=3eb722692c2c1e9de84752391d5b6330e062c7e6;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 78e0e0d1..11d37f25 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -28,16 +28,18 @@ 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);
+			%anndup $allowzero, $pc12_dup_lth);
 
 $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
+$pc12_dup_age = 12*3600;		# the maximum time to keep the ann dup list for
+$pc12_dup_lth = 72;				# the length of ANN text to save for deduping 
 %spotdup = ();				    # the pc11 and 26 dup hash 
 %wwvdup = ();				    # the pc23 and 27 dup hash
 %anndup = ();                               # the PC12 dup hash
@@ -149,7 +151,13 @@ sub normal
 	my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
 	return unless $pcno;
 	return if $pcno < 10 || $pcno > 51;
-	
+
+	# dump bad protocol messages unless it is a PC29
+	if ($line =~ /\%[0-9A-F][0-9A-F]/o && $pcno != 29) {
+		dbg('chan', "CORRUPT protocol message - dumped");
+		return;
+	}
+
 	# local processing 1
 	my $pcr;
 	eval {
@@ -203,7 +211,7 @@ sub normal
 			
 			# store it away
 			my $spotter = $field[6];
-			$spotter =~ s/-\d+$//o;	# strip off the ssid from the spotter
+			$spotter =~ s/-[\@\d]+$//o;	# strip off the ssid from the spotter
 			
 			# do some de-duping
 			my $freq = $field[1] - 0;
@@ -220,6 +228,12 @@ sub normal
 				dbg('chan', "Bad DX spot, ignored");
 				return;
 			}
+
+			# are any of the crucial fields invalid?
+            if ($field[2] =~ /[a-z]/ || $field[6] =~ /[a-z]/ || $field[7] =~ /[a-z]/) {
+				dbg('chan', "Spot contains lower case callsigns, rejected");
+				return;
+			}
 			
 			my @spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
 
@@ -247,8 +261,8 @@ sub normal
 		}
 		
 		if ($pcno == 12) {		# announces
-		        # announce duplicate checking
-			my $text = uc unpad($field[3]);
+			# announce duplicate checking
+			my $text = substr(uc unpad($field[3]), 0, $pc12_dup_lth);
 			my $dupkey = $field[1].$field[2].$text.$field[4].$field[6];
 			if ($anndup{$dupkey}) {
 				dbg('chan', "Duplicate Announce ignored\n");
@@ -421,7 +435,7 @@ sub normal
 				
 				# unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect)
 				my $mref = DXMsg::get_busy($call);
-				$mref->stop_msg($self) if $mref;
+				$mref->stop_msg($call) if $mref;
 				
 				# add this station to the user database, if required (don't remove SSID from nodes)
 				my $user = DXUser->get_current($call);
@@ -437,8 +451,6 @@ sub normal
 				$user->put;
 			}
 			
-			# queue up any messages
-			DXMsg::queue_msg(0) if $self->state eq 'normal';
 			return if $newline eq "PC19^";
 
 			# add hop count 
@@ -451,10 +463,6 @@ sub normal
 			$self->send_local_config();
 			$self->send(pc22());
 			$self->state('normal');
-			
-			# queue mail
-			DXMsg::queue_msg(0);
-
 			return;
 		}
 		
@@ -483,12 +491,9 @@ sub normal
 		
 		if ($pcno == 22) {
 			$self->state('normal');
-			
-			# queue mail
-			DXMsg::queue_msg(0);
 			return;
 		}
-		
+				
 		if ($pcno == 23 || $pcno == 27) { # WWV info
 			
 			# route 'foreign' pc27s 
@@ -509,7 +514,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;
 			}
@@ -772,7 +777,7 @@ sub finish
 	
 	# unbusy and stop and outgoing mail
 	my $mref = DXMsg::get_busy($call);
-	$mref->stop_msg($self) if $mref;
+	$mref->stop_msg($call) if $mref;
 	
 	# broadcast to all other nodes that all the nodes connected to via me are gone
 	my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
@@ -808,7 +813,13 @@ sub send_dx_spot
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
 		my $routeit;
-		my ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} ) if $dxchan->{spotfilter};
+		my ($filter, $hops);
+
+		if ($dxchan->{spotfilter}) {
+		    ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} );
+			next unless $filter;
+		}
+		
 		if ($dxchan->is_ak1a) {
 			next if $dxchan == $self;
 			if ($hops) {