X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=4d69b1aa872b4cadb45feb6786091d5721faea4e;hb=8e15f9531d1629f5a2f51ab59fe3ce90e49f2d09;hp=1b3506150d16c7be19ddb9ddfd19f29a0fba3ab5;hpb=11d4503c67235600af279b57b785e5657faaf63c;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 1b350615..4d69b1aa 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -51,7 +51,7 @@ $pc9x_past_age = 62*60;			# maximum age in the past of a px9x (a config record m
 								# thing a node might send - once an hour)
 $pc9x_future_age = 5*60;		# maximum age in the future ditto
 $pc10_dupe_age = 45;			# just something to catch duplicate PC10->PC93 conversions
-$pc92_slug_changes = 0;			# slug any changes going outward for this long
+$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
 
 # incoming talk commands
@@ -592,16 +592,6 @@ sub handle_18
 			$self->sort('S');
 		}
 #		$self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/;
-		if ($_[1] =~ /\bpc9x/) {
-			if ($self->{isolate}) {
-				dbg("pc9x recognised, but $self->{call} is isolated, using old protocol");
-			} elsif (!$self->user->wantpc9x) {
-				dbg("pc9x explicitly switched off on $self->{call}, using old protocol");
-			} else {
-				$self->{do_pc9x} = 1;
-				dbg("Do px9x set on $self->{call}");
-			}
-		}
 	} else {
 		dbg("Unknown software");
 		$self->version(50.0);
@@ -609,6 +599,17 @@ sub handle_18
 		$self->user->version($self->version);
 	}
 
+	if ($_[1] =~ /\bpc9x/) {
+		if ($self->{isolate}) {
+			dbg("pc9x recognised, but $self->{call} is isolated, using old protocol");
+		} elsif (!$self->user->wantpc9x) {
+			dbg("pc9x explicitly switched off on $self->{call}, using old protocol");
+		} else {
+			$self->{do_pc9x} = 1;
+			dbg("Do px9x set on $self->{call}");
+		}
+	}
+
 	# first clear out any nodes on this dxchannel
 	my @rout = $parent->del_nodes;
 	$self->route_pc21($origin, $line, @rout, $parent) if @rout;
@@ -1329,8 +1330,14 @@ sub _decode_pc92_call
 	my $icall = shift;
 	my @part = split /:/, $icall;
 	my ($flag, $call) = unpack "A A*", $part[0];
-	return () unless defined $flag && $flag ge '0' && $flag le '7';
-	return () unless $call && is_callsign($call);
+	unless (defined $flag && $flag ge '0' && $flag le '7') {
+		dbg("PCPROT: $icall no flag byte (0-7) at front of call, ignored") if isdbg('chanerr');
+		return ();
+	}
+	unless ($call && is_callsign($call)) {
+		dbg("PCPROT: $icall no recognisable callsign, ignored") if isdbg('chanerr');
+		return ();
+	}
 	my $is_node = $flag & 4;
 	my $is_extnode = $flag & 2;
 	my $here = $flag & 1;
@@ -1434,16 +1441,22 @@ sub clear_pc92_changes
 
 my $_last_time;
 my $_last_occurs;
+my $_last_pc9x_id;
+
+sub last_pc9x_id
+{
+	return $_last_pc9x_id;
+}
 
 sub gen_pc9x_t
 {
 	if (!$_last_time || $_last_time != $main::systime) {
 		$_last_time = $main::systime;
 		$_last_occurs = 0;
-		return $_last_time - $main::systime_daystart;
+		return $_last_pc9x_id = $_last_time - $main::systime_daystart;
 	} else {
 		$_last_occurs++;
-		return sprintf "%d.%02d", $_last_time - $main::systime_daystart, $_last_occurs;
+		return $_last_pc9x_id = sprintf "%d.%02d", $_last_time - $main::systime_daystart, $_last_occurs;
 	}
 }
 
@@ -1498,10 +1511,6 @@ sub handle_92
 	my (@radd, @rdel);
 
 	my $pcall = $_[1];
-	unless ($pcall) {
-		dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
-		return;
-	}
 	my $t = $_[2];
 	my $sort = $_[3];
 
@@ -1584,7 +1593,18 @@ sub handle_92
 		# this is the main route section
 		# here is where all the routes are created and destroyed
 
-		my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} @_[4 .. $#_];
+		# cope with missing duplicate node calls in the first slot for A or D
+		my $me = $_[4] || '';
+		if (($sort eq 'A' || $sort eq 'D')) {
+			$me ||= _encode_pc92_call($parent) if !$me ;
+		} else {
+			unless ($me) {
+				dbg("PCPROT: this type of PC92 *must* have a node call in the first slot, ignored") if is_dbg('chanerr');
+				return;
+			}
+		}
+
+		my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} $me, @_[5 .. $#_];
 
 		if (@ent) {
 
@@ -1593,50 +1613,45 @@ sub handle_92
 			# 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 (($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;
-					}
-					# this is only accepted from my "self".
-					# this also kills configs from PC92 nodes with external PC19 nodes that are also
-					# locally connected. Local nodes always take precedence.
-					if (DXChannel::get($call) && $call ne $self->{call}) {
-						dbg("PCPROT: locally connected node $call from other another node $self->{call}, 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)) {
-							if ($is_extnode && $oparent) {
-								@radd =  _add_thingy($oparent, $ent[0]);
-								$parent = $radd[0];
-							} else {
-								dbg("PCPROT: no previous C or A for this external node received, ignored") if isdbg('chanerr');
-								return;
-							}
+			if ($call && $is_node) {
+				if ($call eq $main::mycall) {
+					dbg("PCPROT: $call looped back onto $main::mycall, ignored") if isdbg('chanerr');
+					return;
+				}
+				# this is only accepted from my "self".
+				# this also kills configs from PC92 nodes with external PC19 nodes that are also
+				# locally connected. Local nodes always take precedence. But we remember the lastid
+				# to try to reduce the number of dupe PC92s for this external node.
+				if (DXChannel::get($call) && $call ne $self->{call}) {
+					$parent = check_pc9x_t($call, $t, 92); # this will update the lastid time
+					dbg("PCPROT: locally connected node $call from other another node $self->{call}, 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)) {
+						if ($is_extnode && $oparent) {
+							@radd =  _add_thingy($oparent, $ent[0]);
+							$parent = $radd[0];
+						} else {
+							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->PC92C_dxchan($self->{call});
 					}
-				} else {
-					dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr');
-					return;
+					$parent = check_pc9x_t($call, $t, 92) || return;
+					$parent->via_pc92(1);
+					$parent->PC92C_dxchan($self->{call});
 				}
-				$parent->here(Route::here($here));
-				$parent->version($version) if $version && $version > $parent->version;
-				$parent->build($build) if $build && $build > $parent->build;
-				$parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
-				shift @ent;
+			} 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 || $pc19_version) if $version;
+			$parent->build($build) if $build && $build > $parent->build;
+			$parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
+			shift @ent;
 		}
 
 		# do a pass through removing any references to either locally connected nodes or mycall
@@ -1734,11 +1749,7 @@ sub handle_93
 
 #	$self->{do_pc9x} ||= 1;
 
-	my $pcall = $_[1];
-	unless (is_callsign($pcall)) {
-		dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
-		return;
-	}
+	my $pcall = $_[1];			# this is now checked earlier
 
 	# remember that we are converting PC10->PC93 and self will be $main::me if it
 	# comes from us