X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=f18089ffaa07db020cfde2bb724ef7e65220cb7f;hb=4fc769825208defe992b60c1374a236f2cdba925;hp=cd229c0f2d113370a11869e7d06de450efc76edb;hpb=e228aafbb2f9eee36802d209f5d3bb3eef8e91fc;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index cd229c0f..f18089ff 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
 #
 #
 #
@@ -44,14 +44,16 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			%nodehops $baddx $badspotter $badnode $censorpc
 			$allowzero $decode_dk0wcy $send_opernam @checklist
 			$eph_pc15_restime $pc9x_past_age $pc9x_future_age
-			$pc10_dupe_age
+			$pc10_dupe_age $pc92_slug_changes $last_pc92_slug
+			$pc92Ain $pc92Cin $pc92Din $pc92Kin
 		   );
 
 $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
 
 # incoming talk commands
 sub handle_10
@@ -131,6 +133,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*$/) {
@@ -591,16 +595,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);
@@ -608,6 +602,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;
@@ -766,7 +771,7 @@ sub handle_19
 #		$self->route_pc21($self->{call}, $line, @rout);
 		$self->route_pc19($self->{call}, $line, @rout);
 	}
-	if (@pc92out) {
+	if (@pc92out && !$pc92_slug_changes) {
 		$self->route_pc92a($main::mycall, $line, $main::routeroot, @pc92out) if $self->{state} eq 'normal';
 	}
 }
@@ -1208,6 +1213,8 @@ sub handle_50
 	my $line = shift;
 	my $origin = shift;
 
+	return if (eph_dup($line));
+
 	my $call = $_[1];
 
 	RouteDB::update($call, $self->{call});
@@ -1215,12 +1222,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);
 	}
 }
 
@@ -1255,6 +1266,8 @@ sub handle_51
 	}
 }
 
+sub handle_61 { goto &handle_11; }
+
 # dunno but route it
 sub handle_75
 {
@@ -1328,8 +1341,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;
@@ -1364,6 +1383,9 @@ sub _encode_pc92_call
 	return "$flag$call$extra";
 }
 
+my %things_add;
+my %things_del;
+
 sub _add_thingy
 {
 	my $parent = shift;
@@ -1379,6 +1401,10 @@ sub _add_thingy
 			dbg("ROUTE: added user $call to " . $parent->call) if isdbg('routelow');
 			@rout = $parent->add_user($call, Route::here($here));
 		}
+		if ($pc92_slug_changes && $parent == $main::routeroot) {
+			$things_add{$call} = Route::get($call);
+			delete $things_del{$call};
+		}
 	}
 	return @rout;
 }
@@ -1390,31 +1416,58 @@ sub _del_thingy
 	my ($call, $is_node, $is_extnode, $here, $version, $build) = @$s;
 	my @rout;
 	if ($call) {
+		my $ref;
 		if ($is_node) {
-			my $nref = Route::Node::get($call);
+			$ref = Route::Node::get($call);
 			dbg("ROUTE: deleting node $call from " . $parent->call) if isdbg('routelow');
-			@rout = $nref->del($parent) if $nref;
+			@rout = $ref->del($parent) if $ref;
 		} else {
-			my $uref = Route::User::get($call);
+			$ref = Route::User::get($call);
 			dbg("ROUTE: deleting user $call from " . $parent->call) if isdbg('routelow');
-			@rout = $parent->del_user($uref) if $uref;
+			@rout = $parent->del_user($ref) if $ref;
+		}
+		if ($pc92_slug_changes && $parent == $main::routeroot) {
+			$things_del{$call} = $ref unless exists $things_add{$call};
+			delete $things_add{$call};
 		}
 	}
 	return @rout;
 }
 
+# this will only happen if we are slugging changes and
+# there are some changes to be sent, it will create an add or a delete
+# or both
+sub gen_pc92_changes
+{
+	my @add = values %things_add;
+	my @del = values %things_del;
+	return (\@add, \@del);
+}
+
+sub clear_pc92_changes
+{
+	%things_add = %things_del = ();
+	$last_pc92_slug = $main::systime;
+}
+
 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;
 	}
 }
 
@@ -1433,31 +1486,93 @@ 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->{$pc} || 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');
-					return;
+			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') || isdbg('pc92dedupe');
+						return undef;
+					}
+				} elsif ($t == $lastid) {
+					dbg("PCPROT: dup id on $t == lastid $lastid, ignored") if isdbg('chanerr') || isdbg('pc92dedupe');
+					return undef;
+				} 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') || isdbg('pc92dedupe');
+						return undef;
+					}
 				}
 			}
 		}
 	} elsif ($create) {
 		$parent = Route::Node->new($call);
+	} else {
+		return undef;
+	}
+	if ('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->{$pc} = $t if $parent;
+	$parent->lastid($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;
+	$parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
+	return ($parent, @radd);
+}
+
 # DXSpider routing entries
 sub handle_92
 {
@@ -1469,10 +1584,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];
 
@@ -1547,15 +1658,45 @@ sub handle_92
 			}
 			return;
 		}
+
+	} 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;
+
+		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;
+			$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;
 
 		# 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
+		my $me = $_[4] || '';
+		$me ||= _encode_pc92_call($parent) unless $me ;
+
+		my @ent = map {my @a = _decode_pc92_call($_); @a ? \@a : ()} grep {$_ && /^[0-7]/} $me, @_[5 .. $#_];
 
 		if (@ent) {
 
@@ -1563,57 +1704,19 @@ 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
 		my @nent;
 		for (@ent) {
-			next unless $_;
+			next unless $_ && @$_;
 			if ($_->[0] eq $main::mycall || DXChannel::get($_->[0])) {
 				dbg("PCPROT: $_->[0] refers to locally connected node, ignored") if isdbg('chanerr');
 				next;
@@ -1632,13 +1735,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) {
@@ -1705,13 +1804,10 @@ 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
+	# remember that we are converting PC10->PC93 and self will be $main::me if it
+	# comes from us
 	unless ($self->{do_pc9x}) {
 		dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr');
 		return;
@@ -1720,11 +1816,11 @@ sub handle_93
 	my $t = $_[2];
 	my $parent = check_pc9x_t($pcall, $t, 93, 1) || return;
 
-	my $to = $_[3];
-	my $from = $_[4];
-	my $via = $_[5];
+	my $to = uc $_[3];
+	my $from = uc $_[4];
+	my $via = uc $_[5];
 	my $text = $_[6];
-	my $onode = $_[7];
+	my $onode = uc $_[7];
 	$onode = $pcall if @_ <= 8;
 
 	# this is catch loops caused by bad software ...
@@ -1749,7 +1845,9 @@ sub handle_93
 		return;
 	}
 
-	if (is_callsign($to)) {
+	# if it is routeable then then treat it like a talk
+	my $ref = Route::get($to);
+	if ($ref) {
 		# local talks
 		my $dxchan;
 		$dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall;
@@ -1767,34 +1865,30 @@ sub handle_93
 		}
 
 		# convert to PC10 talks where appropriate
-		my $ref = Route::get($to);
-		if ($ref) {
-			# just go for the "best" one for now (rather than broadcast)
-			$dxchan = $ref->dxchan;
+		# just go for the "best" one for now (rather than broadcast)
+		$dxchan = $ref->dxchan;
 
-			# check it...
-			if (ref $dxchan && $dxchan->isa('DXChannel')) {
-				if ($dxchan->{do_pc9x}) {
-					$dxchan->send($line);
-				} else {
-					$dxchan->talk($from, $to, $via, $text, $onode);
-				}
+		# check it...
+		if (ref $dxchan && $dxchan->isa('DXChannel')) {
+			if ($dxchan->{do_pc9x}) {
+				$dxchan->send($line);
 			} else {
-				dbg("ERROR: $to -> $dxchan is not a DXChannel! (convert to pc10)");
+				$dxchan->talk($from, $to, $via, $text, $onode);
 			}
-			return;
+		} else {
+			dbg("ERROR: $to -> $dxchan is not a DXChannel! (convert to pc10)");
 		}
+		return;
 
-		# otherwise, drop through and allow it to be broadcast
-	} elsif ($to eq '*' || uc $to eq 'SYSOP' || uc $to eq 'WX') {
+	} elsif ($to eq '*' || $to eq 'SYSOP' || $to eq 'WX') {
 		# announces
-		my $sysop = uc $to eq 'SYSOP' ? '*' : ' ';
-		my $wx = uc $to eq 'WX' ? '1' : '0';
+		my $sysop = $to eq 'SYSOP' ? '*' : ' ';
+		my $wx = $to eq 'WX' ? '1' : '0';
 		my $local = $via eq 'LOCAL' ? '*' : $via;
 
 		$self->send_announce(1, pc12($from, $text, $local, $sysop, $wx, $pcall), $from, $local, $text, $sysop, $pcall, $wx, $via eq 'LOCAL' ? $via : undef);
 		return if $via eq 'LOCAL';
-	} else {
+	} elsif (!is_callsign($to) && $text =~ /^#\d+ /) {
 		# chat messages to non-pc9x nodes
 		$self->send_chat(1, pc12($from, $text, undef, $to, undef, $pcall), $from, '*', $text, $to, $pcall, '0');
 	}