X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=d4ef2c1d849b40fe46abbe03a3c5a9753ca658c5;hb=5db4d809b67ab2650366039f7585e6479d8f13a8;hp=b5d7568a2bcce44a92a42dd9b0e745597c69fd35;hpb=948528bfc08dcb29187ef90a1b3cac0c161f5c0b;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index b5d7568a..d4ef2c1d 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -96,7 +96,7 @@ sub handle_10
 	# if we are converting announces to talk is it a dup?
 	if ($ann_to_talk) {
 		if (AnnTalk::is_talk_candidate($from, $_[3]) && AnnTalk::dup($from, $to, $_[3])) {
-			dbg("DXPROT: Dupe talk from announce, dropped") if isdbg('chanerr');
+			dbg("PCPROT: Dupe talk from announce, dropped") if isdbg('chanerr');
 			return;
 		}
 	}
@@ -595,30 +595,41 @@ sub handle_18
 	my $origin = shift;
 	$self->state('init');
 
+	my $parent = Route::Node::get($self->{call});
+
 	# record the type and version offered
-	if ($_[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+(?:\.\d+)?)/) {
-		$self->version(53 + $1);
-		$self->user->version(53 + $1);
-		$self->build(0 + $2);
-		$self->user->build(0 + $2);
+	if (my ($version) = $_[1] =~ /DXSpider Version: (\d+\.\d+)/) {
+		$self->{version} = 53 + $version;
+		$self->user->version(53 + $version);
+		$parent->version(0 + $version);
+		my ($build) = $_[1] =~ /Build: (\d+(?:\.\d+)?)/;
+		$self->{build} = 0 + $build;
+		$self->user->build(0 + $build);
+		$parent->build(0 + $build);
+		dbg("DXSpider version $version build $build");
 		unless ($self->is_spider) {
+			dbg("Change U " . $self->user->sort . " C $self->{sort} -> S");
 			$self->user->sort('S');
 			$self->user->put;
 			$self->sort('S');
 		}
-		$self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/;
+#		$self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/;
 		if ($_[1] =~ /\bpc9x/) {
-			$self->{do_pc9x} = 1;
-			dbg("Do px9x set on $self->{call}");
+			if ($self->{isolate}) {
+				dbg("pc9x recognised, but is isolated, using old protocol");
+			} else {
+				$self->{do_pc9x} = 1;
+				dbg("Do px9x set on $self->{call}");
+			}
 		}
 	} else {
+		dbg("Unknown software");
 		$self->version(50.0);
 		$self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/;
 		$self->user->version($self->version);
 	}
 
 	# first clear out any nodes on this dxchannel
-	my $parent = Route::Node::get($self->{call});
 	my @rout = $parent->del_nodes;
 	$self->route_pc21($origin, $line, @rout, $parent) if @rout;
 	$self->send_local_config();
@@ -659,7 +670,7 @@ sub handle_19
 	# first get the INTERFACE node
 	my $parent = Route::Node::get($self->{call});
 	unless ($parent) {
-		dbg("DXPROT: my parent $self->{call} has disappeared");
+		dbg("PCPROT: my parent $self->{call} has disappeared");
 		$self->disconnect;
 		return;
 	}
@@ -775,21 +786,6 @@ sub handle_19
 	}
 }
 
-sub send_delayed_pc92
-{
-	my $self = shift;
-
-	# send out new PC92 config to everyone else
-	my $line = gen_my_pc92_config($main::me);
-	$self->broadcast_route_pc9x($main::mycall, undef, $line, 0);
-
-	# if this is an external node then send out the external config
-	unless ($self->{do_pc9x}) {
-		$line = gen_my_pc92_config(Route::Node::get($self->{call}));
-		$self->broadcast_route_pc9x($main::mycall, undef, $line, 0);
-	}
-}
-
 # send local configuration
 sub handle_20
 {
@@ -799,16 +795,14 @@ sub handle_20
 	my $origin = shift;
 
 	if ($self->{do_pc9x} && $self->{state} ne 'init92') {
-		dbg("PCPROT: disconnecting because login call not sent in any pc92") if isdbg('chanerr');
-		$self->send("**** You logged in with $self->{call} but that is NOT your \$mycall");
-		$self->disconnect;
-		return;
+		$self->send("Reseting to oldstyle routing because login call not sent in any pc92");
+		$self->{do_pc9x} = 0;
 	}
-	$self->send_local_config();
+	$self->send_local_config;
 	$self->send(pc22());
 	$self->state('normal');
 	$self->{lastping} = 0;
-	$self->send_delayed_pc92;
+	$self->route_pc92a($main::mycall, undef, $main::routeroot, Route::Node::get($self->{call}));
 }
 
 # delete a cluster from the list
@@ -890,15 +884,13 @@ sub handle_22
 
 	if ($self->{do_pc9x}) {
 		if ($self->{state} ne 'init92') {
-			dbg("PCPROT: disconnecting because login call not sent in any pc92") if isdbg('chanerr');
-			$self->send("**** You logged in with $self->{call} but that is NOT your \$mycall");
-			$self->disconnect;
-			return;
+			$self->send("Reseting to oldstyle routing because login call not sent in any pc92");
+			$self->{do_pc9x} = 0;
 		}
 	}
 	$self->{lastping} = 0;
 	$self->state('normal');
-	$self->send_delayed_pc92;
+	$self->route_pc92a($main::mycall, undef, $main::routeroot, Route::Node::get($self->{call}));
 }
 
 # WWV info
@@ -1462,13 +1454,13 @@ sub check_pc9x_t
 		if ($parent->call ne $main::mycall) {
 			my $lastid = $parent->lastid->{$pc} || 0;
 			if ($t < $lastid) {
-				if (my $d = $lastid-86400+$t > $pc9x_past_age) {
-					dbg("PCPROT: $call id $t <= $lastid, ignored") if isdbg('chanerr');
+				if ($lastid-86400+$t > $pc9x_past_age) {
+					dbg("PCPROT: dup id on $t <= $lastid (midnight rollover), ignored") if isdbg('chanerr');
 					return;
 				}
 			}
-			if ($lastid == $t) {
-				dbg("PCPROT: dup id on $call = $lastid, ignored") if isdbg('chanerr');
+			if ($lastid >= $t) {
+				dbg("PCPROT: dup id on $call $lastid >= $t, ignored") if isdbg('chanerr');
 				return;
 			}
 		}
@@ -1567,39 +1559,49 @@ sub handle_92
 		# here is where all the routes are created and destroyed
 
 		my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} @_[4 .. $#_];
+
 		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.
+			# except in the case of 'A' or 'D' in which the $pcall is used
+			# otherwise use the node call and update any information
+			# that needs to be done.
 			my ($call, $is_node, $is_extnode, $here, $version, $build) = @{$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) {
-					# this is only accepted from my "self"
-					if (DXChannel::get($call) && $call ne $self->{call}) {
-						dbg("PCPROT: locally connected node config for $call from other another node $self->{call}, ignored") if isdbg('chanerr');
+			if (($sort eq 'A' || $sort eq 'D') && !$is_node) {
+				# parent is already set correctly
+				# this is to allow shortcuts for A and D records
+				# not repeating the origin call to no real purpose
+				;
+			} else {
+				if ($call && $is_node) {
+					if ($call eq $main::mycall) {
+						dbg("PCPROT: $call looped back onto $main::mycall, ignored") if isdbg('chanerr');
 						return;
 					}
-					# 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;
+					if ($is_extnode) {
+						# this is only accepted from my "self"
+						if (DXChannel::get($call) && $call ne $self->{call}) {
+							dbg("PCPROT: locally connected node config for $call from other another node $self->{call}, ignored") if isdbg('chanerr');
+							return;
+						}
+						# 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;
+						}
+						$parent = check_pc9x_t($call, $t, 92) || return;
+						$parent->via_pc92(1);
 					}
-					$parent = check_pc9x_t($call, $t, 92) || return;
-					$parent->via_pc92(1);
+				} else {
+					dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr');
+					return;
 				}
-			} else {
-				dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr');
-				return;
+				$parent->here(Route::here($here));
+				$parent->version($version) if $version && $version > $parent->version;
+				$parent->build($build) if $build && $build > $parent->build;
+				shift @ent;
 			}
-			$parent->here(Route::here($here));
-			$parent->version($version) if $version && $version > $parent->version;
-			$parent->build($build) if $build && $build > $parent->build;
-			shift @ent;
 		}
 
 		# do a pass through removing any references to either locally connected nodes or mycall
@@ -1642,7 +1644,7 @@ sub handle_92
 						push @users, $r->[0];
 					}
 				} else {
-					dbg("DXPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr');
+					dbg("PCPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr');
 				}
 			}
 
@@ -1662,6 +1664,9 @@ sub handle_92
 			foreach my $r (@$dusers) {
 				push @rdel,_del_thingy($parent, [$r, 0]);
 			}
+
+			# remember this last PC92C for rebroadcast on demand
+			$parent->last_PC92C($line);
 		} else {
 			dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr');
 			return;