X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=9e5d249f33e9af00fed07ce032c3be65b4aafbab;hb=7e4d1632dbe6cb79a43e4954919c6744513fed56;hp=858ea00ebafc00a05a8c026c69927acd58feb808;hpb=9e5520826fe61fd3ac6941f2b8bf736a432eaa15;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 858ea00e..9e5d249f 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -32,7 +32,6 @@ use DXHash;
 use Route;
 use Route::Node;
 use Script;
-use Investigate;
 use RouteDB;
 
 
@@ -44,6 +43,7 @@ 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 $rspfcheck
 			$allowzero $decode_dk0wcy $send_opernam @checklist
+			$eph_pc15_restime
 		   );
 	
 # incoming talk commands
@@ -375,6 +375,22 @@ sub handle_12
 		$self->route($_[2], $line);
 	}
 }
+
+sub handle_15
+{
+	my $self = shift;
+	my $pcno = shift;
+	my $line = shift;
+	my $origin = shift;
+
+	if (eph_dup($line, $eph_pc15_restime)) {
+		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
+	} else {
+		unless ($self->{isolate}) {
+			DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me
+		}
+	}
+}
 		
 # incoming user		
 sub handle_16
@@ -473,8 +489,10 @@ sub handle_16
 		$user->lastin($main::systime) unless DXChannel::get($call);
 		$user->put;
 	}
-	$self->route_pc16($origin, $line, $parent, @rout) if @rout;
-	
+	if (@rout) {
+		$self->route_pc16($origin, $line, $parent, @rout);
+		$self->route_pc92a($main::mycall, undef, $parent, @rout);
+	}
 }
 		
 # remove a user
@@ -541,6 +559,7 @@ sub handle_17
 
 	$uref = Route->new($ucall) unless $uref; # throw away
 	$self->route_pc17($origin, $line, $parent, $uref);
+	$self->route_pc92d($main::mycall, undef, $parent, $uref);
 }
 		
 # link request
@@ -712,7 +731,7 @@ sub handle_19
 	if (@rout) {
 		$self->route_pc21($self->{call}, $line, @rout);
 		$self->route_pc19($self->{call}, $line, @rout);
-		$self->route_pc92a($main::mycall, $line, @rout);
+		$self->route_pc92a($main::mycall, $line, $main::routeroot, @rout);
 	}
 }
 		
@@ -784,7 +803,7 @@ sub handle_21
 
 	if (@rout) {
 		$self->route_pc21($origin, $line, @rout);
-		$self->route_pc92d($main::mycall, $line, @rout);
+		$self->route_pc92d($main::mycall, $line, $main::routeroot, @rout);
 	}
 }
 		
@@ -1264,7 +1283,8 @@ sub _encode_pc92_call
 	$flag |= $ref->here ? 1 : 0;
 	if ($ref->isa('Route::Node') || $ref->isa('DXProt')) {
 		$flag |= 4;
-		$flag |= 2 if $call ne $main::mycall && DXChannel::get($call);
+		my $dxchan = DXChannel::get($call);
+		$flag |= 2 if $call ne $main::mycall && $dxchan && !$dxchan->{do_pc92};
 		if ($ext) {
 			if ($ref->version) {
 				my $version = $ref->version || 1.0;
@@ -1311,6 +1331,45 @@ sub _del_thingy
 	return @rout;
 }
 
+my $_last_time;
+my $_last_occurs;
+
+sub gen_pc9x_t
+{
+	if (!$_last_time || $_last_time != $main::systime) {
+		$_last_time = $main::systime;
+		$_last_occurs = 0;
+		return $_last_time - $main::systime_daystart;
+	} else {
+		$_last_occurs++;
+		return sprintf "%d.%02d", $_last_time - $main::systime_daystart, $_last_occurs;
+	}
+}
+
+sub check_pc9x_t
+{
+	my $call = shift;
+	my $t = shift;
+	my $pc = shift;
+	my $create = shift;
+	
+	my $parent = ref $call ? $call : Route::Node::get($call);
+	if ($parent) {
+		my $lastid = $parent->lastid->{$pc} || 0;
+		$t += 86400 if $t < $lastid - 43200;
+		if ($lastid >= $t) {
+			dbg("PCPROT: dup / old id on $call <= $lastid, ignored") if isdbg('chanerr');
+			return;
+		}
+		$t -= 86400 if $t >= 86400;
+	} elsif ($create) {
+		$parent = Route::Node->new($call);
+	}
+	$parent->lastid->{$pc} = $t;
+ 
+	return $parent;
+}
+
 # DXSpider routing entries
 sub handle_92
 {
@@ -1321,7 +1380,7 @@ sub handle_92
 
 	$self->{do_pc92} ||= 1;
 
-	my ($pcall, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_[1]);
+	my $pcall = $_[1];
 	unless ($pcall) {
 		dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
 		return;
@@ -1329,43 +1388,61 @@ sub handle_92
 	my $t = $_[2];
 	my $sort = $_[3];
 	
+	my @ent = grep {$_ && /^[0-7]/} @_[4 .. $#_];
+	
 	if ($pcall eq $main::mycall) {
 		dbg("PCPROT: looped back, ignored") if isdbg('chanerr');
 		return;
 	}
 
-	my $parent = Route::Node::get($pcall);
-	if ($parent) {
-		my $lastid = $parent->lastid->{92} || 0;
-		if ($lastid > $t) {
-			dbg("PCPROT: dup / old id <= $lastid, ignored") if isdbg('chanerr');
+	my $parent = check_pc9x_t($pcall, $t, 92, 1) || return;
+	
+	$parent->lastid->{92} = $t;
+	$parent->do_pc92(1);
+
+	if (@ent) {
+
+		# look at the first one which will always be a node of some sort
+		# and update any information that needs to be done. 
+		my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($ent[0]);
+		if ($call && $is_node) {
+			if ($call eq $main::mycall) {
+				dbg("PCPROT: looped back on node entry, ignored") if isdbg('chanerr');
+				return;
+			}
+			if ($is_extnode) {
+				# reparent to external node (note that we must have received a 'C' or 'A' record
+				# from the true parent node for this external before we get one for the this node
+				unless ($parent = Route::Node::get($call)) {
+					dbg("PCPROT: no previous C or A for this external node received, ignored") if isdbg('chanerr');
+					return;
+				}
+				my $parent = check_pc9x_t($call, $t, 92) || return;
+			}
+		} else {
+			dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr');
 			return;
 		}
-		$parent->flags(Route::here($here));
-		$parent->version($version) if $version;
-	} else {
-		$parent = Route::Node->new($pcall, $version, Route::here($here));
+		$parent->here(Route::here($here));
+		$parent->version($version) if $version && $version > $parent->version;
+		$parent->build($build) if $build && $build > $parent->build;
+		shift @ent;
 	}
-	$parent->lastid->{92} = $t;
-	$parent->build($build) if $build;
 
 	my (@radd, @rdel);
 	
 	if ($sort eq 'A') {
-		if ($_[4]) {
-			if (@radd = _add_thingy($parent, $_[4])) {
-			}
+		for (@ent) {
+			push @radd, _add_thingy($parent, $_);
 		}
 	} elsif ($sort eq 'D') {
-		if ($_[4]) {
-			if (@rdel = _del_thingy($parent, $_[4])) {
-			}
+		for (@ent) {
+			push @rdel, _del_thingy($parent, $_);
 		}
 	} elsif ($sort eq 'C') {
-		my $i;
 		my (@nodes, @users);
-		for ($i = 4; $_[$i]; $i++) {
-			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_[$i]);
+		for (@ent) {
+			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
 			if ($call) {
 				if ($is_node) {
 					push @nodes, $call;
@@ -1373,17 +1450,17 @@ sub handle_92
 					push @users, $call;
 				}
 			} else {
-				dbg("DXPROT: pc92 call entry '$_[$i]' not decoded, ignored") if isdbg('chanerr'); 
+				dbg("DXPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr'); 
 			}
 		}
 
 		my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
 
-		for ($i = 4; $_[$i]; $i++) {
-			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_[$i]);
+		for (@ent) {
+			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
 			if ($call) {
-				push @radd,_add_thingy($parent, $_[$i]) if grep $call eq $_, (@$nnodes, @$nusers);
-				push @rdel,_del_thingy($parent, $_[$i]) if grep $call eq $_, (@$dnodes, @$dusers);
+				push @radd,_add_thingy($parent, $_) if grep $call eq $_, (@$nnodes, @$nusers);
+				push @rdel,_del_thingy($parent, $_) if grep $call eq $_, (@$dnodes, @$dusers);
 			}
 		}
 	} else {
@@ -1391,15 +1468,17 @@ sub handle_92
 		return;
 	}
 
-	$self->broadcast_route_pc9x($origin, undef, $line, 0);
+	$self->broadcast_route_pc9x($pcall, undef, $line, 0);
 	foreach my $r (@rdel) {
+		next unless $r;
+		
 		$self->route_pc21($pcall, undef, $r) if $r->isa('Route::Node');
 		$self->route_pc17($pcall, undef, $parent, $r) if $r->isa('Route::User');
 	}
-	foreach my $r (@radd) {
-		$self->route_pc19($pcall, undef, $r) if $r->isa('Route::Node');
-		$self->route_pc16($pcall, undef, $parent, $r) if $r->isa('Route::User');
-	}
+	my @pc19 = grep { $_ && $_->isa('Route::Node') } @radd;
+	my @pc16 = grep { $_ && $_->isa('Route::User') } @radd;
+	$self->route_pc19($pcall, undef, @pc19) if @pc19;
+	$self->route_pc16($pcall, undef, $parent, @pc16) if @pc16;
 }
 
 # if get here then rebroadcast the thing with its Hop count decremented (if
@@ -1425,3 +1504,5 @@ sub handle_default
 		}
 	}
 }
+
+1;