X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=b6f4473d5c7bf2f1e75da328621a7a021a173fb0;hb=3ed951e9fca6c101034a791cfd815f97eb22252d;hp=eea43772deb4f06eb0826c779abbf98959257259;hpb=be8bb8ddece08d2893896418423a95548cbf316f;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index eea43772..b6f4473d 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -2,7 +2,7 @@
 #
 # This module impliments the handlers for the protocal mode for a dx cluster
 #
-# Copyright (c) 1998-2006 Dirk Koopman G1TLH
+# Copyright (c) 1998-2007 Dirk Koopman G1TLH
 #
 #
 #
@@ -43,16 +43,20 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			$investigation_int $pc19_version $myprot_version
 			%nodehops $baddx $badspotter $badnode $censorpc
 			$allowzero $decode_dk0wcy $send_opernam @checklist
-			$eph_pc15_restime $pc9x_past_age $pc9x_future_age
+			$eph_pc15_restime $pc9x_past_age $pc9x_dupe_age
 			$pc10_dupe_age $pc92_slug_changes $last_pc92_slug
+			$pc92Ain $pc92Cin $pc92Din $pc92Kin $pc9x_time_tolerance
 		   );
 
-$pc9x_past_age = 62*60;			# maximum age in the past of a px9x (a config record might be the only
-								# thing a node might send - once an hour)
-$pc9x_future_age = 2*3600;		# maximum age in the future ditto
+$pc9x_dupe_age = 60;			# catch loops of circular (usually) D records
 $pc10_dupe_age = 45;			# just something to catch duplicate PC10->PC93 conversions
 $pc92_slug_changes = 60;		# slug any changes going outward for this long
 $last_pc92_slug = 0;			# the last time we sent out any delayed add or del PC92s
+$pc9x_time_tolerance = 15*60;	# the time on a pc9x is allowed to be out by this amount
+$pc9x_past_age = (122*60)+		# maximum age in the past of a px9x (a config record might be the only
+	$pc9x_time_tolerance;		# thing a node might send - once an hour and we allow an extra hour for luck)
+                                # this is actually the partition between "yesterday" and "today" but old.
+
 
 # incoming talk commands
 sub handle_10
@@ -1477,6 +1481,21 @@ sub check_pc9x_t
 	my $pc = shift;
 	my $create = shift;
 
+	# check that the time is between 0 >= $t < 86400
+	unless ($t >= 0 && $t < 86400) {
+		dbg("PCPROT: time invalid t: $t, ignored") if isdbg('chanerr');
+		return undef;
+	}
+
+	# check that the time of this pc9x is within tolerance (default 15 mins either way)
+	my $now = $main::systime - $main::systime_daystart ;
+	my $diff = abs($now - $t);
+	unless ($diff < $pc9x_time_tolerance || 86400 - $diff < $pc9x_time_tolerance) {
+		my $c = ref $call ? $call->call : $call;
+		dbg("PC9XERR: $c time out of range t: $t now: $now diff: $diff > $pc9x_time_tolerance, ignored") if isdbg('chan');
+		return undef;
+	}
+
 	my $parent = ref $call ? $call : Route::Node::get($call);
 	if ($parent) {
 		# we only do this for external calls whose routing table
@@ -1488,26 +1507,38 @@ sub check_pc9x_t
 			my $lastid = $parent->lastid;
 			if (defined $lastid) {
 				if ($t < $lastid) {
-					if ($t+86400-$lastid > $pc9x_past_age) {
-						dbg("PCPROT: dup id on $t <= lastid $lastid, ignored") if isdbg('chanerr');
-						return;
+					# note that this is where we determine whether this pc9x has come in yesterday
+					# but is still greater (modulo 86400) than the lastid or is simply an old
+					# duplicate sentence. To determine this we need to do some module 86400
+					# arithmetic. High numbers mean that this is an old duplicate sentence,
+					# low numbers that it is a new sentence.
+					#
+					# Typically you will see yesterday being taken on $t = 84, $lastid = 86235
+					# and old dupes with $t = 234, $lastid = 256 (which give answers 249 and
+					# 86378 respectively in the calculation below).
+					#
+					if (($t-$lastid)%86400 > $pc9x_past_age) {
+						dbg("PCPROT: dup id on $t <= lastid $lastid, ignored") if isdbg('chanerr') || isdbg('pc92dedupe');
+						return undef;
 					}
 				} elsif ($t == $lastid) {
-					dbg("PCPROT: dup id on $t == lastid $lastid, ignored") if isdbg('chanerr');
-					return;
-				} else {
-					# $t > $lastid, check that the timestamp offered isn't too far away from 'now'
-					if ($t-$lastid > $pc9x_future_age ) {
-						dbg("PCPROT: id $t too far in the future of lastid $lastid, ignored") if isdbg('chanerr');
-						return;
-					}
+					dbg("PCPROT: dup id on $t == lastid $lastid, ignored") if isdbg('chanerr') || isdbg('pc92dedupe');
+					return undef;
 				}
 			}
 		}
 	} elsif ($create) {
 		$parent = Route::Node->new($call);
+	} else {
+		return undef;
 	}
-	$parent->lastid($t) if $parent;
+	if (isdbg('pc92dedupe')) {
+		my $exists = exists $parent->{lastid}; # naughty, naughty :-)
+		my $val = $parent->{lastid};
+		my $s = $exists ? (defined $val ? $val : 'exists/undef') : 'undef';
+		dbg("PCPROT: $call pc92 id lastid $s -> $t");
+	}
+	$parent->lastid($t);
 
 	return $parent;
 }
@@ -1578,6 +1609,11 @@ sub handle_92
 	my $t = $_[2];
 	my $sort = $_[3];
 
+	# this catches loops of A/Ds
+#	if (eph_dup($line, $pc9x_dupe_age)) {
+#		return;
+#	}
+
 	if ($pcall eq $main::mycall) {
 		dbg("PCPROT: looped back, ignored") if isdbg('chanerr');
 		return;
@@ -1601,7 +1637,9 @@ sub handle_92
 		return;
 	}
 
-	my $parent = check_pc9x_t($pcall, $t, 92, 1) || return;
+	# don't create routing entries for D records that don't already exist
+	# this is what causes all those PC92 loops!
+	my $parent = check_pc9x_t($pcall, $t, 92, $sort ne 'D') || return;
 	my $oparent = $parent;
 
 	$parent->do_pc9x(1);
@@ -1651,6 +1689,8 @@ sub handle_92
 		}
 
 	} elsif ($sort eq 'K') {
+		$pc92Kin += length $line if $sort eq 'K';
+
 		# remember the last channel we arrived on
 		$parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
 
@@ -1664,10 +1704,17 @@ sub handle_92
 
 			push @radd, $add if $add;
 			$parent->reset_obs;
+			$parent->version($ent[4]) if $ent[4];
+			$parent->build($ent[5]) if $ent[5];
+
 			dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
 		}
 	} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
 
+		$pc92Ain += length $line if $sort eq 'A';
+		$pc92Cin += length $line if $sort eq 'C';
+		$pc92Din += length $line if $sort eq 'D';
+
 		# remember the last channel we arrived on
 		$parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;