X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=7db433e5205f8273c6a00bc5d7f9fbc624a0147f;hb=f4c54c5174d50224a745d5ed71ad1563a9440083;hp=26eaea40003a3a51e0f194bc48158a421ff8e592;hpb=ab1e2dae047ba2c778551638a0a90201b14658b2;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 26eaea40..7db433e5 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -49,7 +49,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 
 $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 = 5*60;		# maximum age in the future ditto
+$pc9x_future_age = 2*3600;		# maximum age in the future ditto
 $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
@@ -132,6 +132,8 @@ sub handle_11
 		}
 	}
 
+#	my ($hops) = $_[8] =~ /^H(\d+)/;
+
 	# is the spotted callsign blank? This should really be trapped earlier but it
 	# could break other protocol sentences. Also check for lower case characters.
 	if ($_[2] =~ /^\s*$/) {
@@ -592,16 +594,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 +601,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;
@@ -1209,6 +1212,8 @@ sub handle_50
 	my $line = shift;
 	my $origin = shift;
 
+	return if (eph_dup($line));
+
 	my $call = $_[1];
 
 	RouteDB::update($call, $self->{call});
@@ -1216,12 +1221,16 @@ sub handle_50
 	my $node = Route::Node::get($call);
 	if ($node) {
 		return unless $node->call eq $self->{call};
-		$node->usercount($_[2]);
+		$node->usercount($_[2]) unless $node->users;
+		$node->reset_obs;
 
 		# input filter if required
-		return unless $self->in_filter_route($node);
+#		return unless $self->in_filter_route($node);
 
-		$self->route_pc50($origin, $line, $node, $_[2], $_[3]) unless eph_dup($line);
+		unless ($self->{isolate}) {
+			DXChannel::broadcast_nodes($line, $self); # send it to everyone but me
+		}
+#		$self->route_pc50($origin, $line, $node, $_[2], $_[3]) unless eph_dup($line);
 	}
 }
 
@@ -1256,6 +1265,8 @@ sub handle_51
 	}
 }
 
+sub handle_61 { goto &handle_11; }
+
 # dunno but route it
 sub handle_75
 {
@@ -1329,8 +1340,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 +1451,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;
 	}
 }
 
@@ -1462,20 +1485,22 @@ sub check_pc9x_t
 		# the id on it is completely unreliable. Besides, only commands
 		# originating on this box will go through this code...
 		if ($parent->call ne $main::mycall) {
-			my $lastid = $parent->lastid || 0;
-			if ($t < $lastid) {
-				if ($t+86400-$lastid > $pc9x_past_age) {
-					dbg("PCPROT: dup id on $t <= $lastid, ignored") if isdbg('chanerr');
-					return;
-				}
-			} elsif ($t == $lastid) {
-				dbg("PCPROT: dup id on $t == $lastid, ignored") if isdbg('chanerr');
-				return;
-			} else {
-				# $t > $lastid, check that the timestamp offered isn't too far away from 'now'
-				if ($t+$main::systime_daystart-$main::systime > $pc9x_future_age ) {
-					dbg("PCPROT: id $t too far in the future, ignored") if isdbg('chanerr');
+			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;
+					}
+				} 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;
+					}
 				}
 			}
 		}
@@ -1487,6 +1512,58 @@ sub check_pc9x_t
 	return $parent;
 }
 
+sub pc92_handle_first_slot
+{
+	my $self = shift;
+	my $slot = shift;
+	my $parent = shift;
+	my $t = shift;
+	my $oparent = $parent;
+
+	my @radd;
+
+	my ($call, $is_node, $is_extnode, $here, $version, $build) = @$slot;
+	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, $slot);
+					$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->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;
+	return ($parent, @radd);
+}
+
 # DXSpider routing entries
 sub handle_92
 {
@@ -1498,10 +1575,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];
 
@@ -1576,6 +1649,23 @@ sub handle_92
 			}
 			return;
 		}
+
+	} elsif ($sort eq 'K') {
+		# remember the last channel we arrived on
+		$parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
+
+		my @ent = _decode_pc92_call($_[4]);
+
+		if (@ent) {
+			my $add;
+
+			($parent, $add) = $self->pc92_handle_first_slot(\@ent, $parent, $t);
+			return unless $parent; # dupe
+
+			push @radd, $add if $add;
+			$parent->reset_obs;
+			dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
+		}
 	} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
 
 		# remember the last channel we arrived on
@@ -1586,7 +1676,14 @@ sub handle_92
 
 		# cope with missing duplicate node calls in the first slot for A or D
 		my $me = $_[4] || '';
-		$me ||= _encode_pc92_call($parent) if !$me && ($sort eq 'A' || $sort eq 'D');
+		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 .. $#_];
 
@@ -1596,51 +1693,13 @@ sub handle_92
 			# 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 (($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;
-							}
-						}
-						$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->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;
-			}
+			my $add;
+
+			($parent, $add) = $self->pc92_handle_first_slot($ent[0], $parent, $t);
+			return unless $parent; # dupe
+
+			shift @ent;
+			push @radd, $add if $add;
 		}
 
 		# do a pass through removing any references to either locally connected nodes or mycall
@@ -1665,13 +1724,9 @@ sub handle_92
 		} elsif ($sort eq 'C') {
 			my (@nodes, @users);
 
-			# we only reset obscounts on config records
-			$oparent->reset_obs;
-			dbg("ROUTE: reset obscount on $pcall now " . $oparent->obscount) if isdbg('obscount');
-			if ($oparent != $parent) {
-				$parent->reset_obs;
-				dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
-			}
+			# we reset obscounts on config records as well as K records
+			$parent->reset_obs;
+			dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
 
 			#
 			foreach my $r (@nent) {
@@ -1738,11 +1793,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