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

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 9e5d249f..e7160d7c 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -2,10 +2,10 @@
 #
 # 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
+#
+#
 #
-# $Id$
-# 
 
 package DXProt;
 
@@ -41,11 +41,23 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			$last_hour $last10 %eph  %pings %rcmds $ann_to_talk
 			$pingint $obscount %pc19list $chatdupeage $chatimportfn
 			$investigation_int $pc19_version $myprot_version
-			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
+			%nodehops $baddx $badspotter $badnode $censorpc
 			$allowzero $decode_dk0wcy $send_opernam @checklist
-			$eph_pc15_restime
+			$eph_pc15_restime $pc9x_past_age $pc9x_dupe_age
+			$pc10_dupe_age $pc92_slug_changes $last_pc92_slug
+			$pc92Ain $pc92Cin $pc92Din $pc92Kin $pc9x_time_tolerance
 		   );
-	
+
+$pc9x_dupe_age = 60;			# catch loops of circular (usually) D records
+$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
+$pc9x_time_tolerance = 15*60;	# the time on a pc9x is allowed to be out by this amount
+$pc9x_past_age = (122*60)+		# maximum age in the past of a px9x (a config record might be the only
+	$pc9x_time_tolerance;		# thing a node might send - once an hour and we allow an extra hour for luck)
+                                # this is actually the partition between "yesterday" and "today" but old.
+
+
 # incoming talk commands
 sub handle_10
 {
@@ -54,9 +66,11 @@ sub handle_10
 	my $line = shift;
 	my $origin = shift;
 
-	# rsfp check
-	return if $rspfcheck and !$self->rspfcheck(0, $_[6], $_[1]);
-			
+	# this is to catch loops caused by bad software ...
+	if (eph_dup($line, $pc10_dupe_age)) {
+		return;
+	}
+
 	# will we allow it at all?
 	if ($censorpc) {
 		my @bad;
@@ -93,7 +107,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;
 		}
 	}
@@ -102,36 +116,8 @@ sub handle_10
 	RouteDB::update($_[6], $self->{call});
 #	RouteDB::update($to, $_[6]);
 
-	# it is here and logged on
-	$dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall;
-	$dxchan = DXChannel::get($to) unless $dxchan;
-	if ($dxchan && $dxchan->is_user) {
-		$_[3] =~ s/\%5E/^/g;
-		$dxchan->talk($from, $to, $via, $_[3]);
-		return;
-	}
-
-	# is it elsewhere, visible on the cluster via the to address?
-	# note: this discards the via unless the to address is on
-	# the via address
-	my ($ref, $vref);
-	if ($ref = Route::get($to)) {
-		$vref = Route::Node::get($via) if $via;
-		$vref = undef unless $vref && grep $to eq $_, $vref->users;
-		$ref->dxchan->talk($from, $to, $vref ? $via : undef, $_[3], $_[6]);
-		return;
-	}
-
-	# can we see an interface to send it down?
-	
-	# not visible here, send a message of condolence
-	$vref = undef;
-	$ref = Route::get($from);
-	$vref = $ref = Route::Node::get($_[6]) unless $ref; 
-	if ($ref) {
-		$dxchan = $ref->dxchan;
-		$dxchan->talk($main::mycall, $from, $vref ? $vref->call : undef, $dxchan->msg('talknh', $to) );
-	}
+	# convert this to a PC93, coming from mycall with origin set and process it as such
+	$main::me->normal(pc93($to, $from, $via, $_[3], $_[6]));
 }
 
 # DX Spot handling
@@ -142,17 +128,16 @@ sub handle_11
 	my $line = shift;
 	my $origin = shift;
 
-	# route 'foreign' pc26s 
+	# route 'foreign' pc26s
 	if ($pcno == 26) {
 		if ($_[7] ne $main::mycall) {
 			$self->route($_[7], $line);
 			return;
 		}
 	}
-			
-	# rsfp check
-	#			return if $rspfcheck and !$self->rspfcheck(1, $_[7], $_[6]);
-	
+
+#	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*$/) {
@@ -170,7 +155,7 @@ sub handle_11
 		dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
 		return;
 	}
-			
+
 	# if this is a 'bad spotter' user then ignore it
 	my $nossid = $_[6];
 	$nossid =~ s/-\d+$//;
@@ -178,7 +163,7 @@ sub handle_11
 		dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
 		return;
 	}
-			
+
 	# convert the date to a unix date
 	my $d = cltounix($_[3], $_[4]);
 	# bang out (and don't pass on) if date is invalid or the spot is too old (or too young)
@@ -192,7 +177,7 @@ sub handle_11
 		dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
 		return;
 	}
-			
+
 	# do some de-duping
 	$_[5] =~ s/^\s+//;			# take any leading blanks off
 	$_[2] = unpad($_[2]);		# take off leading and trailing blanks from spotted callsign
@@ -211,7 +196,7 @@ sub handle_11
 	# remember a route
 #	RouteDB::update($_[7], $self->{call});
 #	RouteDB::update($_[6], $_[7]);
-	
+
 	my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $nossid, $_[7]);
 	# global spot filtering on INPUT
 	if ($self->{inspotsfilter}) {
@@ -230,7 +215,7 @@ sub handle_11
 		return;
 	}
 
-	# add it 
+	# add it
 	Spot::add(@spot);
 
 	#
@@ -239,16 +224,16 @@ sub handle_11
 	# then  spotted itu, spotted cq, spotters itu, spotters cq
 	# you should be able to route on any of these
 	#
-			
-	# fix up qra locators of known users 
-	my $user = DXUser->get_current($spot[4]);
+
+	# fix up qra locators of known users
+	my $user = DXUser::get_current($spot[4]);
 	if ($user) {
 		my $qra = $user->qra;
 		unless ($qra && is_qra($qra)) {
 			my $lat = $user->lat;
 			my $long = $user->long;
 			if (defined $lat && defined $long) {
-				$user->qra(DXBearing::lltoqra($lat, $long)); 
+				$user->qra(DXBearing::lltoqra($lat, $long));
 				$user->put;
 			}
 		}
@@ -286,14 +271,15 @@ sub handle_11
 			}
 		}
 	}
-				
-	# local processing 
-	my $r;
-	eval {
-		$r = Local::spot($self, @spot);
-	};
-	#			dbg("Local::spot1 error $@") if isdbg('local') if $@;
-	return if $r;
+
+	# local processing
+	if (defined &Local::spot) {
+		my $r;
+		eval {
+			$r = Local::spot($self, @spot);
+		};
+		return if $r;
+	}
 
 	# DON'T be silly and send on PC26s!
 	return if $pcno == 26;
@@ -301,7 +287,7 @@ sub handle_11
 	# send out the filtered spots
 	send_dx_spot($self, $line, @spot) if @spot;
 }
-		
+
 # announces
 sub handle_12
 {
@@ -310,8 +296,6 @@ sub handle_12
 	my $line = shift;
 	my $origin = shift;
 
-	#			return if $rspfcheck and !$self->rspfcheck(1, $_[5], $_[1]);
-
 	# announce duplicate checking
 	$_[3] =~ s/^\s+//;			# remove leading blanks
 
@@ -339,9 +323,9 @@ sub handle_12
 
 
 	my $dxchan;
-	
+
 	if ((($dxchan = DXChannel::get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){
-		$self->send_chat($line, @_[1..6]);
+		$self->send_chat(0, $line, @_[1..6]);
 	} elsif ($_[2] eq '*' || $_[2] eq $main::mycall) {
 
 		# remember a route
@@ -368,12 +352,21 @@ sub handle_12
 				}
 			}
 		}
-	
+
 		# send it
-		$self->send_announce($line, @_[1..6]);
+		$self->send_announce(0, $line, @_[1..6]);
 	} else {
 		$self->route($_[2], $line);
 	}
+
+	# local processing
+	if (defined &Local::ann) {
+		my $r;
+		eval {
+			$r = Local::ann($self, $line, @_[1..6]);
+		};
+		return if $r;
+	}
 }
 
 sub handle_15
@@ -384,15 +377,15 @@ sub handle_15
 	my $origin = shift;
 
 	if (eph_dup($line, $eph_pc15_restime)) {
-		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
+		return;
 	} else {
 		unless ($self->{isolate}) {
 			DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me
 		}
 	}
 }
-		
-# incoming user		
+
+# incoming user
 sub handle_16
 {
 	my $self = shift;
@@ -404,12 +397,13 @@ sub handle_16
 	my $dxchan;
 	my $ncall = $_[1];
 	my $newline = "PC16^";
-			
+
 	# dos I want users from this channel?
 	unless ($self->user->wantpc16) {
 		dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr');
 		return;
 	}
+
 	# is it me?
 	if ($ncall eq $main::mycall) {
 		dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
@@ -419,18 +413,22 @@ sub handle_16
 	my $h;
 	$h = 1 if DXChannel::get($ncall);
 	RouteDB::update($ncall, $self->{call}, $h);
+	if ($h && $self->{call} ne $ncall) {
+		dbg("PCPROT: trying to update a local node, ignored") if isdbg('chanerr');
+		return;
+	}
 
 	if (eph_dup($line)) {
-		dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
 		return;
 	}
 
-	unless ($h) {
-		dbg("PCPROT: non-local PC16, ignored") if isdbg('chanerr');
+	# isolate now means only accept stuff from this call only
+	if ($self->{isolate} && $ncall ne $self->{call}) {
+		dbg("PCPROT: $self->{call} isolated, $ncall ignored") if isdbg('chanerr');
 		return;
 	}
 
-	my $parent = Route::Node::get($ncall); 
+	my $parent = Route::Node::get($ncall);
 
 	if ($parent) {
 		$dxchan = $parent->dxchan;
@@ -441,6 +439,15 @@ sub handle_16
 
 		# input filter if required
 		return unless $self->in_filter_route($parent);
+	} else {
+		$parent = Route::Node->new($ncall);
+	}
+
+	unless ($h) {
+		if ($parent->via_pc92) {
+			dbg("PCPROT: non-local node controlled by PC92, ignored") if isdbg('chanerr');
+			return;
+		}
 	}
 
 	my $i;
@@ -451,50 +458,50 @@ sub handle_16
 		next if $call eq $main::mycall;
 
 		eph_del_regex("^PC17\\^$call\\^$ncall");
-				
+
 		$conf = $conf eq '*';
 
 		# reject this if we think it is a node already
 		my $r = Route::Node::get($call);
-		my $u = DXUser->get_current($call) unless $r;
+		my $u = DXUser::get_current($call) unless $r;
 		if ($r || ($u && $u->is_node)) {
 			dbg("PCPROT: $call is a node") if isdbg('chanerr');
 			next;
 		}
-				
+
 		$r = Route::User::get($call);
 		my $flags = Route::here($here)|Route::conf($conf);
-				
+
 		if ($r) {
-			my $au = $r->addparent($parent);					
+			my $au = $r->addparent($parent);
 			if ($r->flags != $flags) {
 				$r->flags($flags);
 				$au = $r;
 			}
-			push @rout, $r if $au;
+			push @rout, $r if $h && $au;
 		} else {
-			push @rout, $parent->add_user($call, $flags);
+			my @ans = $parent->add_user($call, $flags);
+			push @rout, @ans if $h && @ans;
 		}
-		
-		# send info to all logged in thingies
-		$self->tell_login('loginu', "$ncall: $call") if DXUser->get_current($ncall)->is_local_node;
-		$self->tell_buddies('loginb', $call, $ncall);
-				
+
 		# add this station to the user database, if required
-#		$call =~ s/-\d+$//o;	# remove ssid for users
-		my $user = DXUser->get_current($call);
-		$user = DXUser->new($call) if !$user;
+		my $user = DXUser::get_current($ncall);
+		$user = DXUser->new($call) unless $user;
 		$user->homenode($parent->call) if !$user->homenode;
 		$user->node($parent->call);
 		$user->lastin($main::systime) unless DXChannel::get($call);
 		$user->put;
+
+		# send info to all logged in thingies
+		$self->tell_login('loginu', "$ncall: $call") if $user->is_local_node;
+		$self->tell_buddies('loginb', $call, $ncall);
 	}
 	if (@rout) {
-		$self->route_pc16($origin, $line, $parent, @rout);
-		$self->route_pc92a($main::mycall, undef, $parent, @rout);
+		$self->route_pc16($origin, $line, $parent, @rout) if @rout;
+#		$self->route_pc92a($main::mycall, undef, $parent, @rout) if $h && $self->{state} eq 'normal';
 	}
 }
-		
+
 # remove a user
 sub handle_17
 {
@@ -507,61 +514,72 @@ sub handle_17
 	my $ucall = $_[1];
 
 	eph_del_regex("^PC16\\^$ncall.*$ucall");
-			
+
 	# do I want users from this channel?
 	unless ($self->user->wantpc16) {
 		dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr');
 		return;
 	}
+
 	if ($ncall eq $main::mycall) {
 		dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
 		return;
 	}
 
-	RouteDB::delete($ncall, $self->{call});
-
-	unless ($ncall eq $self->{call}) {
-		dbg("PCPROT: PC17 from non-local $ncall, ignored") if isdbg('chanerr');
+	# isolate now means only accept stuff from this call only
+	if ($self->{isolate} && $ncall ne $self->{call}) {
+		dbg("PCPROT: $self->{call} isolated, $ncall ignored") if isdbg('chanerr');
 		return;
 	}
 
+	RouteDB::delete($ncall, $self->{call});
+
 	my $uref = Route::User::get($ucall);
 	unless ($uref) {
 		dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
+		return;
 	}
 	my $parent = Route::Node::get($ncall);
 	unless ($parent) {
 		dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
-	}			
+		return;
+	}
 
-	$dxchan = $parent->dxchan if $parent;
+	$dxchan = DXChannel::get($ncall);
 	if ($dxchan && $dxchan ne $self) {
 		dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
 		return;
 	}
 
-	# input filter if required and then remove user if present
-	if ($parent) {
-#		return unless $self->in_filter_route($parent);	
-		$parent->del_user($uref) if $uref;
-	} else {
-		$parent = Route->new($ncall);  # throw away
+	unless ($dxchan) {
+		if ($parent->via_pc92) {
+			dbg("PCPROT: non-local node controlled by PC92, ignored") if isdbg('chanerr');
+			return;
+		}
 	}
 
+	if (DXChannel::get($ucall)) {
+		dbg("PCPROT: trying do disconnect local user, ignored") if isdbg('chanerr');
+		return;
+	}
+
+	# input filter if required and then remove user if present
+#		return unless $self->in_filter_route($parent);
+	$parent->del_user($uref);
+
 	# send info to all logged in thingies
-	$self->tell_login('logoutu', "$ncall: $ucall") if DXUser->get_current($ncall)->is_local_node;
+	my $user = DXUser::get_current($ncall);
+	$self->tell_login('logoutu', "$ncall: $ucall") if $user && $user->is_local_node;
 	$self->tell_buddies('logoutb', $ucall, $ncall);
 
 	if (eph_dup($line)) {
-		dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
 		return;
 	}
 
-	$uref = Route->new($ucall) unless $uref; # throw away
 	$self->route_pc17($origin, $line, $parent, $uref);
-	$self->route_pc92d($main::mycall, undef, $parent, $uref);
+#	$self->route_pc92d($main::mycall, undef, $parent, $uref) if $dxchan;
 }
-		
+
 # link request
 sub handle_18
 {
@@ -569,41 +587,58 @@ sub handle_18
 	my $pcno = shift;
 	my $line = shift;
 	my $origin = shift;
-	$self->state('init');	
+	$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\b/;
-		$self->{do_pc92}++ if $_[1] =~ /\bpc92\b/;
+#		$self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/;
 	} else {
+		dbg("Unknown software");
 		$self->version(50.0);
 		$self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/;
 		$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 $parent = Route::Node::get($self->{call});
 	my @rout = $parent->del_nodes;
 	$self->route_pc21($origin, $line, @rout, $parent) if @rout;
 	$self->send_local_config();
 	$self->send(pc20());
 }
-		
+
 sub check_add_node
 {
 	my $call = shift;
-	
+
 	# add this station to the user database, if required (don't remove SSID from nodes)
-	my $user = DXUser->get_current($call);
+	my $user = DXUser::get_current($call);
 	if (!$user) {
 		$user = DXUser->new($call);
 		$user->priv(1);		# I have relented and defaulted nodes
@@ -627,26 +662,29 @@ sub handle_19
 	my $newline = "PC19^";
 
 	# new routing list
-	my @rout;
+	my (@rout, @pc92out);
 
 	# 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;
 	}
 
+	my $h;
+
 	# parse the PC19
-	# 
+	#
 	# We are making a major change from now on. We are only going to accept
 	# PC19s from directly connected nodes.  This means that we are probably
-	# going to throw away most of the data that we are being sent. 
+	# going to throw away most of the data that we are being sent.
 	#
 	# The justification for this is that most of it is wrong or out of date
-	# anyway. 
-	# 
-	# From now on we are only going to believe PC92 data.
+	# anyway.
+	#
+	# From now on we are only going to believe PC92 data and locally connected
+	# non-pc92 nodes.
 	#
 	for ($i = 1; $i < $#_-1; $i += 4) {
 		my $here = $_[$i];
@@ -656,7 +694,7 @@ sub handle_19
 		next unless defined $here && defined $conf && is_callsign($call);
 
 		eph_del_regex("^PC(?:21\\^$call|17\\^[^\\^]+\\^$call)");
-				
+
 		# check for sane parameters
 		#				$ver = 5000 if $ver eq '0000';
 		next unless $ver && $ver =~ /^\d+$/;
@@ -665,14 +703,25 @@ sub handle_19
 		next if $call eq $main::mycall;
 
 		# check that this PC19 isn't trying to alter the wrong dxchan
+		$h = 0;
 		my $dxchan = DXChannel::get($call);
-		if ($dxchan && $dxchan != $self) {
-			dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
+		if ($dxchan) {
+			if ($dxchan == $self) {
+				$h = 1;
+			} else {
+				dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
+				next;
+			}
+		}
+
+		# isolate now means only accept stuff from this call only
+		if ($self->{isolate} && $call ne $self->{call}) {
+			dbg("PCPROT: $self->{call} isolated, $call ignored") if isdbg('chanerr');
 			next;
 		}
 
 		my $user = check_add_node($call);
-		
+
 #		if (eph_dup($genline)) {
 #			dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr');
 #			next;
@@ -680,9 +729,11 @@ sub handle_19
 
 		RouteDB::update($call, $self->{call}, $dxchan ? 1 : undef);
 
-		unless ($dxchan) {
-			dbg("PCPROT: PC19 not directly connected, ignored") if isdbg('chanerr');
-			next;
+		unless ($h) {
+			if ($parent->via_pc92) {
+				dbg("PCPROT: non-local node controlled by PC92, ignored") if isdbg('chanerr');
+				next;
+			}
 		}
 
 		my $r = Route::Node::get($call);
@@ -711,6 +762,7 @@ sub handle_19
 					my $ar = $parent->add($call, $ver, $flags);
 					$user->wantroutepc19(1) unless defined $user->wantroutepc19;
 					push @rout, $ar if $ar;
+					push @pc92out, $r if $h;
 				} else {
 					next;
 				}
@@ -720,7 +772,7 @@ sub handle_19
 		# unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect)
 		my $mref = DXMsg::get_busy($call);
 		$mref->stop_msg($call) if $mref;
-				
+
 		$user->lastin($main::systime) unless DXChannel::get($call);
 		$user->put;
 	}
@@ -729,12 +781,14 @@ sub handle_19
 	# but remember there will only be one (pair) these because any extras will be
 	# thrown away.
 	if (@rout) {
-		$self->route_pc21($self->{call}, $line, @rout);
+#		$self->route_pc21($self->{call}, $line, @rout);
 		$self->route_pc19($self->{call}, $line, @rout);
-		$self->route_pc92a($main::mycall, $line, $main::routeroot, @rout);
+	}
+	if (@pc92out && !$pc92_slug_changes) {
+		$self->route_pc92a($main::mycall, $line, $main::routeroot, @pc92out) if $self->{state} eq 'normal';
 	}
 }
-		
+
 # send local configuration
 sub handle_20
 {
@@ -742,12 +796,18 @@ sub handle_20
 	my $pcno = shift;
 	my $line = shift;
 	my $origin = shift;
-	$self->send_local_config();
+
+	if ($self->{do_pc9x} && $self->{state} ne 'init92') {
+		$self->send("Reseting to oldstyle routing because login call not sent in any pc92");
+		$self->{do_pc9x} = 0;
+	}
+	$self->send_local_config;
 	$self->send(pc22());
 	$self->state('normal');
 	$self->{lastping} = 0;
+	$self->route_pc92a($main::mycall, undef, $main::routeroot, Route::Node::get($self->{call}));
 }
-		
+
 # delete a cluster from the list
 #
 # This should never occur for directly connected nodes.
@@ -761,13 +821,18 @@ sub handle_21
 	my $call = uc $_[1];
 
 	eph_del_regex("^PC1[679].*$call");
-			
+
 	# if I get a PC21 from the same callsign as self then ignore it
-	if ($call eq $self->call) {
+	if ($call eq $self->{call}) {
 		dbg("PCPROT: self referencing PC21 from $self->{call}");
 		return;
 	}
 
+	# for the above reason and also because of the check for PC21s coming
+	# in for self->call from outside being ignored further down
+	# we don't need any isolation code here, because we will never
+	# act on a PC21 with self->call in it.
+
 	RouteDB::delete($call, $self->{call});
 
 	my $parent = Route::Node::get($self->{call});
@@ -778,20 +843,25 @@ sub handle_21
 	}
 
 	my @rout;
-	
+
 	if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
 		my $node = Route::Node::get($call);
 		if ($node) {
-			
+
+			if ($node->via_pc92) {
+				dbg("PCPROT: controlled by PC92, ignored") if isdbg('chanerr');
+				return;
+			}
+
 			my $dxchan = DXChannel::get($call);
 			if ($dxchan && $dxchan != $self) {
 				dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr');
 				return;
 			}
-			
+
 			# input filter it
 			return unless $self->in_filter_route($node);
-			
+
 			# routing objects, force a PC21 if it is local
 			push @rout, $node->del($parent);
 			push @rout, $call if $dxchan && @rout == 0;
@@ -801,12 +871,16 @@ sub handle_21
 		return;
 	}
 
+	if (eph_dup($line)) {
+		return;
+	}
+
 	if (@rout) {
 		$self->route_pc21($origin, $line, @rout);
-		$self->route_pc92d($main::mycall, $line, $main::routeroot, @rout);
+#		$self->route_pc92d($main::mycall, $line, $main::routeroot, @rout);
 	}
 }
-		
+
 
 sub handle_22
 {
@@ -814,10 +888,18 @@ sub handle_22
 	my $pcno = shift;
 	my $line = shift;
 	my $origin = shift;
-	$self->state('normal');
+
+	if ($self->{do_pc9x}) {
+		if ($self->{state} ne 'init92') {
+			$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->route_pc92a($main::mycall, undef, $main::routeroot, Route::Node::get($self->{call}));
 }
-				
+
 # WWV info
 sub handle_23
 {
@@ -825,8 +907,8 @@ sub handle_23
 	my $pcno = shift;
 	my $line = shift;
 	my $origin = shift;
-			
-	# route foreign' pc27s 
+
+	# route foreign' pc27s
 	if ($pcno == 27) {
 		if ($_[8] ne $main::mycall) {
 			$self->route($_[8], $line);
@@ -834,10 +916,6 @@ sub handle_23
 		}
 	}
 
-	# only do a rspf check on PC23 (not 27)
-	if ($pcno == 23) {
-		return if $rspfcheck and !$self->rspfcheck(1, $_[8], $_[7])
-	}
 
 	# do some de-duping
 	my $d = cltounix($_[1], sprintf("%02d18Z", $_[2]));
@@ -865,16 +943,17 @@ sub handle_23
 		dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chanerr');
 		return;
 	}
-		
+
 	# note this only takes the first one it gets
 	Geomag::update($d, $_[2], $sfi, $k, $i, @_[6..8], $r);
 
-	my $rep;
-	eval {
-		$rep = Local::wwv($self, $_[1], $_[2], $sfi, $k, $i, @_[6..8], $r);
-	};
-	#			dbg("Local::wwv2 error $@") if isdbg('local') if $@;
-	return if $rep;
+	if (defined &Local::wwv) {
+		my $rep;
+		eval {
+			$rep = Local::wwv($self, $_[1], $_[2], $sfi, $k, $i, @_[6..8], $r);
+		};
+		return if $rep;
+	}
 
 	# DON'T be silly and send on PC27s!
 	return if $pcno == 27;
@@ -882,7 +961,7 @@ sub handle_23
 	# broadcast to the eager world
 	send_wwv_spot($self, $line, $d, $_[2], $sfi, $k, $i, @_[6..8]);
 }
-		
+
 # set here status
 sub handle_24
 {
@@ -895,12 +974,11 @@ sub handle_24
 	$nref = Route::Node::get($call);
 	$uref = Route::User::get($call);
 	return unless $nref || $uref; # if we don't know where they are, it's pointless sending it on
-			
+
 	if (eph_dup($line)) {
-		dbg("PCPROT: Dup PC24 ignored\n") if isdbg('chanerr');
 		return;
 	}
-	
+
 	$nref->here($_[2]) if $nref;
 	$uref->here($_[2]) if $uref;
 	my $ref = $nref || $uref;
@@ -908,7 +986,7 @@ sub handle_24
 
 	$self->route_pc24($origin, $line, $ref, $_[3]);
 }
-		
+
 # merge request
 sub handle_25
 {
@@ -926,7 +1004,7 @@ sub handle_25
 	}
 
 	Log('DXProt', "Merge request for $_[3] spots and $_[4] WWV from $_[2]");
-			
+
 	# spots
 	if ($_[3] > 0) {
 		my @in = reverse Spot::search(1, undef, undef, 0, $_[3]);
@@ -970,7 +1048,7 @@ sub handle_30 {goto &handle_28}
 sub handle_31 {goto &handle_28}
 sub handle_32 {goto &handle_28}
 sub handle_33 {goto &handle_28}
-		
+
 sub handle_34
 {
 	my $self = shift;
@@ -978,12 +1056,12 @@ sub handle_34
 	my $line = shift;
 	my $origin = shift;
 	if (eph_dup($line, $eph_pc34_restime)) {
-		dbg("PCPROT: dupe PC34, ignored") if isdbg('chanerr');
+		return;
 	} else {
 		$self->process_rcmd($_[1], $_[2], $_[2], $_[3]);
 	}
 }
-		
+
 # remote command replies
 sub handle_35
 {
@@ -994,7 +1072,7 @@ sub handle_35
 	eph_del_regex("^PC35\\^$_[2]\\^$_[1]\\^");
 	$self->process_rcmd_reply($_[1], $_[2], $_[1], $_[3]);
 }
-		
+
 sub handle_36 {goto &handle_34}
 
 # database stuff
@@ -1021,7 +1099,7 @@ sub handle_38
 	my $line = shift;
 	my $origin = shift;
 }
-		
+
 # incoming disconnect
 sub handle_39
 {
@@ -1037,7 +1115,7 @@ sub handle_39
 }
 
 sub handle_40 {goto &handle_28}
-		
+
 # user info
 sub handle_41
 {
@@ -1046,49 +1124,56 @@ sub handle_41
 	my $line = shift;
 	my $origin = shift;
 	my $call = $_[1];
+	my $sort = $_[2];
+	my $val = $_[3];
 
-	my $l = $line;
-	$l =~ s/[\x00-\x20\x7f-\xff]+//g; # remove all funny characters and spaces for dup checking
+	my $l = "PC41^$call^$sort";
 	if (eph_dup($l, $eph_info_restime)) {
-		dbg("PCPROT: dup PC41, ignored") if isdbg('chanerr');
 		return;
 	}
-			
+
 	# input filter if required
 	#			my $ref = Route::get($call) || Route->new($call);
 	#			return unless $self->in_filter_route($ref);
 
-	if ($_[3] eq $_[2] || $_[3] =~ /^\s*$/) {
+	if ($val eq $sort || $val =~ /^\s*$/) {
 		dbg('PCPROT: invalid value') if isdbg('chanerr');
 		return;
 	}
 
 	# add this station to the user database, if required
-	my $user = DXUser->get_current($call);
+	my $user = DXUser::get_current($call);
 	$user = DXUser->new($call) unless $user;
-			
-	if ($_[2] == 1) {
-		$user->name($_[3]);
-	} elsif ($_[2] == 2) {
-		$user->qth($_[3]);
-	} elsif ($_[2] == 3) {
-		if (is_latlong($_[3])) {
-			my ($lat, $long) = DXBearing::stoll($_[3]);
-			$user->lat($lat);
-			$user->long($long);
-			$user->qra(DXBearing::lltoqra($lat, $long));
+
+	if ($sort == 1) {
+		if (($val =~ /spotter/i || $val =~ /self/i) && $user->name && $user->name ne $val) {
+			dbg("PCPROT: invalid name") if isdbg('chanerr');
+			if ($main::mycall eq 'GB7DJK' || $main::mycall eq 'GB7BAA' || $main::mycall eq 'WR3D') {
+				DXChannel::broadcast_nodes(pc41($_[1], 1, $user->name)); # send it to everyone including me
+			}
+			return;
+		}
+		$user->name($val);
+	} elsif ($sort == 2) {
+		$user->qth($val);
+	} elsif ($sort == 3) {
+		if (is_latlong($val)) {
+			my ($lat, $long) = DXBearing::stoll($val);
+			$user->lat($lat) if $lat;
+			$user->long($long) if $long;
+			$user->qra(DXBearing::lltoqra($lat, $long)) unless $user->qra;
 		} else {
 			dbg('PCPROT: not a valid lat/long') if isdbg('chanerr');
 			return;
 		}
-	} elsif ($_[2] == 4) {
-		$user->homenode($_[3]);
-	} elsif ($_[2] == 5) {
-		if (is_qra(uc $_[3])) {
-			my ($lat, $long) = DXBearing::qratoll(uc $_[3]);
-			$user->lat($lat);
-			$user->long($long);
-			$user->qra(uc $_[3]);
+	} elsif ($sort == 4) {
+		$user->homenode($val);
+	} elsif ($sort == 5) {
+		if (is_qra(uc $val)) {
+			my ($lat, $long) = DXBearing::qratoll(uc $val);
+			$user->lat($lat) if $lat && !$user->lat;
+			$user->long($long) if $long && !$user->long;
+			$user->qra(uc $val);
 		} else {
 			dbg('PCPROT: not a valid QRA locator') if isdbg('chanerr');
 			return;
@@ -1102,7 +1187,7 @@ sub handle_41
 	}
 
 	#  perhaps this IS what we want after all
-	#			$self->route_pc41($ref, $call, $_[2], $_[3], $_[4]);
+	#			$self->route_pc41($ref, $call, $sort, $val, $_[4]);
 }
 
 sub handle_42 {goto &handle_28}
@@ -1114,7 +1199,7 @@ sub handle_45 {goto &handle_37}
 sub handle_46 {goto &handle_37}
 sub handle_47 {goto &handle_37}
 sub handle_48 {goto &handle_37}
-		
+
 # message and database
 sub handle_49
 {
@@ -1124,10 +1209,9 @@ sub handle_49
 	my $origin = shift;
 
 	if (eph_dup($line)) {
-		dbg("PCPROT: Dup PC49 ignored\n") if isdbg('chanerr');
 		return;
 	}
-	
+
 	if ($_[1] eq $main::mycall) {
 		DXMsg::handle_49($self, @_);
 	} else {
@@ -1143,6 +1227,8 @@ sub handle_50
 	my $line = shift;
 	my $origin = shift;
 
+	return if (eph_dup($line));
+
 	my $call = $_[1];
 
 	RouteDB::update($call, $self->{call});
@@ -1150,15 +1236,19 @@ 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);
 	}
 }
-		
+
 # incoming ping requests/answers
 sub handle_51
 {
@@ -1170,7 +1260,7 @@ sub handle_51
 	my $from = $_[2];
 	my $flag = $_[3];
 
-			
+
 	# is it for us?
 	if ($to eq $main::mycall) {
 		if ($flag == 1) {
@@ -1183,7 +1273,6 @@ sub handle_51
 		RouteDB::update($from, $self->{call});
 
 		if (eph_dup($line)) {
-			dbg("PCPROT: dup PC51 detected") if isdbg('chanerr');
 			return;
 		}
 		# route down an appropriate thingy
@@ -1191,6 +1280,8 @@ sub handle_51
 	}
 }
 
+sub handle_61 { goto &handle_11; }
+
 # dunno but route it
 sub handle_75
 {
@@ -1212,7 +1303,7 @@ sub handle_73
 	my $line = shift;
 	my $origin = shift;
 	my $call = $_[1];
-			
+
 	# do some de-duping
 	my $d = cltounix($call, sprintf("%02d18Z", $_[2]));
 	if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $_[2] < 0 || $_[2] > 23) {
@@ -1224,15 +1315,16 @@ sub handle_73
 		dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chanerr');
 		return;
 	}
-		
+
 	my $wcy = WCY::update($d, @_[2..12]);
 
-	my $rep;
-	eval {
-		$rep = Local::wcy($self, @_[1..12]);
-	};
-	# dbg("Local::wcy error $@") if isdbg('local') if $@;
-	return if $rep;
+	if (defined &Local::wcy) {
+		my $rep;
+		eval {
+			$rep = Local::wcy($self, @_[1..12]);
+		};
+		return if $rep;
+	}
 
 	# broadcast to the eager world
 	send_wcy_spot($self, $line, $d, @_[2..12]);
@@ -1264,8 +1356,14 @@ sub _decode_pc92_call
 	my $icall = shift;
 	my @part = split /:/, $icall;
 	my ($flag, $call) = unpack "A A*", $part[0];
-	return () unless $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;
@@ -1276,15 +1374,19 @@ sub _decode_pc92_call
 sub _encode_pc92_call
 {
 	my $ref = shift;
+
+	# plain call or value
+	return $ref unless ref $ref;
+
 	my $ext = shift;
 	my $flag = 0;
-	my $call = $ref->call; 
+	my $call = $ref->call;
 	my $extra = '';
 	$flag |= $ref->here ? 1 : 0;
 	if ($ref->isa('Route::Node') || $ref->isa('DXProt')) {
 		$flag |= 4;
 		my $dxchan = DXChannel::get($call);
-		$flag |= 2 if $call ne $main::mycall && $dxchan && !$dxchan->{do_pc92};
+		$flag |= 2 if $call ne $main::mycall && $dxchan && !$dxchan->{do_pc9x};
 		if ($ext) {
 			if ($ref->version) {
 				my $version = $ref->version || 1.0;
@@ -1296,19 +1398,28 @@ sub _encode_pc92_call
 	return "$flag$call$extra";
 }
 
+my %things_add;
+my %things_del;
+
 sub _add_thingy
 {
 	my $parent = shift;
 	my $s = shift;
-	my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($s);
+	my ($call, $is_node, $is_extnode, $here, $version, $build) = @$s;
 	my @rout;
 
 	if ($call) {
 		if ($is_node) {
+			dbg("ROUTE: added node $call to " . $parent->call) if isdbg('routelow');
 			@rout = $parent->add($call, $version, Route::here($here));
 		} else {
+			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;
 }
@@ -1317,32 +1428,61 @@ sub _del_thingy
 {
 	my $parent = shift;
 	my $s = shift;
-	my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($s);
+	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);
-			@rout = $nref->del($parent) if $nref;
+			$ref = Route::Node::get($call);
+			dbg("ROUTE: deleting node $call from " . $parent->call) if isdbg('routelow');
+			@rout = $ref->del($parent) if $ref;
 		} else {
-			my $uref = Route::User::get($call);
-			@rout = $parent->del_user($uref) if $uref;
+			$ref = Route::User::get($call);
+			dbg("ROUTE: deleting user $call from " . $parent->call) if isdbg('routelow');
+			@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;
 	}
 }
 
@@ -1352,24 +1492,129 @@ sub check_pc9x_t
 	my $t = shift;
 	my $pc = shift;
 	my $create = shift;
-	
+
+	# check that the time is between 0 >= $t < 86400
+	unless ($t >= 0 && $t < 86400) {
+		dbg("PCPROT: time invalid t: $t, ignored") if isdbg('chanerr');
+		return undef;
+	}
+
+	# check that the time of this pc9x is within tolerance (default 15 mins either way)
+	my $now = $main::systime - $main::systime_daystart ;
+	my $diff = abs($now - $t);
+	unless ($diff < $pc9x_time_tolerance || 86400 - $diff < $pc9x_time_tolerance) {
+		my $c = ref $call ? $call->call : $call;
+		dbg("PC9XERR: $c time out of range t: $t now: $now diff: $diff > $pc9x_time_tolerance, ignored") if isdbg('chan');
+		return undef;
+	}
+
 	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;
+		# we only do this for external calls whose routing table
+		# record come and go. The reference for mycall is permanent
+		# and not that frequently used, it also never times out, so
+		# 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;
+			if (defined $lastid) {
+				if ($t < $lastid) {
+					# note that this is where we determine whether this pc9x has come in yesterday
+					# but is still greater (modulo 86400) than the lastid or is simply an old
+					# duplicate sentence. To determine this we need to do some module 86400
+					# arithmetic. High numbers mean that this is an old duplicate sentence,
+					# low numbers that it is a new sentence.
+					#
+					# Typically you will see yesterday being taken on $t = 84, $lastid = 86235
+					# and old dupes with $t = 234, $lastid = 256 (which give answers 249 and
+					# 86378 respectively in the calculation below).
+					#
+					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 {
+					# check that if we have a low number in lastid that yesterday's numbers
+					# (likely in the 85000+ area) don't override them, thus causing flip flopping
+					if ($lastid+86400-$t < $pc9x_past_age) {
+						dbg("PCPROT: dup id on $t in yesterday, lastid $lastid, ignored") if isdbg('chanerr') || isdbg('pc92dedupe');
+						return undef;
+					}
+				}
+			}
 		}
-		$t -= 86400 if $t >= 86400;
 	} elsif ($create) {
 		$parent = Route::Node->new($call);
+	} else {
+		dbg("PCPROT: $call does not exist, ignored") if isdbg('pc92dedupe');
+		return undef;
+	}
+	if (isdbg('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;
- 
+	$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
 {
@@ -1378,107 +1623,333 @@ sub handle_92
 	my $line = shift;
 	my $origin = shift;
 
-	$self->{do_pc92} ||= 1;
+	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];
-	
-	my @ent = grep {$_ && /^[0-7]/} @_[4 .. $#_];
-	
+
+	# this catches loops of A/Ds
+#	if (eph_dup($line, $pc9x_dupe_age)) {
+#		return;
+#	}
+
 	if ($pcall eq $main::mycall) {
 		dbg("PCPROT: looped back, ignored") if isdbg('chanerr');
 		return;
 	}
 
-	my $parent = check_pc9x_t($pcall, $t, 92, 1) || return;
-	
-	$parent->lastid->{92} = $t;
-	$parent->do_pc92(1);
+	if ($pcall eq $self->{call} && $self->{state} eq 'init') {
+		if ($self->{isolate}) {
+			dbg("PC9x received, but $pcall is isolated, ignored");
+			return;
+		} elsif (!$self->user->wantpc9x) {
+			dbg("PC9x explicitly switched off on $pcall, ignored");
+			return;
+		} else {
+			$self->state('init92');
+			$self->{do_pc9x} = 1;
+			dbg("Do pc9x set on $pcall");
+		}
+	}
+	unless ($self->{do_pc9x}) {
+		dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr');
+		return;
+	}
+
+	# don't create routing entries for D records that don't already exist
+	# this is what causes all those PC92 loops!
+	my $parent = check_pc9x_t($pcall, $t, 92, $sort ne 'D') || return;
+	my $oparent = $parent;
 
-	if (@ent) {
+	$parent->do_pc9x(1);
+	$parent->via_pc92(1);
 
-		# 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');
+	if ($sort eq 'F' || $sort eq 'R') {
+
+		# this is the route finding section
+		# here is where the consequences of the 'find' command
+		# are dealt with
+
+		my $from = $_[4];
+		my $target = $_[5];
+
+		if ($sort eq 'F') {
+			my $flag;
+			my $ref;
+			my $dxchan;
+			if ($ref = DXChannel::get($target)) {
+				$flag = 1;		# we are directly connected
+			} else {
+				$ref = Route::get($target);
+				$dxchan = $ref->dxchan;
+				$flag = 2;
+			}
+			if ($ref && $flag && $dxchan) {
+				$self->send(pc92r($from, $target, $flag, int($dxchan->{pingave}*1000)));
 				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;
+		} elsif ($sort eq 'R') {
+			if (my $dxchan = DXChannel::get($from)) {
+				handle_pc92_find_reply($dxchan, $pcall, $from, $target, @_[6,7]);
+			} else {
+				my $ref = Route::get($from);
+				if ($ref) {
+					my @dxchan = grep {$_->do_pc9x} $ref->alldxchan;
+					if (@dxchan) {
+						$_->send($line) for @dxchan;
+					} else {
+						dbg("PCPROT: no return route, ignored") if isdbg('chanerr')
+					}
+				} else {
+					dbg("PCPROT: no return route, ignored") if isdbg('chanerr')
 				}
-				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->here(Route::here($here));
-		$parent->version($version) if $version && $version > $parent->version;
-		$parent->build($build) if $build && $build > $parent->build;
-		shift @ent;
-	}
 
-	my (@radd, @rdel);
-	
-	if ($sort eq 'A') {
-		for (@ent) {
-			push @radd, _add_thingy($parent, $_);
+	} 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 'D') {
-		for (@ent) {
-			push @rdel, _del_thingy($parent, $_);
+	} 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
+
+		# 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) {
+
+			# look at the first one which will always be a node of some sort
+			# 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 $add;
+
+			($parent, $add) = $self->pc92_handle_first_slot($ent[0], $parent, $t);
+			return unless $parent; # dupe
+
+			shift @ent;
+			push @radd, $add if $add;
 		}
-	} elsif ($sort eq 'C') {
-		my (@nodes, @users);
+
+		# do a pass through removing any references to either locally connected nodes or mycall
+		my @nent;
 		for (@ent) {
-			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
-			if ($call) {
-				if ($is_node) {
-					push @nodes, $call;
+			next unless $_ && @$_;
+			if ($_->[0] eq $main::mycall || DXChannel::get($_->[0])) {
+				dbg("PCPROT: $_->[0] refers to locally connected node, ignored") if isdbg('chanerr');
+				next;
+			}
+			push @nent, $_;
+		}
+
+		if ($sort eq 'A') {
+			for (@nent) {
+				push @radd, _add_thingy($parent, $_);
+			}
+		} elsif ($sort eq 'D') {
+			for (@nent) {
+				push @rdel, _del_thingy($parent, $_);
+			}
+		} elsif ($sort eq 'C') {
+			my (@nodes, @users);
+
+			# 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) {
+				#			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
+				if ($r->[0]) {
+					if ($r->[1]) {
+						push @nodes, $r->[0];
+					} else {
+						push @users, $r->[0];
+					}
 				} else {
-					push @users, $call;
+					dbg("PCPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr');
+				}
+			}
+
+			my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
+
+			# add users here
+			foreach my $r (@nent) {
+				my $call = $r->[0];
+				if ($call) {
+					push @radd,_add_thingy($parent, $r) if grep $call eq $_, (@$nnodes, @$nusers);
+				}
+			}
+			# del users here
+			foreach my $r (@$dnodes) {
+				push @rdel,_del_thingy($parent, [$r, 1]);
+			}
+			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;
+		}
+
+		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');
+		}
+		my @pc19 = grep { $_ && $_->isa('Route::Node') } @radd;
+		my @pc16 = grep { $_ && $_->isa('Route::User') } @radd;
+		unshift @pc19, $parent if $self->{state} eq 'init92' && $oparent == $parent;
+		$self->route_pc19($pcall, undef, @pc19) if @pc19;
+		$self->route_pc16($pcall, undef, $parent, @pc16) if @pc16;
+	}
+
+	# broadcast it if we get here
+	$self->broadcast_route_pc9x($pcall, undef, $line, 0);
+}
+
+
+sub handle_93
+{
+	my $self = shift;
+	my $pcno = shift;
+	my $line = shift;
+	my $origin = shift;
+
+#	$self->{do_pc9x} ||= 1;
+
+	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
+	unless ($self->{do_pc9x}) {
+		dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr');
+		return;
+	}
+
+	my $t = $_[2];
+	my $parent = check_pc9x_t($pcall, $t, 93, 1) || return;
+
+	my $to = uc $_[3];
+	my $from = uc $_[4];
+	my $via = uc $_[5];
+	my $text = $_[6];
+	my $onode = uc $_[7];
+	$onode = $pcall if @_ <= 8;
+
+	# this is catch loops caused by bad software ...
+	if (eph_dup("PC93|$from|$text|$onode", $pc10_dupe_age)) {
+		return;
+	}
+
+	# will we allow it at all?
+	if ($censorpc) {
+		my @bad;
+		if (@bad = BadWords::check($text)) {
+			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
+			return;
+		}
+	}
+
+	# if this is a 'bad spotter' user then ignore it
+	my $nossid = $from;
+	$nossid =~ s/-\d+$//;
+	if ($badspotter->in($nossid)) {
+		dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+		return;
+	}
+
+	# ignore PC93 coming in from outside this node with a target of local
+	if ($to eq 'LOCAL' && $self != $main::me) {
+		dbg("PCPROT: incoming LOCAL chat not from local node, ignored") if isdbg('chanerr');
+		return;
+	}
+
+	# 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;
+		$dxchan = DXChannel::get($to) unless $dxchan;
+		# check it...
+		if ($dxchan) {
+			if (ref $dxchan && $dxchan->isa('DXChannel')) {
+				if ($dxchan->is_user) {
+					$dxchan->talk($from, $to, $via, $text, $onode);
+					return;
 				}
 			} else {
-				dbg("DXPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr'); 
+				dbg("ERROR: $to -> $dxchan is not a DXChannel! (local talk)");
 			}
 		}
 
-		my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
+		# convert to PC10 talks where appropriate
+		# just go for the "best" one for now (rather than broadcast)
+		$dxchan = $ref->dxchan;
 
-		for (@ent) {
-			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
-			if ($call) {
-				push @radd,_add_thingy($parent, $_) if grep $call eq $_, (@$nnodes, @$nusers);
-				push @rdel,_del_thingy($parent, $_) if grep $call eq $_, (@$dnodes, @$dusers);
+		# check it...
+		if (ref $dxchan && $dxchan->isa('DXChannel')) {
+			if ($dxchan->{do_pc9x}) {
+				$dxchan->send($line);
+			} else {
+				$dxchan->talk($from, $to, $via, $text, $onode);
 			}
+		} else {
+			dbg("ERROR: $to -> $dxchan is not a DXChannel! (convert to pc10)");
 		}
-	} else {
-		dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr');
 		return;
+
+	} elsif ($to eq '*' || $to eq 'SYSOP' || $to eq 'WX') {
+		# announces
+		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';
+	} 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');
 	}
 
-	$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');
-	}
-	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;
+	# broadcast this chat sentence everywhere unless it is targetted to 'LOCAL'
+	$self->broadcast_route_pc9x($pcall, undef, $line, 0) unless $to eq 'LOCAL' || $via eq 'LOCAL';
 }
 
 # if get here then rebroadcast the thing with its Hop count decremented (if
@@ -1496,11 +1967,20 @@ sub handle_default
 	my $line = shift;
 	my $origin = shift;
 
-	if (eph_dup($line)) {
-		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
+	unless (eph_dup($line)) {
+		if ($pcno >= 90) {
+			my $pcall = $_[1];
+			unless (is_callsign($pcall)) {
+				dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
+				return;
+			}
+			my $t = $_[2];
+			my $parent = check_pc9x_t($pcall, $t, $pcno, 1) || return;
+			$self->broadcast_route_pc9x($pcall, undef, $line, 0);
+		} else {
+			unless ($self->{isolate}) {
+				DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me
+			}
 		}
 	}
 }