X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=c1fad11126edbc072d6681e71a70834ef5856f8e;hb=d5b4190c36f130852973121042876af3c5642cd7;hp=655da52b20ba2e45e1870593036854c74c9e6923;hpb=cce161221036760959ff1d0b7628a55942bf558a;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 655da52b..c1fad111 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -21,15 +21,18 @@ use DXCommandmode;
 use DXLog;
 use Spot;
 use DXProtout;
+use DXDebug;
 use Carp;
 
 use strict;
-use vars qw($me $pc11_max_age $pc11_dup_age %dup $last_hour %pings %rcmds %nodehops);
+use vars qw($me $pc11_max_age $pc11_dup_age $pc23_dup_age %spotdup %wwvdup $last_hour %pings %rcmds %nodehops);
 
 $me = undef;					# the channel id for this cluster
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
-$pc11_dup_age = 24*3600;		# the maximum time to keep the dup list for
-%dup = ();						# the pc11 and 26 dup hash 
+$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
+%spotdup = ();				    # the pc11 and 26 dup hash 
+%wwvdup = ();				    # the pc23 and 27 dup hash 
 $last_hour = time;				# last time I did an hourly periodic update
 %pings = ();                    # outstanding ping requests outbound
 %rcmds = ();                    # outstanding rcmd requests outbound
@@ -46,6 +49,24 @@ sub init
 	do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
 	confess $@ if $@;
 	#  $me->{sort} = 'M';    # M for me
+
+	# now prime the spot duplicates file with today's and yesterday's data
+    my @today = Julian::unixtoj(time);
+	my @spots = Spot::readfile(@today);
+	@today = Julian::sub(@today, 1);
+	push @spots, Spot::readfile(@today);
+	for (@spots) {
+		my $dupkey = "$_->[0]$_->[1]$_->[2]$_->[3]$_->[4]";
+		$spotdup{$dupkey} = $_->[2];
+	}
+
+	# now prime the wwv duplicates file with just this month's data
+	my @wwv = Geomag::readfile(time);
+	for (@wwv) {
+		my $dupkey = "$_->[1].$_->[2]$_->[3]$_->[4]";
+		$wwvdup{$dupkey} = $_->[1];
+	}
+
 }
 
 #
@@ -133,8 +154,12 @@ sub normal
 			
 			# convert the date to a unix date
 			my $d = cltounix($field[3], $field[4]);
-			return if !$d || ($pcno == 11 && $d < $main::systime - $pc11_max_age); # bang out (and don't pass on) if date is invalid or the spot is too old
-			
+			# bang out (and don't pass on) if date is invalid or the spot is too old
+			if (!$d || ($pcno == 11 && $d < $main::systime - $pc11_max_age)) {
+				dbg('chan', "Spot ignored, invalid date or too old\n");
+				return;
+			}
+
 			# strip off the leading & trailing spaces from the comment
 			my $text = unpad($field[5]);
 			
@@ -143,17 +168,25 @@ sub normal
 			$spotter =~ s/-\d+$//o;	# strip off the ssid from the spotter
 			
 			# do some de-duping
-			my $dupkey = "$field[1]$field[2]$d$text$field[6]";
-			return if $dup{$dupkey};
-			$dup{$dupkey} = $d;
+			my $freq = $field[1] - 0;
+			my $dupkey = "$freq$field[2]$d$text$spotter";
+			if ($spotdup{$dupkey}) {
+				dbg('chan', "Duplicate Spot ignored\n");
+				return;
+			}
+			
+			$spotdup{$dupkey} = $d;
 			
-			my $spot = Spot::add($field[1], $field[2], $d, $text, $spotter);
+			my $spot = Spot::add($freq, $field[2], $d, $text, $spotter);
 			
 			# send orf to the users
 			if ($spot && $pcno == 11) {
 				my $buf = Spot::formatb($field[1], $field[2], $d, $text, $spotter);
 				broadcast_users("$buf\a\a");
 			}
+
+			# DON'T be silly and send on PC26s!
+			return if $pcno == 26;
 			
 			last SWITCH;
 		}
@@ -250,7 +283,7 @@ sub normal
 			$self->send_local_config();
 			$self->send(pc20());
 			$self->state('init');	
-			last SWITCH;
+			return;             # we don't pass these on
 		}
 		
 		if ($pcno == 19) {		# incoming cluster list
@@ -320,7 +353,23 @@ sub normal
 		}
 		
 		if ($pcno == 23 || $pcno == 27) { # WWV info
-			Geomag::update(@field[1..$#field]);
+			# do some de-duping
+			my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
+			my $sfi = unpad($field[3]);
+			my $k = unpad($field[4]);
+			my $i = unpad($field[5]);
+			my $dupkey = "$d.$sfi$k$i";
+			if ($wwvdup{$dupkey}) {
+				dbg('chan', "Dup WWV Spot ignored\n");
+				return;
+			}
+			
+			$wwvdup{$dupkey} = $d;
+			Geomag::update($field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
+
+			# DON'T be silly and send on PC27s!
+			return if $pcno == 27;
+			
 			last SWITCH;
 		}
 		
@@ -504,8 +553,12 @@ sub process
 	my $cutoff;
 	if ($main::systime - 3600 > $last_hour) {
 		$cutoff  = $main::systime - $pc11_dup_age;
-		while (($key, $val) = each %dup) {
-			delete $dup{$key} if $val < $cutoff;
+		while (($key, $val) = each %spotdup) {
+			delete $spotdup{$key} if $val < $cutoff;
+		}
+		$cutoff = $main::systime - $pc23_dup_age;
+		while (($key, $val) = each %wwvdup) {
+			delete $wwvdup{$key} if $val < $cutoff;
 		}
 		$last_hour = $main::systime;
 	}
@@ -529,8 +582,8 @@ sub finish
 	my $node;
 	
 	foreach $node (@gonenodes) {
-		next if $node->call eq $call; 
-		broadcast_ak1a(pc21($node->call, 'Gone'), $self) unless $self->{isolate}; # done like this 'cos DXNodes don't have a pc21 method
+		next if $node->call eq $call;
+		broadcast_ak1a(pc21($node->call, 'Gone') , $self) unless $self->{isolate}; 
 		$node->del();
 	}
 
@@ -566,7 +619,7 @@ sub send_local_config
 	my @s = $me->pc19(@nodes);
 	for (@s) {
 		my $routeit = adjust_hops($self, $_);
-		$self->send($_) if $routeit;
+		$self->send($routeit) if $routeit;
 	}
 	
 	# get all the users connected on the above nodes and send them out
@@ -575,7 +628,7 @@ sub send_local_config
 		my @s = pc16($n, @users);
 		for (@s) {
 			my $routeit = adjust_hops($self, $_);
-			$self->send($_) if $routeit;
+			$self->send($routeit) if $routeit;
 		}
 	}
 }
@@ -595,7 +648,7 @@ sub route
 		if ($dxchan) {
 			my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
 			if ($routeit) {
-				$dxchan->send($line) if $dxchan;
+				$dxchan->send($routeit) if $dxchan;
 			}
 		}
 	}
@@ -612,8 +665,8 @@ sub broadcast_ak1a
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	foreach $dxchan (@dxchan) {
 		next if grep $dxchan == $_, @except;
-		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name       
-		$dxchan->send($s) unless $dxchan->{isolate} || !$routeit; 
+		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
+		$dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
 	}
 }
 
@@ -701,28 +754,29 @@ sub get_hops
 sub adjust_hops
 {
 	my $self = shift;
+	my $s = shift;
 	my $call = $self->{call};
 	my $hops;
 	
-	if (($hops) = $_[0] =~ /\^H(\d+)\^~?$/o) {
-		my ($pcno) = $_[0] =~ /^PC(\d\d)/o;
-		confess "$call called adjust_hops with '$_[0]'" unless $pcno;
+	if (($hops) = $s =~ /\^H(\d+)\^~?$/o) {
+		my ($pcno) = $s =~ /^PC(\d\d)/o;
+		confess "$call called adjust_hops with '$s'" unless $pcno;
 		my $ref = $nodehops{$call} if %nodehops;
 		if ($ref) {
 			my $newhops = $ref->{$pcno};
-			return 0 if defined $newhops && $newhops == 0;
+			return "" if defined $newhops && $newhops == 0;
 			$newhops = $ref->{default} unless $newhops;
-			return 0 if defined $newhops && $newhops == 0;
+			return "" if defined $newhops && $newhops == 0;
 			$newhops = $hops if !$newhops;
-			$_[0] =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
+			$s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
 		} else {
 			# simply decrement it
 			$hops--;
-			return 0 if !$hops;
-			$_[0] =~ s/\^H(\d+)(\^~?)$/\^H$hops$2/ if $hops;
+			return "" if !$hops;
+			$s =~ s/\^H(\d+)(\^~?)$/\^H$hops$2/ if $hops;
 		}
 	}
-	return 1;
+	return $s;
 }
 
 #