X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=01b64372b8d4d1cf55847b76d229fea3b65e984c;hb=61cdf7dc2b72c1898850a4d2aa403d712f22f8ee;hp=15466e361e5db907e3ad653fa15e9d7191d0b651;hpb=97d5445b1e468d9228367640421b2f90ac021224;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 15466e36..01b64372 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -21,15 +21,20 @@ use DXCommandmode;
 use DXLog;
 use Spot;
 use DXProtout;
+use DXDebug;
+use Local;
+
 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 +51,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];
+	}
+
 }
 
 #
@@ -97,8 +120,11 @@ sub start
 sub normal
 {
 	my ($self, $line) = @_;
-	my @field = split /[\^\~]/, $line;
+	my @field = split /\^/, $line;
+	pop @field if $field[-1] eq '~';
 	
+#	print join(',', @field), "\n";
+						
 	# ignore any lines that don't start with PC
 	return if !$field[0] =~ /^PC/;
 	
@@ -107,6 +133,14 @@ sub normal
 	return unless $pcno;
 	return if $pcno < 10 || $pcno > 51;
 	
+	# local processing 1
+	my $pcr;
+	eval {
+		$pcr = Local::pcprot($self, $pcno, @field);
+	};
+	dbg('local', "Local::pcprot error $@") if $@;
+	return if $pcr;
+	
  SWITCH: {
 		if ($pcno == 10) {		# incoming talk
 			
@@ -135,7 +169,7 @@ sub normal
 			my $d = cltounix($field[3], $field[4]);
 			# 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");
+				dbg('chan', "Spot ignored, invalid date or too old\n");
 				return;
 			}
 
@@ -147,21 +181,33 @@ 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]";
-			if ($dup{$dupkey}) {
-				dbg('chan', "Duplicate Spot ignored");
+			my $freq = $field[1] - 0;
+			my $dupkey = "$freq$field[2]$d$text$spotter";
+			if ($spotdup{$dupkey}) {
+				dbg('chan', "Duplicate Spot ignored\n");
 				return;
 			}
 			
-			$dup{$dupkey} = $d;
+			$spotdup{$dupkey} = $d;
 			
-			my $spot = Spot::add($field[1], $field[2], $d, $text, $spotter);
+			my $spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
 			
+			# local processing 
+			my $r;
+			eval {
+				$r = Local::spot1($self, $freq, $field[2], $d, $text, $spotter, $field[7]);
+			};
+			dbg('local', "Local::spot1 error $@") if $@;
+			return if $r;
+
 			# 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;
 		}
@@ -219,12 +265,13 @@ sub normal
 		if ($pcno == 16) {		# add a user
 			my $node = DXCluster->get_exact($field[1]); 
 			last SWITCH if !$node; # ignore if havn't seen a PC19 for this one yet
+			last SWITCH unless $node->isa('DXNode');
 			my $i;
 			
 			
 			for ($i = 2; $i < $#field; $i++) {
-				my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (-) (\d)/o;
-				next if length $call < 3;
+				my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
+				next if length $call < 3 || length $call > 8;
 				next if !$confmode;
 				$call = uc $call;
 				next if DXCluster->get_exact($call); # we already have this (loop?)
@@ -328,7 +375,30 @@ 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]);
+
+			my $r;
+			eval {
+				$r = Local::wwv2($self, $field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
+			};
+			dbg('local', "Local::wwv2 error $@") if $@;
+			return if $r;
+
+			# DON'T be silly and send on PC27s!
+			return if $pcno == 27;
+			
 			last SWITCH;
 		}
 		
@@ -339,8 +409,32 @@ sub normal
 			last SWITCH;
 		}
 		
-		if ($pcno == 25) {
-			last SWITCH;
+		if ($pcno == 25) {      # merge request
+			unless ($field[1] eq $main::mycall) {
+				dbg('chan', "merge request to $field[1] from $field[2] ignored");
+				return;
+			}
+
+			Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[1]");
+			
+			# spots
+			if ($field[3] > 0) {
+				my @in = reverse Spot::search(1, undef, undef, 0, $field[3]-1);
+				my $in;
+				foreach $in (@in) {
+					$self->send(pc26(@{$in}[0..4], $in->[7]));
+				}
+			}
+
+			# wwv
+			if ($field[4] > 0) {
+				my @in = reverse Geomag::search(0, $field[4], time, 1);
+				my $in;
+				foreach $in (@in) {
+					$self->send(pc27(@{$in}));
+				}
+			}
+			return;
 		}
 		
 		if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
@@ -512,8 +606,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;
 	}