X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=835d4424f7a2dbcf80607651bbf0a0d72e6f5c21;hb=c62d1dbdc3238711628d49608946eefedda2362e;hp=8f46826a60c9ee93498320e2cb1e31a9769255ab;hpb=5a06cd7853e8bff86a0f17854c0791bb3f85c395;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 8f46826a..835d4424 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -4,8 +4,8 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
-# 
+#
+#
 
 package DXProt;
 
@@ -27,32 +27,30 @@ use DXDb;
 use AnnTalk;
 use Geomag;
 use WCY;
-use Time::HiRes qw(gettimeofday tv_interval);
 use BadWords;
 use DXHash;
 use Route;
 use Route::Node;
 use Script;
+use RouteDB;
+use DXProtHandle;
 
 use strict;
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
 			$last_hour $last10 %eph  %pings %rcmds $ann_to_talk
-			$pingint $obscount %pc19list $chatdupeage
+			$pingint $obscount %pc19list $chatdupeage $chatimportfn
+			$investigation_int $pc19_version $myprot_version
 			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
-			$allowzero $decode_dk0wcy $send_opernam @checklist);
+			$allowzero $decode_dk0wcy $send_opernam @checklist
+			$eph_pc15_restime $pc92_update_period $pc92_obs_timeout
+			%pc92_find $pc92_find_timeout $pc92_short_update_period
+		   );
 
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
 $pc23_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc23
 
 $last_hour = time;				# last time I did an hourly periodic update
-%pings = ();                    # outstanding ping requests outbound
 %rcmds = ();                    # outstanding rcmd requests outbound
 %nodehops = ();                 # node specific hop control
 %pc19list = ();					# list of outstanding PC19s that haven't had PC16s on them
@@ -67,19 +65,30 @@ $ann_to_talk = 1;
 $rspfcheck = 1;
 $eph_restime = 180;
 $eph_info_restime = 60*60;
+$eph_pc15_restime = 6*60;
 $eph_pc34_restime = 30;
 $pingint = 5*60;
 $obscount = 2;
 $chatdupeage = 20 * 60 * 60;
+$chatimportfn = "$main::root/chat_import";
+$investigation_int = 12*60*60;	# time between checks to see if we can see this node
+$pc19_version = 5466;			# the visible version no for outgoing PC19s generated from pc59
+$pc92_update_period = 60*60;	# the period between PC92 C updates
+$pc92_short_update_period = 15*60; # shorten the update period after a connection
+%pc92_find = ();				# outstanding pc92 find operations
+$pc92_find_timeout = 30;		# maximum time to wait for a reply
+$pc92_obs_timeout = $pc92_update_period; # the time between obscount countdowns
+
 
-@checklist = 
+
+@checklist =
 (
  [ qw(i c c m bp bc c) ],			# pc10
  [ qw(i f m d t m c c h) ],		# pc11
  [ qw(i c bm m bm bm p h) ],		# pc12
- [ qw(i c h) ],					# 
- [ qw(i c h) ],					# 
- [ qw(i c m h) ],					# 
+ [ qw(i c h) ],					#
+ [ qw(i c h) ],					#
+ [ qw(i c m h) ],					#
  undef ,						# pc16 has to be validated manually
  [ qw(i c c h) ],					# pc17
  [ qw(i m n) ],					# pc18
@@ -163,10 +172,10 @@ sub check
 {
 	my $n = shift;
 	$n -= 10;
-	return 0 if $n < 0 || $n > @checklist; 
+	return 0 if $n < 0 || $n > @checklist;
 	my $ref = $checklist[$n];
 	return 0 unless ref $ref;
-	
+
 	my $i;
 	for ($i = 1; $i < @$ref; $i++) {
 		my ($blank, $act) = $$ref[$i] =~ /^(b?)(\w)$/;
@@ -174,7 +183,7 @@ sub check
 		next if $blank && $_[$i] =~ /^[ \*]$/;
 		if ($act eq 'c') {
 			return $i unless is_callsign($_[$i]);
-		} elsif ($act eq 'i') {			
+		} elsif ($act eq 'i') {
 			;					# do nothing
 		} elsif ($act eq 'm') {
 			return $i unless is_pctext($_[$i]);
@@ -190,28 +199,60 @@ sub check
 			return $i unless $_[$i] =~ /^\s*\d+-\w\w\w-[12][90]\d\d$/;
 		} elsif ($act eq 't') {
 			return $i unless $_[$i] =~ /^[012]\d[012345]\dZ$/;
-		} 
+		}
 	}
 	return 0;
 }
 
+sub update_pc92_next
+{
+	my $self = shift;
+	my $period = shift || $pc92_update_period;
+	$self->{next_pc92_update} = $main::systime + $period - int rand($period / 4);
+}
+
 sub init
 {
 	do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
 	confess $@ if $@;
+
+	my $user = DXUser->get($main::mycall);
+	die "User $main::mycall not setup or disappeared RTFM" unless $user;
+
+	$myprot_version += $main::version*100;
+	$main::me = DXProt->new($main::mycall, 0, $user);
+	$main::me->{here} = 1;
+	$main::me->{state} = "indifferent";
+	$main::me->{sort} = 'S';    # S for spider
+	$main::me->{priv} = 9;
+	$main::me->{metric} = 0;
+	$main::me->{pingave} = 0;
+	$main::me->{registered} = 1;
+	$main::me->{version} = $main::version;
+	$main::me->{build} = "$main::subversion.$main::build";
+	$main::me->{do_pc9x} = 1;
+	$main::me->update_pc92_next($pc92_update_period);
 }
 
 #
 # obtain a new connection this is derived from dxchannel
 #
 
-sub new 
+sub new
 {
 	my $self = DXChannel::alloc(@_);
 
 	# add this node to the table, the values get filled in later
 	my $pkg = shift;
 	my $call = shift;
+
+	# if we have an entry already, then send a PC21 to all connect
+	# old style connections, because we are about to get the real deal
+	if (my $ref = Route::Node::get($call)) {
+		dbg("ROUTE: $call is already in the routing table, deleting") if isdbg('route');
+		my @rout = $ref->delete;
+		$self->route_pc21($main::mycall, undef, @rout) if @rout;
+	}
 	$main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
 
 	return $self;
@@ -227,9 +268,12 @@ sub start
 	my $user = $self->{user};
 
 	# log it
-	my $host = $self->{conn}->{peerhost} || "unknown";
+	my $host = $self->{conn}->{peerhost};
+	$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
+	$host ||= "unknown";
+
 	Log('DXProt', "$call connected from $host");
-	
+
 	# remember type of connection
 	$self->{consort} = $line;
 	$self->{outbound} = $sort eq 'O';
@@ -259,12 +303,18 @@ sub start
 	$self->{inwcyfilter} = Filter::read_in('wcy', $call, 1) || Filter::read_in('wcy', 'node_default', 1);
 	$self->{inannfilter} = Filter::read_in('ann', $call, 1) || Filter::read_in('ann', 'node_default', 1);
 	$self->{inroutefilter} = Filter::read_in('route', $call, 1) || Filter::read_in('route', 'node_default', 1) unless $self->{isolate};
-	
+	# if there is no route input filter then specify a default one.
+	# obviously this can be changed later by the sysop.
+	if (!$self->{inroutefilter}) {
+		my $dxcc = $self->dxcc;
+		$Route::filterdef->cmd($self, 'route', 'accept', "input by_dxcc $dxcc" );
+	}
+
 	# set unbuffered and no echo
 	$self->send_now('B',"0");
 	$self->send_now('E',"0");
 	$self->conn->echo(0) if $self->conn->can('echo');
-	
+
 	# ping neighbour node stuff
 	my $ping = $user->pingint;
 	$ping = $pingint unless defined $ping;
@@ -279,7 +329,7 @@ sub start
 	unless ($self->{outbound}) {
 		$self->sendinit;
 	}
-	
+
 	$self->state('init');
 	$self->{pc50_t} = $main::systime;
 
@@ -289,6 +339,9 @@ sub start
 	# run a script send the output to the debug file
 	my $script = new Script(lc $call) || new Script('node_default');
 	$script->run($self) if $script;
+
+	# set next_pc92_update time for this node sooner
+	$self->update_pc92_next($pc92_short_update_period);
 }
 
 #
@@ -301,71 +354,26 @@ sub sendinit
 	$self->send(pc18());
 }
 
-sub removepc90
-{
-	$_[0] =~ s/^PC90\^[-A-Z0-9]+\^\d+\^//;
-}
-
-sub removepc91
-{
-	$_[0] =~ s/^PC91\^[-A-Z0-9]+\^\d+\^[-A-Z0-9]+\^//;
-}
-
-sub send
-{
-	my $self = shift;
-	while (@_) {
-		my $line = shift;
-		if ($self->user->wantpc90) {
-			$line = mungepc90($line);
-		} else {
-			removepc91($line);
-			removepc90($line);
-		}
-		$self->SUPER::send($line);
-	}
-}
-
-my $pc90msgid = 0;
-
-sub nextpc90
-{
-	$pc90msgid = 0 if $pc90msgid > 9999;
-	return $pc90msgid++;
-}
-
-sub mungepc90
-{
-	unless ($_[0] =~ /^PC9\d/) {
-		my $id = nextpc90();
-		return "PC90^$main::mycall^$id^" . $_[0]; 
-	} 
-	return $_[0];
-}
-
-sub mungepc91
-{
-	unless ($_[1] =~ /^PC9\d/) {
-		my $id = nextpc90();
-		return "PC91^$main::mycall^$id^$_[0]^" . $_[1]; 
-	} 
-	return $_[1];
-}
-
 #
 # This is the normal pcxx despatcher
 #
 sub normal
 {
 	my ($self, $line) = @_;
+
+	if ($line =~ '^<\w+\s' && $main::do_xml) {
+		DXXml::normal($self, $line);
+		return;
+	}
+
 	my @field = split /\^/, $line;
 	return unless @field;
-	
+
 	pop @field if $field[-1] eq '~';
-	
+
 #	print join(',', @field), "\n";
-						
-	
+
+
 	# process PC frames, this will fail unless the frame starts PCnn
 	my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
 	unless (defined $pcno && $pcno >= 10 && $pcno <= 99) {
@@ -375,1306 +383,31 @@ sub normal
 
 	# check for and dump bad protocol messages
 	my $n = check($pcno, @field);
-	if ($n) {
-		dbg("PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")") if isdbg('chanerr');
-		return;
-	}
-
-	# handle PC90 frames in a special way.
-    # 
-	# PC90 frames are normal frames that that are wrapped in inside a PC90 
-    # The extra fields are "originating node" and a sequence number.
-    # The sequence number is checked against the nodes 'last one' to see if
-	# it is a duplicate and, if so, is dropped at this stage; before any
-	# other processing.
-	#
-	# This is done here simply for efficiency. Adding another function would
-	# add more copying and so on.
-	#
-
-	my $origin = $self->{call};
-	
-	if ($pcno >= 90) {
-		$origin = $field[1];
-		if ($origin eq $main::mycall) {
-			dbg("PCPROT: loop dupe") if isdbg('chanerr');
-			return;
-		}
-		$self->user->wantpc90(1) unless $self->user->wantpc90 || $origin ne $self->{call};
-		my $seq = $field[2];
-		my $node = Route::Node::get($origin);
-		if ($node) {
-			if (my $lid = $node->lid) {
-				my $cmp = $seq >= $lid ? $seq : $seq + 9999;
-				if ($cmp <= $lid) {
-					dbg("PCPROT: sequence dupe $seq ($cmp) <= $lid") if isdbg('chanerr');
-					return;
-				}
-			}
-			$node->lid($seq);
-		}
-
-		# do a recheck on the contents of the PC90
-		if ($pcno >= 90) {
-			shift @field;
-			shift @field;
-			shift @field;
-			$origin = shift @field if $pcno == 91;
-
-			($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
-			unless (defined $pcno && $pcno >= 10 && $pcno <= 89) {
-				dbg("PCPROT: unknown protocol") if isdbg('chanerr');
-				return;
-			}
-			
-			# check for and dump bad protocol messages
-			my $n = check($pcno, @field);
-			if ($n) {
-				dbg("PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")") if isdbg('chanerr');
-				return;
-			}
-		}
-	} else {
-		if ($pcno == 16 || $pcno == 17 || $pcno == 19 || $pcno == 21) {
-			$line = mungepc91($origin, $line);
-		} else {
-			$line = mungepc90($line);
-		}
-	}
-
-	no strict 'subs';
-	my $sub = "handle_$pcno";
-
-	if ($self->can($sub)) {
-		$self->$sub($pcno, $line, $origin, @field);
-	} else {
-		$self->handle_default($pcno, $line, $origin, @field);
-	}
-}
-	
-# incoming talk commands
-sub handle_10
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-
-	# rsfp check
-	return if $rspfcheck and !$self->rspfcheck(0, $_[6], $_[1]);
-			
-	# will we allow it at all?
-	if ($censorpc) {
-		my @bad;
-		if (@bad = BadWords::check($_[3])) {
-			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
-			return;
-		}
-	}
-
-	# is it for me or one of mine?
-	my ($from, $to, $via, $call, $dxchan);
-	$from = $_[1];
-	if ($_[5] gt ' ') {
-		$via = $_[2];
-		$to = $_[5];
-	} else {
-		$to = $_[2];
-	}
-
-	# if this is a 'nodx' node then ignore it
-	if ($badnode->in($_[6]) || ($via && $badnode->in($via))) {
-		dbg("PCPROT: Bad Node, 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;
-	}
-
-	# 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');
-			return;
-		}
-	}
-
-	# 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;
-	}
-
-	# 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) );
-	}
-}
-
-# DX Spot handling
-sub handle_11
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-
-	# 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]);
-
-	# if this is a 'nodx' node then ignore it
-	if ($badnode->in($_[7])) {
-		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+$//;
-	if ($badspotter->in($nossid)) {
-		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)
-	if (!$d || ($pcno == 11 && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
-		dbg("PCPROT: Spot ignored, invalid date or out of range ($_[3] $_[4])\n") if isdbg('chanerr');
-		return;
-	}
-
-	# is it 'baddx'
-	if ($baddx->in($_[2]) || BadWords::check($_[2]) || $_[2] =~ /COCK/) {
-		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
-	if ($_[2] =~ /BUST\w*$/) {
-		dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr');
-		return;
-	}
-	if ($censorpc) {
-		my @bad;
-		if (@bad = BadWords::check($_[5])) {
-			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
-			return;
-		}
-	}
-
-
-	my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $_[6], $_[7]);
-	# global spot filtering on INPUT
-	if ($self->{inspotsfilter}) {
-		my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
-		unless ($filter) {
-			dbg("PCPROT: Rejected by input spot filter") if isdbg('chanerr');
-			return;
-		}
-	}
-
-	# this goes after the input filtering, but before the add
-	# so that if it is input filtered, it isn't added to the dup
-	# list. This allows it to come in from a "legitimate" source
-	if (Spot::dup($_[1], $_[2], $d, $_[5], $_[6])) {
-		dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
-		return;
-	}
-
-	# add it 
-	Spot::add(@spot);
-
-	#
-	# @spot at this point contains:-
-	# freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node
-	# 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]);
-	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->put;
-			}
-		}
-
-		# send a remote command to a distant cluster if it is visible and there is no
-		# qra locator and we havn't done it for a month.
-
-		unless ($user->qra) {
-			my $node;
-			my $to = $user->homenode;
-			my $last = $user->lastoper || 0;
-			if ($send_opernam && $to && $to ne $main::mycall && $main::systime > $last + $DXUser::lastoperinterval && ($node = Route::Node::get($to)) ) {
-				my $cmd = "forward/opernam $spot[4]";
-				# send the rcmd but we aren't interested in the replies...
-				my $dxchan = $node->dxchan;
-				if ($dxchan && $dxchan->is_clx) {
-					route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
-				} else {
-					route(undef, $to, pc34($main::mycall, $to, $cmd));
-				}
-				if ($to ne $_[7]) {
-					$to = $_[7];
-					$node = Route::Node::get($to);
-					if ($node) {
-						$dxchan = $node->dxchan;
-						if ($dxchan && $dxchan->is_clx) {
-							route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
-						} else {
-							route(undef, $to, pc34($main::mycall, $to, $cmd));
-						}
-					}
-				}
-				$user->lastoper($main::systime);
-				$user->put;
-			}
-		}
-	}
-				
-	# local processing 
-	my $r;
-	eval {
-		$r = Local::spot($self, @spot);
-	};
-	#			dbg("Local::spot1 error $@") if isdbg('local') if $@;
-	return if $r;
-
-	# DON'T be silly and send on PC26s!
-	return if $pcno == 26;
-
-	# send out the filtered spots
-	send_dx_spot($self, $line, @spot) if @spot;
-}
-		
-# announces
-sub handle_12
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-
-	#			return if $rspfcheck and !$self->rspfcheck(1, $_[5], $_[1]);
-
-	# announce duplicate checking
-	$_[3] =~ s/^\s+//;			# remove leading blanks
-
-	if ($censorpc) {
-		my @bad;
-		if (@bad = BadWords::check($_[3])) {
-			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
-			return;
-		}
-	}
-
-	# if this is a 'nodx' node then ignore it
-	if ($badnode->in($_[5])) {
-		dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
-		return;
-	}
-
-	# if this is a 'bad spotter' user then ignore it
-	my $nossid = $_[1];
-	$nossid =~ s/-\d+$//;
-	if ($badspotter->in($nossid)) {
-		dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
-		return;
-	}
-
-	my $dxchan;
-	
-	if ((($dxchan = DXChannel->get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){
-		$self->send_chat($line, @_[1..6]);
-	} elsif ($_[2] eq '*' || $_[2] eq $main::mycall) {
-
-		# ignore something that looks like a chat line coming in with sysop
-		# flag - this is a kludge...
-		if ($_[3] =~ /^\#\d+ / && $_[4] eq '*') {
-			dbg('PCPROT: Probable chat rewrite, dropped') if isdbg('chanerr');
-			return;
-		}
-
-		# here's a bit of fun, convert incoming ann with a callsign in the first word
-		# or one saying 'to <call>' to a talk if we can route to the recipient
-		if ($ann_to_talk) {
-			my $call = AnnTalk::is_talk_candidate($_[1], $_[3]);
-			if ($call) {
-				my $ref = Route::get($call);
-				if ($ref) {
-					$dxchan = $ref->dxchan;
-					$dxchan->talk($_[1], $call, undef, $_[3], $_[5]) if $dxchan != $self;
-					return;
-				}
-			}
-		}
-	
-		# send it
-		$self->send_announce($line, @_[1..6]);
-	} else {
-		$self->route($_[2], $line);
-	}
-}
-		
-# incoming user		
-sub handle_16
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-
-	if (eph_dup($line)) {
-		dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
-		return;
-	}
-
-	# general checks
-	my $dxchan;
-	my $ncall = $_[1];
-	my $newline = "PC16^";
-			
-	# do 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');
-		return;
-	}
-	my $parent = Route::Node::get($ncall); 
-
-	# if there is a parent, proceed, otherwise if there is a latent PC19 in the PC19list, 
-	# fix it up in the routing tables and issue it forth before the PC16
-	unless ($parent) {
-		my $nl = $pc19list{$ncall};
-
-		if ($nl && @_ > 3) { # 3 because of the hop count!
-
-			# this is a new (remembered) node, now attach it to me if it isn't in filtered
-			# and we haven't disallowed it
-			my $user = DXUser->get_current($ncall);
-			if (!$user) {
-				$user = DXUser->new($ncall);
-				$user->sort('A');
-				$user->priv(1);	# I have relented and defaulted nodes
-				$user->lockout(1);
-				$user->homenode($ncall);
-				$user->node($ncall);
-			}
-
-			my $wantpc19 = $user->wantroutepc19;
-			if ($wantpc19 || !defined $wantpc19) {
-				my $new = Route->new($ncall); # throw away
-				if ($self->in_filter_route($new)) {
-					my @nrout;
-					for (@$nl) {
-						$parent = Route::Node::get($_->[0]);
-						$dxchan = $parent->dxchan if $parent;
-						if ($dxchan && $dxchan ne $self) {
-							dbg("PCPROT: PC19 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
-							$parent = undef;
-						}
-						if ($parent) {
-							my $r = $parent->add($ncall, $_->[1], $_->[2]);
-							push @nrout, $r unless @nrout;
-						}
-					}
-					$user->wantroutepc19(1) unless defined $wantpc19; # for now we work on the basis that pc16 = real route 
-					$user->lastin($main::systime) unless DXChannel->get($ncall);
-					$user->put;
-						
-					# route the pc19 - this will cause 'stuttering PC19s' for a while
-					$self->route_pc19($origin, $line, @nrout) if @nrout ;
-					$parent = Route::Node::get($ncall);
-					unless ($parent) {
-						dbg("PCPROT: lost $ncall after sending PC19 for it?");
-						return;
-					}
-				} else {
-					return;
-				}
-				delete $pc19list{$ncall};
-			}
-		} else {
-			dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
-			return;
-		}
-	} else {
-				
-		$dxchan = $parent->dxchan;
-		if ($dxchan && $dxchan ne $self) {
-			dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
-			return;
-		}
-
-		# input filter if required
-		return unless $self->in_filter_route($parent);
-	}
-
-	my $i;
-	my @rout;
-	for ($i = 2; $i < $#_; $i++) {
-		my ($call, $conf, $here) = $_[$i] =~ /^(\S+) (\S) (\d)/o;
-		next unless $call && $conf && defined $here && is_callsign($call);
-		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;
-		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);					
-			if ($r->flags != $flags) {
-				$r->flags($flags);
-				$au = $r;
-			}
-			push @rout, $r if $au;
-		} else {
-			push @rout, $parent->add_user($call, $flags);
-		}
-		
-				
-		# 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;
-		$user->homenode($parent->call) if !$user->homenode;
-		$user->node($parent->call);
-		$user->lastin($main::systime) unless DXChannel->get($call);
-		$user->put;
-	}
-	$self->route_pc16($origin, $line, $parent, @rout) if @rout;
-}
-		
-# remove a user
-sub handle_17
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	my $dxchan;
-	my $ncall = $_[2];
-	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;
-	}
-
-	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 ($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
-	return unless $self->in_filter_route($parent);
-			
-	$parent->del_user($uref);
-
-	if (eph_dup($line)) {
-		dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
-		return;
-	}
-
-	$self->route_pc17($origin, $line, $parent, $uref);
-}
-		
-# link request
-sub handle_18
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	$self->state('init');	
-
-	# 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);
-		unless ($self->is_spider) {
-			$self->user->sort('S');
-			$self->user->put;
-			$self->sort('S');
-		}
-	} else {
-		$self->version(50.0);
-		$self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/;
-		$self->user->version($self->version);
-	}
-
-	# first clear out any nodes on this dxchannel
-	my $parent = Route::Node::get($self->{call});
-	my @rout = $parent->del_nodes;
-	$self->route_pc21($origin, $line, @rout, $parent) if @rout;
-	$self->send_local_config();
-	$self->send(pc20());
-}
-		
-# incoming cluster list
-sub handle_19
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-
-	my $i;
-	my $newline = "PC19^";
-
-	if (eph_dup($line)) {
-		dbg("PCPROT: dup PC19 detected") if isdbg('chanerr');
-		return;
-	}
-
-	# new routing list
-	my @rout;
-
-	# first get the INTERFACE node
-	my $parent = Route::Node::get($self->{call});
-	unless ($parent) {
-		dbg("DXPROT: my parent $self->{call} has disappeared");
-		$self->disconnect;
-		return;
-	}
-
-	# if the origin isn't the same as the INTERFACE, then reparent, creating nodes as necessary
-	if ($origin ne $self->call) {
-		my $op = Route::Node::get($origin);
-		unless ($op) {
-			$op = $parent->add($origin, 5000, Route::here(1));
-			my $user = DXUser->get_current($origin);
-			if (!$user) {
-				$user = DXUser->new($origin);
-				$user->sort('S');
-				$user->priv(1);		# I have relented and defaulted nodes
-				$user->lockout(1);
-				$user->homenode($origin);
-				$user->node($origin);
-				$user->wantroutepc19(1);
-				$user->wantpc90(1);
-			}
-			$user->put;
-		}
-		$parent = $op;
-	}
-
-	# parse the PC19
-	for ($i = 1; $i < $#_-1; $i += 4) {
-		my $here = $_[$i];
-		my $call = uc $_[$i+1];
-		my $conf = $_[$i+2];
-		my $ver = $_[$i+3];
-		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 if $ver < 5000;	# only works with version 5 software
-		next if length $call < 3; # min 3 letter callsigns
-		next if $call eq $main::mycall;
-
-		# check that this PC19 isn't trying to alter the wrong dxchan
-		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');
-			next;
-		}
-
-		# add this station to the user database, if required (don't remove SSID from nodes)
-		my $user = DXUser->get_current($call);
-		if (!$user) {
-			$user = DXUser->new($call);
-			$user->sort('A');
-			$user->priv(1);		# I have relented and defaulted nodes
-			$user->lockout(1);
-			$user->homenode($call);
-			$user->node($call);
-		}
-
-		my $r = Route::Node::get($call);
-		my $flags = Route::here($here)|Route::conf($conf);
-
-		# modify the routing table if it is in it, otherwise store it in the pc19list for now
-		if ($r) {
-			my $ar;
-			if ($call ne $parent->call) {
-				if ($self->in_filter_route($r)) {
-					$ar = $parent->add($call, $ver, $flags);
-					push @rout, $ar if $ar;
-				} else {
-					next;
-				}
-			}
-			if ($r->version ne $ver || $r->flags != $flags) {
-				$r->version($ver);
-				$r->flags($flags);
-				push @rout, $r unless $ar;
-			}
-		} else {
-
-			# if he is directly connected or allowed then add him, otherwise store him up for later
-			if ($call eq $self->{call} || $user->wantroutepc19) {
-				my $new = Route->new($call); # throw away
-				if ($self->in_filter_route($new)) {
-					my $ar = $parent->add($call, $ver, $flags);
-					$user->wantroutepc19(1) unless defined $user->wantroutepc19;
-					push @rout, $ar if $ar;
-				} else {
-					next;
-				}
-			} else {
-				$pc19list{$call} = [] unless exists $pc19list{$call};
-				my $nl = $pc19list{$call};
-				push @{$pc19list{$call}}, [$self->{call}, $ver, $flags] unless grep $_->[0] eq $self->{call}, @$nl;
-			}
-		}
-
-		# 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;
-	}
-
-
-	$self->route_pc19($origin, $line, @rout) if @rout;
-}
-		
-# send local configuration
-sub handle_20
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	$self->send_local_config();
-	$self->send(pc22());
-	$self->state('normal');
-	$self->{lastping} = 0;
-}
-		
-# delete a cluster from the list
-sub handle_21
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	my $call = uc $_[1];
-
-	eph_del_regex("^PC1[679].*$call");
-			
-	# if I get a PC21 from the same callsign as self then treat it
-	# as a PC39: I have gone away
-	if ($call eq $self->call) {
-		$self->disconnect(1);
-		return;
-	}
-
-	# check to see if we are in the pc19list, if we are then don't bother with any of
-	# this routing table manipulation, just remove it from the list and dump it
-	my @rout;
-	if (my $nl = $pc19list{$call}) {
-		$pc19list{$call} = [ grep {$_->[0] ne $self->{call}} @$nl ];
-		delete $pc19list{$call} unless @{$pc19list{$call}};
-	} else {
-				
-		my $parent = Route::Node::get($self->{call});
-		unless ($parent) {
-			dbg("DXPROT: my parent $self->{call} has disappeared");
-			$self->disconnect;
-			return;
-		}
-		if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
-			my $node = Route::Node::get($call);
-			if ($node) {
-						
-				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
-				push @rout, $node->del($parent);
-			}
-		} else {
-			dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr');
-			return;
-		}
-	}
-
-	$self->route_pc21($origin, $line, @rout) if @rout;
-}
-		
-
-sub handle_22
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	$self->state('normal');
-	$self->{lastping} = 0;
-}
-				
-# WWV info
-sub handle_23
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-			
-	# route foreign' pc27s 
-	if ($pcno == 27) {
-		if ($_[8] ne $main::mycall) {
-			$self->route($_[8], $line);
-			return;
-		}
-	}
-
-	return if $rspfcheck and !$self->rspfcheck(1, $_[8], $_[7]);
-
-	# do some de-duping
-	my $d = cltounix($_[1], sprintf("%02d18Z", $_[2]));
-	my $sfi = unpad($_[3]);
-	my $k = unpad($_[4]);
-	my $i = unpad($_[5]);
-	my ($r) = $_[6] =~ /R=(\d+)/;
-	$r = 0 unless $r;
-	if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $_[2] < 0 || $_[2] > 23) {
-		dbg("PCPROT: WWV Date ($_[1] $_[2]) out of range") if isdbg('chanerr');
-		return;
-	}
-	if (Geomag::dup($d,$sfi,$k,$i,$_[6])) {
-		dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chanerr');
-		return;
-	}
-	$_[7] =~ s/-\d+$//o;		# remove spotter's ssid
-		
-	my $wwv = 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;
-
-	# DON'T be silly and send on PC27s!
-	return if $pcno == 27;
-
-	# broadcast to the eager world
-	send_wwv_spot($self, $line, $d, $_[2], $sfi, $k, $i, @_[6..8]);
-}
-		
-# set here status
-sub handle_24
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	my $call = uc $_[1];
-	my ($nref, $uref);
-	$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;
-	return unless $self->in_filter_route($ref);
-
-	$self->route_pc24($origin, $line, $ref, $_[3]);
-}
-		
-# merge request
-sub handle_25
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	if ($_[1] ne $main::mycall) {
-		$self->route($_[1], $line);
-		return;
-	}
-	if ($_[2] eq $main::mycall) {
-		dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chanerr');
-		return;
-	}
-
-	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]);
-		my $in;
-		foreach $in (@in) {
-			$self->send(pc26(@{$in}[0..4], $_[2]));
-		}
-	}
-
-	# wwv
-	if ($_[4] > 0) {
-		my @in = reverse Geomag::search(0, $_[4], time, 1);
-		my $in;
-		foreach $in (@in) {
-			$self->send(pc27(@{$in}[0..5], $_[2]));
-		}
-	}
-}
-
-sub handle_26 {goto &handle_11}
-sub handle_27 {goto &handle_23}
-
-# mail/file handling
-sub handle_28
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	if ($_[1] eq $main::mycall) {
-		no strict 'refs';
-		my $sub = "DXMsg::handle_$pcno";
-		&$sub($self, @_);
-	} else {
-		$self->route($_[1], $line) unless $self->is_clx;
-	}
-}
-
-sub handle_29 {goto &handle_28}
-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;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	if (eph_dup($line, $eph_pc34_restime)) {
-		dbg("PCPROT: dupe PC34, ignored") if isdbg('chanerr');
-	} else {
-		$self->process_rcmd($_[1], $_[2], $_[2], $_[3]);
-	}
-}
-		
-# remote command replies
-sub handle_35
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	eph_del_regex("^PC35\\^$_[2]\\^$_[1]\\^");
-	$self->process_rcmd_reply($_[1], $_[2], $_[1], $_[3]);
-}
-		
-sub handle_36 {goto &handle_34}
-
-# database stuff
-sub handle_37
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	if ($_[1] eq $main::mycall) {
-		no strict 'refs';
-		my $sub = "DXDb::handle_$pcno";
-		&$sub($self, @_);
-	} else {
-		$self->route($_[1], $line) unless $self->is_clx;
-	}
-}
-
-# node connected list from neighbour
-sub handle_38
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-}
-		
-# incoming disconnect
-sub handle_39
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	if ($_[1] eq $self->{call}) {
-		$self->disconnect(1);
-	} else {
-		dbg("PCPROT: came in on wrong channel") if isdbg('chanerr');
-	}
-}
-
-sub handle_40 {goto &handle_28}
-		
-# user info
-sub handle_41
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	my $call = $_[1];
-
-	my $l = $line;
-	$l =~ s/[\x00-\x20\x7f-\xff]+//g; # remove all funny characters and spaces for dup checking
-	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*$/) {
-		dbg('PCPROT: invalid value') if isdbg('chanerr');
-		return;
-	}
-
-	# add this station to the user database, if required
-	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));
-		} 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]);
-		} else {
-			dbg('PCPROT: not a valid QRA locator') if isdbg('chanerr');
-			return;
-		}
-	}
-	$user->lastoper($main::systime); # to cut down on excessive for/opers being generated
-	$user->put;
-
-	unless ($self->{isolate}) {
-		DXChannel::broadcast_nodes($line, $self); # send it to everyone but me
-	}
-
-	#  perhaps this IS what we want after all
-	#			$self->route_pc41($ref, $call, $_[2], $_[3], $_[4]);
-}
-
-sub handle_42 {goto &handle_28}
-
-
-# database
-sub handle_44 {goto &handle_37}
-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
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	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 {
-		$self->route($_[1], $line) unless $self->is_clx;
-	}
-}
-
-# keep alive/user list
-sub handle_50
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-
-	my $call = $_[1];
-	my $node = Route::Node::get($call);
-	if ($node) {
-		return unless $node->call eq $self->{call};
-		$node->usercount($_[2]);
-
-		# input filter if required
-		return unless $self->in_filter_route($node);
-
-		$self->route_pc50($origin, $line, $node, $_[2], $_[3]) unless eph_dup($line);
-	}
-}
-		
-# incoming ping requests/answers
-sub handle_51
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	my $to = $_[1];
-	my $from = $_[2];
-	my $flag = $_[3];
-
-			
-	# is it for us?
-	if ($to eq $main::mycall) {
-		if ($flag == 1) {
-			$self->send(pc51($from, $to, '0'));
-		} else {
-			# it's a reply, look in the ping list for this one
-			my $ref = $pings{$from};
-			if ($ref) {
-				my $tochan =  DXChannel->get($from);
-				while (@$ref) {
-					my $r = shift @$ref;
-					my $dxchan = DXChannel->get($r->{call});
-					next unless $dxchan;
-					my $t = tv_interval($r->{t}, [ gettimeofday ]);
-					if ($dxchan->is_user) {
-						my $s = sprintf "%.2f", $t; 
-						my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
-						$dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
-					} elsif ($dxchan->is_node) {
-						if ($tochan) {
-							my $nopings = $tochan->user->nopings || $obscount;
-							push @{$tochan->{pingtime}}, $t;
-							shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
-
-								# cope with a missed ping, this means you must set the pingint large enough
-							if ($t > $tochan->{pingint}  && $t < 2 * $tochan->{pingint} ) {
-								$t -= $tochan->{pingint};
-							}
-
-								# calc smoothed RTT a la TCP
-							if (@{$tochan->{pingtime}} == 1) {
-								$tochan->{pingave} = $t;
-							} else {
-								$tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
-							}
-							$tochan->{nopings} = $nopings; # pump up the timer
-						}
-					} 
-				}
-			}
-		}
-	} else {
-		if ($line !~ /^PC90/ && eph_dup($line)) {
-			dbg("PCPROT: dup PC51 detected") if isdbg('chanerr');
-			return;
-		}
-		# route down an appropriate thingy
-		$self->route($to, $line);
-	}
-}
-
-# dunno but route it
-sub handle_75
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	my $call = $_[1];
-	if ($call ne $main::mycall) {
-		$self->route($call, $line);
-	}
-}
-
-# WCY broadcasts
-sub handle_73
-{
-	my $self = shift;
-	my $pcno = shift;
-	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) {
-		dbg("PCPROT: WCY Date ($call $_[2]) out of range") if isdbg('chanerr');
-		return;
-	}
-	@_ = map { unpad($_) } @_;
-	if (WCY::dup($d)) {
-		dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chanerr');
+	if ($n) {
+		dbg("PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")") 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;
-
-	# broadcast to the eager world
-	send_wcy_spot($self, $line, $d, @_[2..12]);
-}
-
-# remote commands (incoming)
-sub handle_84
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	$self->process_rcmd($_[1], $_[2], $_[3], $_[4]);
-}
-
-# remote command replies
-sub handle_85
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
-	$self->process_rcmd_reply($_[1], $_[2], $_[3], $_[4]);
-}
 
-# if get here then rebroadcast the thing with its Hop count decremented (if
-# there is one). If it has a hop count and it decrements to zero then don't
-# rebroadcast it.
-#
-# NOTE - don't arrive here UNLESS YOU WANT this lump of protocol to be
-#        REBROADCAST!!!!
-#
+	# modify the hop count here
+	if ($self != $main::me) {
+		if (my ($hops, $trail) = $line =~ /\^H(\d+)(\^?\~?)?$/) {
+			$trail ||= '';
+			$hops--;
+			return if $hops < 0;
+			$line =~ s/\^H(\d+)(\^?\~?)?$/sprintf('^H%d%s', $hops, $trail)/e;
+			$field[-1] = "H$hops";
+		}
+	}
 
-sub handle_default
-{
-	my $self = shift;
-	my $pcno = shift;
-	my $line = shift;
-	my $origin = shift;
+	# send it out for processing
+	my $origin = $self->{call};
+	no strict 'subs';
+	my $sub = "handle_$pcno";
 
-	if (eph_dup($line)) {
-		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
+	if ($self->can($sub)) {
+		$self->$sub($pcno, $line, $origin, @field);
 	} else {
-		unless ($self->{isolate}) {
-			DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me
-		}
+		$self->handle_default($pcno, $line, $origin, @field);
 	}
 }
 
@@ -1685,10 +418,10 @@ sub handle_default
 sub process
 {
 	my $t = time;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my $pc50s;
-	
+
 	# send out a pc50 on EVERY channel all at once
 	if ($t >= $last_pc50 + $DXProt::pc50_interval) {
 		$pc50s = pc50($main::me, scalar DXChannel::get_all_users);
@@ -1697,33 +430,52 @@ sub process
 	}
 
 	foreach $dxchan (@dxchan) {
-		next unless $dxchan->is_node();
+		next unless $dxchan->is_node;
+		next if $dxchan->handle_xml;
 		next if $dxchan == $main::me;
 
 		# send the pc50
 		$dxchan->send($pc50s) if $pc50s;
-		
+
 		# send a ping out on this channel
 		if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) {
 			if ($dxchan->{nopings} <= 0) {
 				$dxchan->disconnect;
 			} else {
-				addping($main::mycall, $dxchan->call);
+				DXXml::Ping::add($main::me, $dxchan->call);
 				$dxchan->{nopings} -= 1;
 				$dxchan->{lastping} = $t;
+				$dxchan->{lastping} += $dxchan->{pingint} / 2 unless @{$dxchan->{pingtime}};
+			}
+		}
+
+		# send out a PC92 config record if required
+		if ($main::systime >= $dxchan->{next_pc92_update}) {
+			if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) {
+				$dxchan->send_pc92_update($dxchan->{call});
 			}
+			$dxchan->update_pc92_next($pc92_update_period);
 		}
 	}
 
+	Investigate::process();
+	clean_pc92_find();
+
 	# every ten seconds
-	if ($t - $last10 >= 10) {	
-		# clean out ephemera 
+	if ($t - $last10 >= 10) {
+		# clean out ephemera
 
 		eph_clean();
+		import_chat();
+
+		if ($main::systime >= $pc92_obs_timeout) {
+			time_out_pc92_routes();
+			$pc92_obs_timeout = $main::systime + $pc92_update_period;
+		}
 
 		$last10 = $t;
 	}
-	
+
 	if ($main::systime - 3600 > $last_hour) {
 		$last_hour = $main::systime;
 	}
@@ -1742,9 +494,9 @@ sub send_dx_spot
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
-	
+
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
@@ -1793,22 +545,10 @@ sub send_wwv_spot
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
-	my ($wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-	my @dxcc = Prefix::extract($_[6]);
-	if (@dxcc > 0) {
-		$wwv_dxcc = $dxcc[1]->dxcc;
-		$wwv_itu = $dxcc[1]->itu;
-		$wwv_cq = $dxcc[1]->cq;						
-	}
-	@dxcc = Prefix::extract($_[7]);
-	if (@dxcc > 0) {
-		$org_dxcc = $dxcc[1]->dxcc;
-		$org_itu = $dxcc[1]->itu;
-		$org_cq = $dxcc[1]->cq;						
-	}
-	
+	my @dxcc = ((Prefix::cty_data($_[6]))[0..2], (Prefix::cty_data($_[7]))[0..2]);
+
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
@@ -1817,7 +557,7 @@ sub send_wwv_spot
 		my $routeit;
 		my ($filter, $hops);
 
-		$dxchan->wwv($line, $self->{isolate}, @_, $self->{call}, $wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq);
+		$dxchan->wwv($line, $self->{isolate}, @_, $self->{call}, @dxcc);
 	}
 }
 
@@ -1827,9 +567,9 @@ sub wwv
 	my $line = shift;
 	my $isolate = shift;
 	my ($filter, $hops);
-	
+
 	if ($self->{wwvfilter}) {
-		($filter, $hops) = $self->{wwvfilter}->it(@_);
+		($filter, $hops) = $self->{wwvfilter}->it(@_[7..$#_]);
 		return unless $filter;
 	}
 	send_prot_line($self, $filter, $hops, $isolate, $line)
@@ -1839,29 +579,17 @@ sub send_wcy_spot
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
-	my ($wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-	my @dxcc = Prefix::extract($_[10]);
-	if (@dxcc > 0) {
-		$wcy_dxcc = $dxcc[1]->dxcc;
-		$wcy_itu = $dxcc[1]->itu;
-		$wcy_cq = $dxcc[1]->cq;						
-	}
-	@dxcc = Prefix::extract($_[11]);
-	if (@dxcc > 0) {
-		$org_dxcc = $dxcc[1]->dxcc;
-		$org_itu = $dxcc[1]->itu;
-		$org_cq = $dxcc[1]->cq;						
-	}
-	
+	my @dxcc = ((Prefix::cty_data($_[10]))[0..2], (Prefix::cty_data($_[11]))[0..2]);
+
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
 		next if $dxchan == $main::me;
 		next if $dxchan == $self;
 
-		$dxchan->wcy($line, $self->{isolate}, @_, $self->{call}, $wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq);
+		$dxchan->wcy($line, $self->{isolate}, @_, $self->{call}, @dxcc);
 	}
 }
 
@@ -1883,50 +611,36 @@ sub wcy
 sub send_announce
 {
 	my $self = shift;
+	my $from_pc9x = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
-	my $target;
+	my $target = $_[6];
 	my $to = 'To ';
 	my $text = unpad($_[2]);
-				
+
 	if ($_[3] eq '*') {	# sysops
 		$target = "SYSOP";
 	} elsif ($_[3] gt ' ') { # speciality list handling
-		my ($name) = split /\./, $_[3]; 
-		$target = "$name"; # put the rest in later (if bothered) 
-	} 
-	
+		my ($name) = split /\./, $_[3];
+		$target = "$name"; # put the rest in later (if bothered)
+	}
+
 	if ($_[5] eq '1') {
-		$target = "WX"; 
+		$target = "WX";
 		$to = '';
 	}
 	$target = "ALL" if !$target;
 
 
-	# obtain country codes etc 
-	my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-	my ($ann_state, $org_state) = ("", "");
-	my @dxcc = Prefix::extract($_[0]);
-	if (@dxcc > 0) {
-		$ann_dxcc = $dxcc[1]->dxcc;
-		$ann_itu = $dxcc[1]->itu;
-		$ann_cq = $dxcc[1]->cq;						
-		$ann_state = $dxcc[1]->state;
-	}
-	@dxcc = Prefix::extract($_[4]);
-	if (@dxcc > 0) {
-		$org_dxcc = $dxcc[1]->dxcc;
-		$org_itu = $dxcc[1]->itu;
-		$org_cq = $dxcc[1]->cq;						
-		$org_state = $dxcc[1]->state;
-	}
-
+	# obtain country codes etc
+	my @a = Prefix::cty_data($_[0]);
+	my @b = Prefix::cty_data($_[4]);
 	if ($self->{inannfilter}) {
-		my ($filter, $hops) = 
-			$self->{inannfilter}->it(@_, $self->{call}, 
-									 $ann_dxcc, $ann_itu, $ann_cq,
-									 $org_dxcc, $org_itu, $org_cq, $ann_state, $org_state);
+		my ($filter, $hops) =
+			$self->{inannfilter}->it(@_, $self->{call},
+									 @a[0..2],
+									 @b[0..2], $a[3], $b[3]);
 		unless ($filter) {
 			dbg("PCPROT: Rejected by input announce filter") if isdbg('chanerr');
 			return;
@@ -1945,7 +659,10 @@ sub send_announce
 	foreach $dxchan (@dxchan) {
 		next if $dxchan == $main::me;
 		next if $dxchan == $self && $self->is_node;
-		$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
+		next if $from_pc9x && $dxchan->{do_pc9x};
+		next if $target eq 'LOCAL' && $dxchan->is_node;
+		$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call},
+						  @a[0..2], @b[0..2]);
 	}
 }
 
@@ -1962,41 +679,27 @@ sub nextchatmsgid
 sub send_chat
 {
 	my $self = shift;
+	my $from_pc9x = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my $target = $_[3];
 	my $text = unpad($_[2]);
 	my $ak1a_line;
-				
+
 	# munge the group and recast the line if required
 	if ($target =~ s/\.LST$//) {
 		$ak1a_line = $line;
 	}
-	
-	# obtain country codes etc 
-	my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-	my ($ann_state, $org_state) = ("", "");
-	my @dxcc = Prefix::extract($_[0]);
-	if (@dxcc > 0) {
-		$ann_dxcc = $dxcc[1]->dxcc;
-		$ann_itu = $dxcc[1]->itu;
-		$ann_cq = $dxcc[1]->cq;						
-		$ann_state = $dxcc[1]->state;
-	}
-	@dxcc = Prefix::extract($_[4]);
-	if (@dxcc > 0) {
-		$org_dxcc = $dxcc[1]->dxcc;
-		$org_itu = $dxcc[1]->itu;
-		$org_cq = $dxcc[1]->cq;						
-		$org_state = $dxcc[1]->state;
-	}
 
+	# obtain country codes etc
+	my @a = Prefix::cty_data($_[0]);
+	my @b = Prefix::cty_data($_[4]);
 	if ($self->{inannfilter}) {
-		my ($filter, $hops) = 
-			$self->{inannfilter}->it(@_, $self->{call}, 
-									 $ann_dxcc, $ann_itu, $ann_cq,
-									 $org_dxcc, $org_itu, $org_cq, $ann_state, $org_state);
+		my ($filter, $hops) =
+			$self->{inannfilter}->it(@_, $self->{call},
+									 @a[0..2],
+									 @b[0..2], $a[3], $b[3]);
 		unless ($filter) {
 			dbg("PCPROT: Rejected by input announce filter") if isdbg('chanerr');
 			return;
@@ -2015,18 +718,20 @@ sub send_chat
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
 		my $is_ak1a = $dxchan->is_ak1a;
-		
+
 		if ($dxchan->is_node) {
 			next if $dxchan == $main::me;
 			next if $dxchan == $self;
+			next if $from_pc9x && $dxchan->{do_pc9x};
 			next unless $dxchan->is_spider || $is_ak1a;
 			next if $target eq 'LOCAL';
 			if (!$ak1a_line && $is_ak1a) {
-				$ak1a_line = DXProt::pc12($_[0], $text, $_[1], "$target.LST");
+				$ak1a_line = pc12($_[0], $text, $_[1], "$target.LST");
 			}
 		}
-		
-		$dxchan->chat($is_ak1a ? $ak1a_line : $line, $self->{isolate}, $target, $_[1], $text, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
+
+		$dxchan->chat($is_ak1a ? $ak1a_line : $line, $self->{isolate}, $target, $_[1],
+					  $text, @_, $self->{call}, @a[0..2], @b[0..2]);
 	}
 }
 
@@ -2056,21 +761,30 @@ sub chat
 sub send_local_config
 {
 	my $self = shift;
+
+	dbg('DXProt::send_local_config') if isdbg('trace');
+
+	# send our nodes
 	my $node;
 	my @nodes;
 	my @localnodes;
 	my @remotenodes;
 
-	dbg('DXProt::send_local_config') if isdbg('trace');
-	
-	# send our nodes
 	if ($self->{isolate}) {
+		dbg("send_local_config: isolated");
 		@localnodes = ( $main::routeroot );
 		$self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
+	} elsif ($self->{do_pc9x}) {
+		dbg("send_local_config: doing pc9x");
+		my $node = Route::Node::get($self->{call});
+		$self->send_last_pc92_config($main::routeroot);
+		$self->send(pc92a($main::routeroot, $node)) unless $main::routeroot->last_PC92C =~ /$self->{call}/;
 	} else {
 		# create a list of all the nodes that are not connected to this connection
 		# and are not themselves isolated, this to make sure that isolated nodes
-        # don't appear outside of this node
+		# don't appear outside of this node
+
+		dbg("send_local_config: traditional");
 
 		# send locally connected nodes
 		my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
@@ -2078,40 +792,117 @@ sub send_local_config
 		$self->send_route($main::mycall, \&pc19, scalar(@localnodes)+1, $main::routeroot, @localnodes);
 
 		my $node;
-		if ($self->user->wantpc90) {
-			for $node (@localnodes) {
-				my @nodes = map {my $r = Route::Node::get($_); $r ? $r : ()} $node->nodes;
-				$self->send_route($node->call, \&pc19, scalar(@nodes)+1, @nodes);
-				for my $r (@nodes) {
-					push @remotenodes, $r unless grep $r eq $_, @remotenodes;
-				}
-			}
-		} else {
-			my @rawintcalls = map { $_->nodes } @localnodes if @localnodes;
-			my @intcalls;
-			for $node (@rawintcalls) {
-				push @intcalls, $node unless grep $node eq $_, @intcalls; 
-			}
-			my $ref = Route::Node::get($self->{call});
-			my @rnodes = $ref->nodes;
-			for $node (@intcalls) {
-				push @remotenodes, Route::Node::get($node) unless grep $node eq $_, @rnodes, @remotenodes;
-			}
-			$self->send_route($main::mycall, \&pc19, scalar(@remotenodes), @remotenodes);
+		my @rawintcalls = map { $_->nodes } @localnodes if @localnodes;
+		my @intcalls;
+		for $node (@rawintcalls) {
+			push @intcalls, $node unless grep $node eq $_, @intcalls;
+		}
+		my $ref = Route::Node::get($self->{call});
+		my @rnodes = $ref->nodes;
+		for $node (@intcalls) {
+			push @remotenodes, Route::Node::get($node) unless grep $node eq $_, @rnodes, @remotenodes;
 		}
+		$self->send_route($main::mycall, \&pc19, scalar(@remotenodes), @remotenodes);
 	}
-	
 
-	
 	# get all the users connected on the above nodes and send them out
-	foreach $node ($main::routeroot, @localnodes, @remotenodes) {
-		if ($node) {
-			my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
-			$self->send_route($main::mycall, \&pc16, 1, $node, @rout) if @rout && $self->user->wantsendpc16;
+	unless ($self->{do_pc9x}) {
+		foreach $node ($main::routeroot, @localnodes, @remotenodes) {
+			if ($node) {
+				my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
+				$self->send_route($main::mycall, \&pc16, 1, $node, @rout) if @rout && $self->user->wantsendpc16;
+			} else {
+				dbg("sent a null value") if isdbg('chanerr');
+			}
+		}
+	}
+}
+
+sub gen_my_pc92_config
+{
+	my $node = shift;
+
+	if ($node->{call} eq $main::mycall) {
+		my @dxchan = grep { $_->call ne $main::mycall && !$_->{isolate} } DXChannel::get_all();
+		dbg("ROUTE: all dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
+		my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
+		dbg("ROUTE: localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
+		return pc92c($main::routeroot, @localnodes);
+	} else {
+		my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
+		return pc92c($node, @rout);
+	}
+}
+
+sub gen_pc92_update
+{
+	my $self = shift;
+
+	# send 'my' configuration for all channels
+	my $l = gen_my_pc92_config($main::routeroot);
+	return $l;
+}
+
+
+sub send_last_pc92_config
+{
+	my $self = shift;
+	my $node = shift;
+	if (my $l = $node->last_PC92C) {
+		$self->send($l);
+	} else {
+		$self->send_pc92_config($node);
+	}
+}
+
+sub send_pc92_config
+{
+	my $self = shift;
+	my $node = shift;
+
+	dbg('DXProt::send_pc92_config') if isdbg('trace');
+
+	$node->last_PC92C(gen_my_pc92_config($node));
+	$self->send($node->last_PC92C);
+}
+
+sub send_pc92_update
+{
+	my $self = shift;
+	my $call = shift;
+
+	dbg('DXProt::send_pc92_update') if isdbg('trace');
+
+	my $l = gen_my_pc92_config(Route::Node::get($call));
+	$main::me->broadcast_route_pc9x($main::mycall, undef, $l, 0);
+}
+
+sub time_out_pc92_routes
+{
+	my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc9x || $_->via_pc92)} Route::Node::get_all();
+	my @rdel;
+	foreach my $n (@nodes) {
+		my $o = $n->dec_obs;
+		if ($o <= 0) {
+			if (my $dxchan = DXChannel::get($n->call)) {
+				dbg("disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('obscount');
+				$dxchan->disconnect;
+				next;
+			}
+			my @parents = map {Route::Node::get($_)} $n->parents;
+			for (@parents) {
+				if ($_) {
+					dbg("deleting pc92 $_->{call} from $n->{call} on obscount")  if isdbg('obscount');
+					push @rdel, $n->del($_);
+				}
+			}
 		} else {
-			dbg("sent a null value") if isdbg('chanerr');
+			dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('obscount');
 		}
 	}
+	for (@rdel) {
+		$main::me->route_pc21($main::mycall, undef, $_) if $_;
+	}
 }
 
 #
@@ -2119,6 +910,7 @@ sub send_local_config
 #
 # is called route(to, pcline);
 #
+
 sub route
 {
 	my ($self, $call, $line) = @_;
@@ -2129,8 +921,10 @@ sub route
 	}
 
 	# always send it down the local interface if available
-	my $dxchan = DXChannel->get($call);
-	unless ($dxchan) {
+	my $dxchan = DXChannel::get($call);
+	if ($dxchan) {
+		dbg("route: $call -> $dxchan->{call} direct" ) if isdbg('route');
+	} else {
 		my $cl = Route::get($call);
 		$dxchan = $cl->dxchan if $cl;
 		if (ref $dxchan) {
@@ -2138,8 +932,23 @@ sub route
 				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
 				return;
 			}
+			dbg("route: $call -> $dxchan->{call} using normal route" ) if isdbg('route');
 		}
 	}
+
+	# try the backstop method
+	unless ($dxchan) {
+		my $rcall = RouteDB::get($call);
+		if ($rcall) {
+			if ($self && $rcall eq $self->{call}) {
+				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
+				return;
+			}
+			$dxchan = DXChannel::get($rcall);
+			dbg("route: $call -> $rcall using RouteDB" ) if isdbg('route') && $dxchan;
+		}
+	}
+
 	if ($dxchan) {
 		my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
 		if ($routeit) {
@@ -2151,7 +960,7 @@ sub route
 }
 
 #
-# obtain the hops from the list for this callsign and pc no 
+# obtain the hops from the list for this callsign and pc no
 #
 
 sub get_hops
@@ -2159,11 +968,11 @@ sub get_hops
 	my $pcno = shift;
 	my $hops = $DXProt::hopcount{$pcno};
 	$hops = $DXProt::def_hopcount if !$hops;
-	return "H$hops";       
+	return "H$hops";
 }
 
-# 
-# adjust the hop count on a per node basis using the user loadable 
+#
+# adjust the hop count on a per node basis using the user loadable
 # hop table if available or else decrement an existing one
 #
 
@@ -2173,8 +982,8 @@ sub adjust_hops
 	my $s = shift;
 	my $call = $self->{call};
 	my $hops;
-	
-	if (($hops) = $s =~ /\^H(\d+)\^~?$/o) {
+
+	if (($hops) = $s =~ /\^H(\d+)\^?~?$/o) {
 		my ($pcno) = $s =~ /^PC(\d\d)/o;
 		confess "$call called adjust_hops with '$s'" unless $pcno;
 		my $ref = $nodehops{$call} if %nodehops;
@@ -2185,17 +994,12 @@ sub adjust_hops
 			return "" if defined $newhops && $newhops == 0;
 			$newhops = $hops if !$newhops;
 			$s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
-		} else {
-			# simply decrement it
-			$hops--;
-			return "" if !$hops;
-			$s =~ s/\^H(\d+)(\^~?)$/\^H$hops$2/ if $hops;
 		}
 	}
 	return $s;
 }
 
-# 
+#
 # load hop tables
 #
 sub load_hops
@@ -2207,20 +1011,6 @@ sub load_hops
 	return ();
 }
 
-
-# add a ping request to the ping queues
-sub addping
-{
-	my ($from, $to) = @_;
-	my $ref = $pings{$to} || [];
-	my $r = {};
-	$r->{call} = $from;
-	$r->{t} = [ gettimeofday ];
-	route(undef, $to, pc51($to, $main::mycall, 1));
-	push @$ref, $r;
-	$pings{$to} = $ref;
-}
-
 sub process_rcmd
 {
 	my ($self, $tonode, $fromnode, $user, $cmd) = @_;
@@ -2259,13 +1049,13 @@ sub process_rcmd_reply
 	if ($tonode eq $main::mycall) {
 		my $s = $rcmds{$fromnode};
 		if ($s) {
-			my $dxchan = DXChannel->get($s->{call});
-			my $ref = $user eq $tonode ? $dxchan : (DXChannel->get($user) || $dxchan);
+			my $dxchan = DXChannel::get($s->{call});
+			my $ref = $user eq $tonode ? $dxchan : (DXChannel::get($user) || $dxchan);
 			$ref->send($line) if $ref;
 			delete $rcmds{$fromnode} if !$dxchan;
 		} else {
 			# send unsolicited ones to the sysop
-			my $dxchan = DXChannel->get($main::myalias);
+			my $dxchan = DXChannel::get($main::myalias);
 			$dxchan->send($line) if $dxchan;
 		}
 	} else {
@@ -2306,7 +1096,7 @@ sub addrcmd
 	$r->{t} = $main::systime;
 	$r->{cmd} = $cmd;
 	$rcmds{$to} = $r;
-	
+
 	my $ref = Route::Node::get($to);
 	my $dxchan = $ref->dxchan;
 	if ($dxchan && $dxchan->is_clx) {
@@ -2323,7 +1113,7 @@ sub disconnect
 	my $call = $self->call;
 
 	return if $self->{disconnecting}++;
-	
+
 	unless ($pc39flag && $pc39flag == 1) {
 		$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
 	}
@@ -2336,39 +1126,29 @@ sub disconnect
 	my @rout;
 	if ($node) {
 		@rout = $node->del($main::routeroot);
-		
+
 		# and all my ephemera as well
 		for (@rout) {
 			my $c = $_->call;
 			eph_del_regex("^PC1[679].*$c");
 		}
 	}
-	
-	# remove them from the pc19list as well
-	while (my ($k,$v) = each %pc19list) {
-		my @l = grep {$_->[0] ne $call} @{$pc19list{$k}};
-		if (@l) {
-			$pc19list{$k} = \@l;
-		} else {
-			delete $pc19list{$k};
-		}
-		
-		# and the ephemera
-		eph_del_regex("^PC1[679].*$k");
-	}
+
+	RouteDB::delete_interface($call);
 
 	# unbusy and stop and outgoing mail
 	my $mref = DXMsg::get_busy($call);
 	$mref->stop_msg($call) if $mref;
-	
+
 	# broadcast to all other nodes that all the nodes connected to via me are gone
-	unless ($pc39flag && $pc39flag == 2) {
+	unless ($pc39flag && $pc39flag == 2)  {
 		$self->route_pc21($main::mycall, undef, @rout) if @rout;
+		$self->route_pc92d($main::mycall, undef, $main::routeroot, $node) if $node;
 	}
 
 	# remove outstanding pings
 	delete $pings{$call};
-	
+
 	# I was the last node visited
     $self->user->node($main::mycall);
 
@@ -2381,16 +1161,19 @@ sub disconnect
 }
 
 
-# 
+#
 # send a talk message to this thingy
 #
 sub talk
 {
 	my ($self, $from, $to, $via, $line, $origin) = @_;
-	
-	$line =~ s/\^/\\5E/g;			# remove any ^ characters
-	$self->send(DXProt::pc10($from, $to, $via, $line, $origin));
-	Log('talk', $to, $from, $via?$via:$self->call, $line) unless $origin && $origin ne $main::mycall;
+
+	if ($self->{do_pc9x}) {
+		$self->send(pc93($to, $from, $via, $line));
+	} else {
+		$self->send(pc10($from, $to, $via, $line, $origin));
+	}
+	Log('talk', $to, $from, '>' . ($via || $origin || $self->call), $line) unless $origin && $origin ne $main::mycall;
 }
 
 # send it if it isn't the except list and isn't isolated and still has a hop count
@@ -2401,14 +1184,14 @@ sub send_route
 	my $self = shift;
 	my $origin = shift;
 	my $generate = shift;
-	my $no = shift;     # the no of things to filter on 
+	my $no = shift;     # the no of things to filter on
 	my $routeit;
 	my ($filter, $hops);
 	my @rin;
-	
+
 	for (; @_ && $no; $no--) {
 		my $r = shift;
-		
+
 		if (!$self->{isolate} && $self->{routefilter}) {
 			$filter = undef;
 			if ($r) {
@@ -2416,7 +1199,7 @@ sub send_route
 				if ($filter) {
 					push @rin, $r;
 				} else {
-					dbg("DXPROT: $self->{call}/" . $r->call . " rejected by output filter") if isdbg('chanerr');
+					dbg("PCPROT: $self->{call}/" . $r->call . " rejected by output filter") if isdbg('filter');
 				}
 			} else {
 				dbg("was sent a null value") if isdbg('chanerr');
@@ -2434,13 +1217,13 @@ sub send_route
 				$routeit = adjust_hops($self, $line);  # adjust its hop count by node name
 				next unless $routeit;
 			}
-			
-			$routeit = mungepc91($origin, $routeit) if $self->user->wantpc90;
+
 			$self->send($routeit);
 		}
 	}
 }
 
+# broadcast everywhere
 sub broadcast_route
 {
 	my $self = shift;
@@ -2449,19 +1232,89 @@ sub broadcast_route
 	my $line = shift;
 	my @dxchan = DXChannel::get_all_nodes();
 	my $dxchan;
-	
+
+	if ($line) {
+		$line =~ /\^H(\d+)\^?\~?$/;
+		return unless $1 > 0;
+	}
 	unless ($self->{isolate}) {
 		foreach $dxchan (@dxchan) {
-			next if $dxchan == $self;
-			next if $dxchan == $main::me;
+			next if $dxchan == $self || $dxchan == $main::me;
+			next if $origin eq $dxchan->{call};	# don't route some from this call back again.
+			next unless $dxchan->isa('DXProt');
+
+			$dxchan->send_route($origin, $generate, @_);
+		}
+	}
+}
+
+# broadcast to non-pc9x nodes
+sub broadcast_route_nopc9x
+{
+	my $self = shift;
+	my $origin = shift;
+	my $generate = shift;
+	my $line = shift;
+	my @dxchan = DXChannel::get_all_nodes();
+	my $dxchan;
+
+	if ($line) {
+		$line =~ /\^H(\d+)\^?\~?$/;
+		return unless $1 > 0;
+	}
+	unless ($self->{isolate}) {
+		foreach $dxchan (@dxchan) {
+			next if $dxchan == $self || $dxchan == $main::me;
+			next if $origin eq $dxchan->{call};	# don't route some from this call back again.
 			next unless $dxchan->isa('DXProt');
+			next if $dxchan->{do_pc9x};
 			next if ($generate == \&pc16 || $generate==\&pc17) && !$dxchan->user->wantsendpc16;
- 
-			if ($self->user->wantpc90 && $line) {
-				$dxchan->send(mungepc91($origin, $line));
-			} else {
-				$dxchan->send_route($origin, $generate, @_);
-			}
+
+			$dxchan->send_route($origin, $generate, @_);
+		}
+	}
+}
+
+# this is only used for next door nodes on init
+sub send_route_pc92
+{
+	my $self = shift;
+
+	return unless $self->{do_pc9x};
+
+	my $origin = shift;
+	my $generate = shift;
+	my $no = shift;     # the no of things to filter on
+	my $line;
+
+	$line = &$generate(@_);
+	$self->send($line);
+}
+
+# broadcast only to pc9x nodes
+sub broadcast_route_pc9x
+{
+	my $self = shift;
+	my $origin = shift;
+	my $generate = shift;
+	my $line = shift;
+	my $no = shift;
+	my @dxchan = DXChannel::get_all_nodes();
+	my $dxchan;
+
+	if ($origin eq $main::mycall && $generate && !$line) {
+		$line = &$generate(@_);
+	}
+
+	$line =~ /\^H(\d+)\^\~?$/;
+	unless ($1 > 0 && $self->{isolate}) {
+		foreach $dxchan (@dxchan) {
+			next if $dxchan == $self || $dxchan == $main::me;
+			next if $origin eq $dxchan->{call};	# don't route some from this call back again.
+			next unless $dxchan->isa('DXProt');
+			next unless $dxchan->{do_pc9x};
+
+			$dxchan->send($line);
 		}
 	}
 }
@@ -2472,7 +1325,7 @@ sub route_pc16
 	return unless $self->user->wantpc16;
 	my $origin = shift;
 	my $line = shift;
-	broadcast_route($self, $origin, \&pc16, $line, 1, @_);
+	broadcast_route_nopc9x($self, $origin, \&pc16, $line, 1, @_);
 }
 
 sub route_pc17
@@ -2481,7 +1334,7 @@ sub route_pc17
 	return unless $self->user->wantpc16;
 	my $origin = shift;
 	my $line = shift;
-	broadcast_route($self, $origin, \&pc17, $line, 1, @_);
+	broadcast_route_nopc9x($self, $origin, \&pc17, $line, 1, @_);
 }
 
 sub route_pc19
@@ -2489,7 +1342,7 @@ sub route_pc19
 	my $self = shift;
 	my $origin = shift;
 	my $line = shift;
-	broadcast_route($self, $origin, \&pc19, $line, scalar @_, @_);
+	broadcast_route_nopc9x($self, $origin, \&pc19, $line, scalar @_, @_);
 }
 
 sub route_pc21
@@ -2497,7 +1350,7 @@ sub route_pc21
 	my $self = shift;
 	my $origin = shift;
 	my $line = shift;
-	broadcast_route($self, $origin, \&pc21, $line, scalar @_, @_);
+	broadcast_route_nopc9x($self, $origin, \&pc21, $line, scalar @_, @_);
 }
 
 sub route_pc24
@@ -2524,12 +1377,36 @@ sub route_pc50
 	broadcast_route($self, $origin, \&pc50, $line, 1, @_);
 }
 
+sub route_pc92c
+{
+	my $self = shift;
+	my $origin = shift;
+	my $line = shift;
+	broadcast_route_pc9x($self, $origin, \&pc92c, $line, 1, @_);
+}
+
+sub route_pc92a
+{
+	my $self = shift;
+	my $origin = shift;
+	my $line = shift;
+	broadcast_route_pc9x($self, $origin, \&pc92a, $line, 1, @_);
+}
+
+sub route_pc92d
+{
+	my $self = shift;
+	my $origin = shift;
+	my $line = shift;
+	broadcast_route_pc9x($self, $origin, \&pc92d, $line, 1, @_);
+}
+
 sub in_filter_route
 {
 	my $self = shift;
 	my $r = shift;
 	my ($filter, $hops) = (1, 1);
-	
+
 	if ($self->{inroutefilter}) {
 		($filter, $hops) = $self->{inroutefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq, $self->state, $r->state);
 		dbg("PCPROT: $self->{call}/" . $r->call . ' rejected by in_filter_route') if !$filter && isdbg('chanerr');
@@ -2545,9 +1422,9 @@ sub eph_dup
 
 	# chop the end off
 	$s =~ s/\^H\d\d?\^?\~?$//;
-	removepc90($s);
 	$r = 1 if exists $eph{$s};    # pump up the dup if it keeps circulating
 	$eph{$s} = $main::systime + $t;
+	dbg("PCPROT: emphemeral duplicate") if $r && isdbg('chanerr');
 	return $r;
 }
 
@@ -2565,7 +1442,7 @@ sub eph_del_regex
 sub eph_clean
 {
 	my ($key, $val);
-	
+
 	while (($key, $val) = each %eph) {
 		if ($main::systime >= $val) {
 			delete $eph{$key};
@@ -2588,5 +1465,92 @@ sub run_cmd
 {
 	goto &DXCommandmode::run_cmd;
 }
+
+
+# import any msgs in the chat directory
+# the messages are sent to the chat group which forms the
+# the first part of the name (eg: solar.1243.txt would be
+# sent to chat group SOLAR)
+#
+# Each message found is sent: one non-blank line to one chat
+# message. So 4 lines = 4 chat messages.
+#
+# The special name LOCAL is for local users ANN
+# The special name ALL is for ANN/FULL
+# The special name SYSOP is for ANN/SYSOP
+#
+sub import_chat
+{
+	# are there any to do in this directory?
+	return unless -d $chatimportfn;
+	unless (opendir(DIR, $chatimportfn)) {
+		dbg("can\'t open $chatimportfn $!") if isdbg('msg');
+		Log('msg', "can\'t open $chatimportfn $!");
+		return;
+	}
+
+	my @names = readdir(DIR);
+	closedir(DIR);
+	my $name;
+	foreach $name (@names) {
+		next if $name =~ /^\./;
+		my $splitit = $name =~ /^split/;
+		my $fn = "$chatimportfn/$name";
+		next unless -f $fn;
+		unless (open(MSG, $fn)) {
+			dbg("can\'t open import file $fn $!") if isdbg('msg');
+			Log('msg', "can\'t open import file $fn $!");
+			unlink($fn);
+			next;
+		}
+		my @msg = map { s/\r?\n$//; $_ } <MSG>;
+		close(MSG);
+		unlink($fn);
+
+		my @cat = split /\./, $name;
+		my $target = uc $cat[0];
+
+		foreach my $text (@msg) {
+			next unless $text && $text !~ /^\s*#/;
+			if ($target eq 'ALL' || $target eq 'LOCAL' || $target eq 'SYSOP') {
+				my $sysopflag = $target eq 'SYSOP' ? '*' : ' ';
+				if ($target ne 'LOCAL') {
+					send_announce($main::me, pc12($main::mycall, $text, '*', $sysopflag), $main::mycall, '*', $text, $sysopflag, $main::mycall, '0');
+				} else {
+					Log('ann', 'LOCAL', $main::mycall, $text);
+					DXChannel::broadcast_list("To LOCAL de ${main::mycall}: $text\a", 'ann', undef, DXCommandmode->get_all());
+				}
+			} else {
+				my $msgid = nextchatmsgid();
+				$text = "#$msgid $text";
+				send_chat($main::me, pc12($main::mycall, $text, '*', $target), $main::mycall, '*', $text, $target, $main::mycall, '0');
+			}
+		}
+	}
+}
+
+# start a pc92 find operation
+sub start_pc92_find
+{
+	my $dxchan = shift;
+	my $target = shift;
+	my $key = "$dxchan->{call}|$target";
+	if ($pc92_find{$key}) {
+
+	}
+}
+
+# function (not method) to handle pc92 find returns
+sub handle_pc92_find_reply
+{
+	my ($dxchan, $node, $from, $target, $flag, $ms) = @_;
+
+	$dxchan->print_pc92_find_reply($node, $target, $flag, $ms) if $dxchan->can('print_pc92_find_return');
+}
+
+sub clean_pc92_find
+{
+
+}
 1;
-__END__ 
+__END__