X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=b6c0b75903f61497b0343cad62899d09ab0d7eca;hb=4b207544da78b182bd12e94eab01451694749012;hp=0cf46bb9ce3a2f425f67cca568ae0131778eb464;hpb=d7dbb7fe3680afb068ffc585b1f95690008a9a7d;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 0cf46bb9..b6c0b759 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -4,8 +4,8 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
-# 
+#
+#
 
 package DXProt;
 
@@ -32,7 +32,6 @@ use DXHash;
 use Route;
 use Route::Node;
 use Script;
-use RouteDB;
 use DXProtHandle;
 
 use strict;
@@ -40,11 +39,14 @@ use strict;
 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 $chatimportfn
-			$investigation_int $pc19_version $myprot_version
-			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
+			$pc19_version $myprot_version
+			%nodehops $baddx $badspotter $badnode $censorpc
 			$allowzero $decode_dk0wcy $send_opernam @checklist
-			$eph_pc15_restime $pc92_update_period $last_pc92_update
-			%pc92_find $pc92_find_timeout
+			$eph_pc15_restime $pc92_update_period $pc92_obs_timeout
+			%pc92_find $pc92_find_timeout $pc92_short_update_period
+			$next_pc92_obs_timeout $pc92_slug_changes $last_pc92_slug
+			$pc92_extnode_update_period $pc50_interval
+			$pc92_keepalive_period
 		   );
 
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
@@ -62,32 +64,31 @@ $badspotter = new DXHash "badspotter";
 $badnode = new DXHash "badnode";
 $last10 = $last_pc50 = time;
 $ann_to_talk = 1;
-$rspfcheck = 1;
-$eph_restime = 180;
-$eph_info_restime = 60*60;
+$eph_restime = 60;
+$eph_info_restime = 18*60*60;
 $eph_pc15_restime = 6*60;
 $eph_pc34_restime = 30;
 $pingint = 5*60;
 $obscount = 2;
-$chatdupeage = 20 * 60 * 60;
+$chatdupeage = 20 * 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 = 30*60;	# the period between PC92 C updates
-$last_pc92_update = time + int rand(180);		# the last time a PC92 config update
+$pc19_version = 5455;			# the visible version no for outgoing PC19s generated from pc59
+$pc92_update_period = 4*60*60;	# the period between outgoing PC92 C updates
+$pc92_short_update_period = 15*60; # shorten the update period after a connection or start up
+$pc92_extnode_update_period = 1*60*60; # the update period for external nodes
+$pc92_keepalive_period = 1*60*60;	# frequency of PC92 K (keepalive) records
 %pc92_find = ();				# outstanding pc92 find operations
 $pc92_find_timeout = 30;		# maximum time to wait for a reply
 
 
-
-@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
@@ -133,7 +134,7 @@ $pc92_find_timeout = 30;		# maximum time to wait for a reply
  undef,
  undef,
  undef,							# pc60
- undef,
+ [ qw(i f m d t m c c a h) ],		# pc61
  undef,
  undef,
  undef,
@@ -162,7 +163,10 @@ $pc92_find_timeout = 30;		# maximum time to wait for a reply
  undef,
  undef,
  undef,
- [ qw(i c n) ],					# pc90
+ undef,							# pc90
+ undef,
+ [ qw(i c f l)],				# pc92
+ [ qw(i c f *m c *c m)],					# pc93
 );
 
 # use the entry in the check list to check the field list presented
@@ -171,18 +175,19 @@ 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)$/;
 		return 0 unless $act;
-		next if $blank && $_[$i] =~ /^[ \*]$/;
+		next if $blank eq 'b' && $_[$i] =~ /^[ \*]$/;
+		next if $blank eq '*' && $_[$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]);
@@ -198,21 +203,41 @@ 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$/;
-		} 
+		} elsif ($act eq 'l') {
+			return $i unless $_[$i] =~ /^[A-Z]$/;
+		} elsif ($act eq 'a') {
+			return $i unless is_ipaddr($_[$i]);
+		}
 	}
 	return 0;
 }
 
+sub update_pc92_next
+{
+	my $self = shift;
+	my $period = shift || ($self->{do_pc9x} ? $pc92_update_period : $pc92_extnode_update_period);
+	$self->{next_pc92_update} = $main::systime + $period - int rand($period / 4);
+	dbg("ROUTE: update_pc92_next: $self->{call} " . atime($self->{next_pc92_update})) if isdbg('obscount');
+}
+
+sub update_pc92_keepalive
+{
+	my $self = shift;
+	my $period = shift || $pc92_keepalive_period;
+	$self->{next_pc92_keepalive} = $main::systime + $period - int rand($period / 4);
+	dbg("ROUTE: update_pc92_keepalive: $self->{call} " . atime($self->{next_pc92_keepalive})) if isdbg('obscount');
+}
+
 sub init
 {
 	do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
 	confess $@ if $@;
 
-	my $user = DXUser->get($main::mycall);
+	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 = DXProt->new($main::mycall, 0, $user);
 	$main::me->{here} = 1;
 	$main::me->{state} = "indifferent";
 	$main::me->{sort} = 'S';    # S for spider
@@ -223,13 +248,16 @@ sub init
 	$main::me->{version} = $main::version;
 	$main::me->{build} = $main::build;
 	$main::me->{do_pc9x} = 1;
+	$main::me->{hostname} = $main::clusteraddr;
+	$main::me->update_pc92_next($pc92_short_update_period);
+	$main::me->update_pc92_keepalive;
 }
 
 #
 # obtain a new connection this is derived from dxchannel
 #
 
-sub new 
+sub new
 {
 	my $self = DXChannel::alloc(@_);
 
@@ -244,7 +272,7 @@ sub new
 		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;
+	$main::routeroot->add($call, '5000', Route::here(1), $self->{conn}->peerhost) if $call ne $main::mycall;
 
 	return $self;
 }
@@ -259,17 +287,19 @@ sub start
 	my $user = $self->{user};
 
 	# log it
-	my $host = $self->{conn}->{peerhost};
+	my $host = $self->{conn}->peerhost;
 	$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
+	$host ||= $host if is_ipaddr($host);
 	$host ||= "unknown";
+	$self->{hostname} = $host;
 
 	Log('DXProt', "$call connected from $host");
-	
+
 	# remember type of connection
 	$self->{consort} = $line;
 	$self->{outbound} = $sort eq 'O';
 	my $priv = $user->priv;
-	$priv = $user->priv(1) unless $priv;
+	$priv = $user->priv(1) unless defined $priv;
 	$self->{priv} = $priv;     # other clusters can always be 'normal' users
 	$self->{lang} = $user->lang || 'en';
 	$self->{isolate} = $user->{isolate};
@@ -285,7 +315,8 @@ sub start
 	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
 	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'node_default', 0);
 	$self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'node_default', 0) ;
-	$self->{routefilter} = Filter::read_in('route', $call, 0) || Filter::read_in('route', 'node_default', 0) unless $self->{isolate} ;
+	$self->{routefilter} = Filter::read_in('route', $call, 0) || Filter::read_in('route', 'node_default', 0) unless $self->{isolate};
+	$self->{pc92filter} = Filter::read_in('pc92', $call, 0) || Filter::read_in('pc92', 'node_default', 0) unless $self->{isolate} ;
 
 
 	# get the INPUT filters (these only pertain to Clusters)
@@ -294,12 +325,14 @@ 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};
-	
+	$self->{inpc92filter} = Filter::read_in('pc92', $call, 0) || Filter::read_in('pc92', 'node_default', 0) unless $self->{isolate} ;
+
+
 	# 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;
@@ -309,12 +342,12 @@ sub start
 	$self->{pingave} = 999;
 	$self->{metric} ||= 100;
 	$self->{lastping} = $main::systime;
-	
+
 	# send initialisation string
 	unless ($self->{outbound}) {
 		$self->sendinit;
 	}
-	
+
 	$self->state('init');
 	$self->{pc50_t} = $main::systime;
 
@@ -324,6 +357,13 @@ 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 up a config broadcast "quite soon" to converge tables quicker
+	$main::me->update_pc92_next($pc92_short_update_period);
+	$self->update_pc92_next($pc92_short_update_period);
+
+	# set next keepalive time
+	$self->update_pc92_keepalive;
 }
 
 #
@@ -333,7 +373,7 @@ sub start
 sub sendinit
 {
 	my $self = shift;
-	$self->send(pc18());
+	$self->send(pc18(($self->{isolate} || !$self->user->wantpc9x) ? "" : " pc9x"));
 }
 
 #
@@ -350,12 +390,12 @@ sub normal
 
 	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) {
@@ -381,15 +421,21 @@ sub normal
 		}
 	}
 
+	if (defined &Local::pcprot) {
+		my $r;
+		eval { $r = Local::pcprot($self, $pcno, $line, @field); };
+		return if $r;			# i.e don't process it
+	}
+
 	# send it out for processing
 	my $origin = $self->{call};
 	no strict 'subs';
 	my $sub = "handle_$pcno";
 
 	if ($self->can($sub)) {
-		$self->$sub($pcno, $line, $origin, @field);
+		$self->$sub($pcno, $line, $origin, \@field);
 	} else {
-		$self->handle_default($pcno, $line, $origin, @field);
+		$self->handle_default($pcno, $line, $origin, \@field);
 	}
 }
 
@@ -403,55 +449,86 @@ sub process
 	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);
-		eph_dup($pc50s);
-		$last_pc50 = $t;
-	}
 
-	foreach $dxchan (@dxchan) {
-		next unless $dxchan->is_node;
-		next if $dxchan->handle_xml;
-		next if $dxchan == $main::me;
+	# every ten seconds
+	if ($t - $last10 >= 10) {
+		# clean out ephemera
 
-		# 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 {
-				DXXml::Ping::add($main::me, $dxchan->call);
-				$dxchan->{nopings} -= 1;
-				$dxchan->{lastping} = $t;
-				$dxchan->{lastping} += $dxchan->{pingint} / 2 unless @{$dxchan->{pingtime}};
-			}
+		eph_clean();
+		import_chat();
+
+		$last10 = $t;
+
+		# send out a pc50 on EVERY channel all at once
+		if ($t >= $last_pc50 + $pc50_interval) {
+			$pc50s = pc50($main::me, scalar DXChannel::get_all_users);
+			eph_dup($pc50s);
+			$last_pc50 = $t;
 		}
-	}
 
-	Investigate::process();
-	clean_pc92_find();
+		foreach $dxchan (@dxchan) {
+			next unless $dxchan->is_node;
+			next if $dxchan == $main::me;
+
+			# send the pc50
+			$dxchan->send($pc50s) if !$dxchan->{do_pc9x} && $pc50s;
 
-	# every ten seconds
-	if ($t - $last10 >= 10) {	
-		# clean out ephemera 
+			# send a ping out on this channel
+			if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) {
+				if ($dxchan->{nopings} <= 0) {
+					dbg("ROUTE: $dxchan->{call} disconnected on ping obscount") if isdbg('obscount');
+					$dxchan->disconnect;
+				} else {
+					DXXml::Ping::add($main::me, $dxchan->call);
+					$dxchan->{nopings} -= 1;
+					$dxchan->{lastping} = $t;
+					$dxchan->{lastping} += $dxchan->{pingint} / 2 unless @{$dxchan->{pingtime}};
+					dbg("ROUTE: $dxchan->{call} ping obscount = $dxchan->{nopings}") if isdbg('obscount');
+				}
+			}
+		}
 
-		eph_clean();
-		import_chat();
+		clean_pc92_find();
 
-		if ($main::systime >= $last_pc92_update + $pc92_update_period) {
-			dbg("ROUTE: sending pc92 update") if isdbg('route');
-			send_pc92_update();
+		# send out config broadcasts
+		foreach $dxchan (@dxchan) {
+			next unless $dxchan->is_node;
+
+			# send out a PC92 config record if required for me and
+			# all my non pc9x dependent nodes. But for dependent nodes we only do
+			# this if we have not seen any from anyone else for at least half
+			# of one update period. This should stop quite a bit of excess C
+			# records. Someone will win, it does not really matter who, because
+			# we always believe "us".
+			if ($main::systime >= $dxchan->{next_pc92_update}) {
+				if ($dxchan == $main::me || !$dxchan->{do_pc9x}) {
+					dbg("ROUTE: pc92 broadcast candidate: $dxchan->{call}") if isdbg('obscount');
+					my $ref = Route::Node::get($dxchan->{call});
+					if ($dxchan == $main::me || ($ref && ($ref->measure_pc9x_t($main::systime-$main::systime_daystart)) >= $pc92_extnode_update_period/2)) {
+						$dxchan->broadcast_pc92_update($dxchan->{call});
+					} else {
+						$dxchan->update_pc92_next;
+					}
+				} else {
+					$dxchan->update_pc92_next; # this won't actually do anything, it's just to be tidy
+				}
+			}
+		}
+
+		# do the keepalive for me, if required
+		if ($main::systime >= $main::me->{next_pc92_keepalive}) {
 			time_out_pc92_routes();
-			$last_pc92_update = $main::systime + int rand(5*60);
+			$main::me->broadcast_pc92_keepalive($main::mycall);
+		}
+
+		if ($pc92_slug_changes && $main::systime >= $last_pc92_slug + $pc92_slug_changes) {
+			my ($add, $del) = gen_pc92_changes();
+			$main::me->route_pc92d($main::mycall, undef, $main::routeroot, @$del) if @$del;
+			$main::me->route_pc92a($main::mycall, undef, $main::routeroot, @$add) if @$add;
+			clear_pc92_changes();
 		}
-		
-		$last10 = $t;
 	}
-	
+
 	if ($main::systime - 3600 > $last_hour) {
 		$last_hour = $main::systime;
 	}
@@ -472,13 +549,22 @@ sub send_dx_spot
 	my $line = shift;
 	my @dxchan = DXChannel::get_all();
 	my $dxchan;
-	
+	my $pc11;
+
 	# 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 && $self->is_node;
-		$dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call});
+		if ($line =~ /PC61/ && !($dxchan->is_spider || $dxchan->is_user)) {
+			unless ($pc11) {
+				my @f = split /\^/, $line;
+				$pc11 = join '^', 'PC11', @f[1..7,9];
+			}
+			$dxchan->dx_spot($pc11, $self->{isolate}, @_, $self->{call});
+		} else {
+			$dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call});
+		}
 	}
 }
 
@@ -543,7 +629,7 @@ sub wwv
 	my $line = shift;
 	my $isolate = shift;
 	my ($filter, $hops);
-	
+
 	if ($self->{wwvfilter}) {
 		($filter, $hops) = $self->{wwvfilter}->it(@_[7..$#_]);
 		return unless $filter;
@@ -558,7 +644,7 @@ sub send_wcy_spot
 	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	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) {
@@ -594,27 +680,28 @@ sub send_announce
 	my $target = $_[6];
 	my $to = 'To ';
 	my $text = unpad($_[2]);
-				
+	my $from = $_[0];
+
 	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 @a = Prefix::cty_data($_[0]);
+	# obtain country codes etc
+	my @a = Prefix::cty_data($from);
 	my @b = Prefix::cty_data($_[4]);
 	if ($self->{inannfilter}) {
-		my ($filter, $hops) = 
-			$self->{inannfilter}->it(@_, $self->{call}, 
+		my ($filter, $hops) =
+			$self->{inannfilter}->it(@_, $self->{call},
 									 @a[0..2],
 									 @b[0..2], $a[3], $b[3]);
 		unless ($filter) {
@@ -623,12 +710,21 @@ sub send_announce
 		}
 	}
 
-	if (AnnTalk::dup($_[0], $_[1], $_[2])) {
-		dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
-		return;
+	# the sysop ('*') thing is an attempt to minimise the damage caused by non-updated PC93 generators
+	if (AnnTalk::dup($from, $target, $_[2]) || ($_[3] eq '*' && AnnTalk::dup($from, 'ALL', $_[2]))) {
+		my $dxchan = DXChannel::get($from);
+		if ($self == $main::me && $dxchan && $dxchan->is_user) {
+			if ($dxchan->priv < 5) {
+				$dxchan->send($dxchan->msg('dup'));
+				return;
+			}
+		} else {
+			dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+			return;
+		}
 	}
 
-	Log('ann', $target, $_[0], $text);
+	Log('ann', $target, $from, $text);
 
 	# 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
@@ -642,7 +738,7 @@ sub send_announce
 	}
 }
 
-my $msgid = 0;
+my $msgid = int rand(1000);
 
 sub nextchatmsgid
 {
@@ -662,18 +758,19 @@ sub send_chat
 	my $target = $_[3];
 	my $text = unpad($_[2]);
 	my $ak1a_line;
-				
+	my $from = $_[0];
+
 	# munge the group and recast the line if required
 	if ($target =~ s/\.LST$//) {
 		$ak1a_line = $line;
 	}
-	
-	# obtain country codes etc 
-	my @a = Prefix::cty_data($_[0]);
+
+	# obtain country codes etc
+	my @a = Prefix::cty_data($from);
 	my @b = Prefix::cty_data($_[4]);
 	if ($self->{inannfilter}) {
-		my ($filter, $hops) = 
-			$self->{inannfilter}->it(@_, $self->{call}, 
+		my ($filter, $hops) =
+			$self->{inannfilter}->it(@_, $self->{call},
 									 @a[0..2],
 									 @b[0..2], $a[3], $b[3]);
 		unless ($filter) {
@@ -682,31 +779,34 @@ sub send_chat
 		}
 	}
 
-	if (AnnTalk::dup($_[0], $_[1], $_[2], $chatdupeage)) {
-		dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
-		return;
+	if (AnnTalk::dup($from, $target, $_[2], $main::systime + $chatdupeage)) {
+		my $dxchan = DXChannel::get($from);
+		if ($self == $main::me && $dxchan && $dxchan->is_user) {
+			if ($dxchan->priv < 5) {
+				$dxchan->send($dxchan->msg('dup'));
+				return;
+			}
+		} else {
+			dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+			return;
+		}
 	}
 
 
-	Log('chat', $target, $_[0], $text);
+	Log('chat', $target, $from, $text);
 
 	# 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) {
-		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 $from_pc9x && $dxchan->do_pc9x;
+			next unless $dxchan->is_spider && $dxchan->do_pc9x;
 			next if $target eq 'LOCAL';
-			if (!$ak1a_line && $is_ak1a) {
-				$ak1a_line = pc12($_[0], $text, $_[1], "$target.LST");
-			}
 		}
-		
-		$dxchan->chat($is_ak1a ? $ak1a_line : $line, $self->{isolate}, $target, $_[1], 
+
+		$dxchan->chat($line, $self->{isolate}, $target, $_[1],
 					  $text, @_, $self->{call}, @a[0..2], @b[0..2]);
 	}
 }
@@ -730,7 +830,21 @@ sub announce
 
 sub chat
 {
-	goto &announce;
+	my $self = shift;
+	my $line = shift;
+	my $isolate = shift;
+	my $to = shift;
+	my $target = shift;
+	my $text = shift;
+	my ($filter, $hops);
+
+	if ($self->{annfilter}) {
+		($filter, $hops) = $self->{annfilter}->it(@_);
+		return unless $filter;
+	}
+	if (($self->is_spider || $self->is_ak1a) && $_[1] ne $main::mycall) {
+		send_prot_line($self, $filter, $hops, $isolate, $line);
+	}
 }
 
 
@@ -741,42 +855,50 @@ sub send_local_config
 	dbg('DXProt::send_local_config') if isdbg('trace');
 
 	# send our nodes
-	if ($self->{do_pc9x}) { 
-		$self->send_pc92_config;
+	my $node;
+	my @nodes;
+	my @localnodes;
+	my @remotenodes;
+
+	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}/;
+		$self->send(pc92a($main::routeroot, $node));
+		$self->send(pc92k($main::routeroot));
 	} else {
-		my $node;
-		my @nodes;
-		my @localnodes;
-		my @remotenodes;
+		# 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
 
-		if ($self->{isolate}) {
-			@localnodes = ( $main::routeroot );
-			$self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
-		} 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
-
-			# send locally connected nodes
-			my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
-			@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
-			$self->send_route($main::mycall, \&pc19, scalar(@localnodes)+1, $main::routeroot, @localnodes);
-
-			my $node;
-			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);
+		dbg("send_local_config: traditional");
+
+		# send locally connected nodes
+		my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
+		@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
+		$self->send_route($main::mycall, \&pc19, scalar(@localnodes)+1, $main::routeroot, @localnodes);
+
+		my $node;
+		my @rawintcalls = map { $_->nodes } @localnodes if @localnodes;
+		my @intcalls;
+		foreach $node (@rawintcalls) {
+			push @intcalls, $node if grep $_ && $node != $_, @intcalls;
+		}
+		my $ref = Route::Node::get($self->{call});
+		my @rnodes = $ref->nodes;
+		foreach $node (@intcalls) {
+			push @remotenodes, Route::Node::get($node) if grep $_ && $node != $_, @rnodes, @remotenodes;
 		}
-	
-		# get all the users connected on the above nodes and send them out
+		$self->send_route($main::mycall, \&pc19, scalar(@remotenodes), @remotenodes);
+	}
+
+	# get all the users connected on the above nodes and send them out
+	unless ($self->{do_pc9x}) {
 		foreach $node ($main::routeroot, @localnodes, @remotenodes) {
 			if ($node) {
 				my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
@@ -791,88 +913,79 @@ sub send_local_config
 sub gen_my_pc92_config
 {
 	my $node = shift;
-	
+
 	if ($node->{call} eq $main::mycall) {
+		clear_pc92_changes();		# remove any slugged data, we are generating it as now
 		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);
+		return pc92c($node, @localnodes);
 	} else {
 		my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
 		return pc92c($node, @rout);
 	}
 }
 
-sub gen_pc92_update
+sub send_last_pc92_config
 {
 	my $self = shift;
-	my $with_pc92_nodes = shift;
-	my $node;
-	my @lines;
-	my @dxchan;
-	my @localnodes;
-
-	dbg('ROUTE: DXProt::gen_pc92_update start') if isdbg('routelow');
-
-	# send 'my' configuration for all channels
-	push @lines, gen_my_pc92_config($main::routeroot);
-	
-	if ($with_pc92_nodes) {
-		# send out the configuration of all the directly connected PC92 nodes with current configuration
-		# but with the dates that the last config came in with.
-		@dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc9x} } DXChannel::get_all_nodes();
-		dbg("ROUTE: pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
-		@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-		dbg("ROUTE: pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
-		foreach $node (@localnodes) {
-			if ($node && $node->lastid->{92}) {
-				my @rout = map {my $r = Route::get($_); $r ? ($r) : ()} $node->nodes, $node->users;
-				push @lines, gen_pc92_with_time($node->call, 'C', $node->lastid->{92}, @rout);
-			}
-		}
+	my $node = shift;
+	if (my $l = $node->last_PC92C) {
+		$self->send($l);
+	} else {
+		$self->send_pc92_config($node);
 	}
-	
-	# send the configuration of all the directly connected 'external' nodes that don't handle PC92
-	# out with the 'external' marker on the first node.
-	@dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc9x} } DXChannel::get_all_nodes();
-	dbg("ROUTE: non pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
-	@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-	dbg("ROUTE: non pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
-	foreach $node (@localnodes) {
-		if ($node) {
-			push @lines, gen_my_pc92_config($node);
-		} 
-	}
-
-	dbg('ROUTE: DXProt::gen_pc92_update end with ' . scalar @lines . ' lines') if isdbg('routelow');
-	return @lines;
 }
 
-
 sub send_pc92_config
 {
 	my $self = shift;
+	my $node = shift;
 
 	dbg('DXProt::send_pc92_config') if isdbg('trace');
 
-	my @out = $self->gen_pc92_update(1);
-	
-	# send the complete config out on this interface
-	for (@out) {
-		$self->send($_);
+	$node->last_PC92C(gen_my_pc92_config($node));
+	$self->send($node->last_PC92C);
+}
+
+sub broadcast_pc92_update
+{
+	my $self = shift;
+	my $call = shift;
+
+	dbg("ROUTE: broadcast_pc92_update $call") if isdbg('obscount');
+
+	my $nref = Route::Node::get($call);
+	unless ($nref) {
+		cluck("ERROR: broadcast_pc92_update - Route::Node $call disappeared");
+		$self->update_pc92_next;
+		return;
 	}
-} 
+	my $l = $nref->last_PC92C(gen_my_pc92_config($nref));
+	$nref->lastid(last_pc9x_id());
+	$main::me->broadcast_route_pc9x($main::mycall, undef, $l, 0);
+	$self->update_pc92_next;
+}
 
-sub send_pc92_update
+sub broadcast_pc92_keepalive
 {
-	my @out = $main::me->gen_pc92_update(0);
-	
-	# broadcast the lines to all PC92 nodes
-	for (@out) {
-		$main::me->broadcast_route_pc9x($main::mycall, undef, $_, 0);
+	my $self = shift;
+	my $call = shift;
+
+	dbg("ROUTE: broadcast_pc92_keepalive $call") if isdbg('obscount');
+
+	my $nref = Route::Node::get($call);
+	unless ($nref) {
+		cluck("ERROR: broadcast_pc92_keepalive - Route::Node $call disappeared");
+		$self->update_pc92_keepalive;
+		return;
 	}
-} 
+	my $l = pc92k($nref);
+	$nref->lastid(last_pc9x_id());
+	$main::me->broadcast_route_pc9x($main::mycall, undef, $l, 0);
+	$self->update_pc92_keepalive;
+}
 
 sub time_out_pc92_routes
 {
@@ -882,19 +995,19 @@ sub time_out_pc92_routes
 		my $o = $n->dec_obs;
 		if ($o <= 0) {
 			if (my $dxchan = DXChannel::get($n->call)) {
-				dbg("ROUTE: disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('route');
+				dbg("ROUTE: 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("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('route');
+					dbg("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount")  if isdbg('obscount');
 					push @rdel, $n->del($_);
 				}
 			}
 		} else {
-			dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('route');
+			dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('obscount');
 		}
 	}
 	for (@rdel) {
@@ -933,19 +1046,6 @@ sub 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) {
@@ -957,7 +1057,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
@@ -965,11 +1065,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
 #
 
@@ -979,8 +1079,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;
@@ -989,14 +1089,17 @@ sub adjust_hops
 			return "" if defined $newhops && $newhops == 0;
 			$newhops = $ref->{default} unless $newhops;
 			return "" if defined $newhops && $newhops == 0;
-			$newhops = $hops if !$newhops;
-			$s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
+			$newhops = $hops unless $newhops;
+			return "" unless $newhops > 0;
+			$s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops != $hops;
+		} else {
+			return "" unless $hops > 0;
 		}
 	}
 	return $s;
 }
 
-# 
+#
 # load hop tables
 #
 sub load_hops
@@ -1012,10 +1115,20 @@ sub process_rcmd
 {
 	my ($self, $tonode, $fromnode, $user, $cmd) = @_;
 	if ($tonode eq $main::mycall) {
-		my $ref = DXUser->get_current($fromnode);
+		my $ref = DXUser::get_current($fromnode);
+		unless ($ref && UNIVERSAL::isa($ref, 'DXUser')) {
+			dbg("DXProt process_rcmd: user $fromnode isn't a reference (check user_asc and tell G1TLH)"); 
+			$self->send_rcmd_reply($main::mycall, $fromnode, $user, "sorry...!");
+			return;
+		}
 		my $cref = Route::Node::get($fromnode);
-		Log('rcmd', 'in', $ref->{priv}, $fromnode, $cmd);
-		if ($cmd !~ /^\s*rcmd/i && $cref && $ref && $cref->call eq $ref->homenode) { # not allowed to relay RCMDS!
+		unless ($cref && UNIVERSAL::isa($cref, 'Route')) {
+			dbg("DXProt process_rcmd: Route $fromnode isn't a reference (tell G1TLH)"); 
+			$self->send_rcmd_reply($main::mycall, $fromnode, $user, "sorry...!");
+			return;
+		}
+		Log('rcmd', 'in', ($ref->{priv}||0), $fromnode, $cmd);
+		if ($cmd !~ /^\s*rcmd/i && $ref->homenode && $cref->call eq $ref->homenode) { # not allowed to relay RCMDS!
 			if ($ref->{priv}) {		# you have to have SOME privilege, the commands have further filtering
 				$self->{remotecmd} = 1; # for the benefit of any command that needs to know
 				my $oldpriv = $self->{priv};
@@ -1031,7 +1144,7 @@ sub process_rcmd
 			$self->send_rcmd_reply($main::mycall, $fromnode, $user, "your attempt is logged, Tut tut tut...!");
 		}
 	} else {
-		my $ref = DXUser->get_current($tonode);
+		my $ref = DXUser::get_current($tonode);
 		if ($ref && $ref->is_clx) {
 			$self->route($tonode, pc84($fromnode, $tonode, $user, $cmd));
 		} else {
@@ -1056,7 +1169,7 @@ sub process_rcmd_reply
 			$dxchan->send($line) if $dxchan;
 		}
 	} else {
-		my $ref = DXUser->get_current($tonode);
+		my $ref = DXUser::get_current($tonode);
 		if ($ref && $ref->is_clx) {
 			$self->route($tonode, pc85($fromnode, $tonode, $user, $line));
 		} else {
@@ -1093,7 +1206,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) {
@@ -1106,12 +1219,12 @@ sub addrcmd
 sub disconnect
 {
 	my $self = shift;
-	my $pc39flag = shift;
+	my $pc39flag = shift || 0;
 	my $call = $self->call;
 
 	return if $self->{disconnecting}++;
-	
-	unless ($pc39flag && $pc39flag == 1) {
+
+	unless ($pc39flag == 1) {
 		$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
 	}
 
@@ -1120,32 +1233,16 @@ sub disconnect
 
 	# do routing stuff, remove me from routing table
 	my $node = Route::Node::get($call);
-	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");
-		}
-	}
 
-	RouteDB::delete_interface($call);
-	
+	Route::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)  {
-		$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);
 
@@ -1155,22 +1252,59 @@ sub disconnect
 	Log('DXProt', $call . " Disconnected");
 
 	$self->SUPER::disconnect;
+
+	# here we determine what needs to go out of the routing table
+	my @rout;
+	if ($node && $pc39flag != 2) {
+		dbg('%Route::Node::List = ' . join(',', sort keys %Route::Node::list)) if isdbg('routedisc');
+
+		@rout = $node->del($main::routeroot);
+
+		dbg('@rout = ' . join(',', sort map {$_->call} @rout)) if isdbg('routedisc');
+
+		# now we need to see what can't be routed anymore and came
+		# in via this node (probably).
+		my $n = 0;
+		while ($n != @rout) {
+			$n = @rout;
+			for (Route::Node::get_all()) {
+				unless ($_->dxchan) {
+					push @rout, $_->delete;
+				}
+			}
+			dbg('@rout = ' . join(',', sort map {$_->call} @rout)) if isdbg('routedisc');
+		}
+
+		dbg('%Route::Node::List = ' . join(',', sort keys %Route::Node::list)) if isdbg('routedisc');
+
+		# and all my ephemera as well
+		for (@rout) {
+			my $c = $_->call;
+			eph_del_regex("^PC1[679].*$c");
+		}
+	}
+
+	# broadcast to all other nodes that all the nodes connected to via me are gone
+	unless ($pc39flag == 2)  {
+		$self->route_pc21($main::mycall, undef, @rout) if @rout;
+		$self->route_pc92d($main::mycall, undef, $main::routeroot, $node) if $node;
+	}
 }
 
 
-# 
+#
 # send a talk message to this thingy
 #
 sub talk
 {
 	my ($self, $from, $to, $via, $line, $origin) = @_;
-	
+
 	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?$via:$self->call, $line) unless $origin && $origin ne $main::mycall;
+	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
@@ -1181,14 +1315,20 @@ 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;
-		
+
+		# don't send messages with $self's call in back to them
+		if ($r->call eq $self->{call}) {
+			dbg("PCPROT: trying to send $self->{call} back itself") if isdbg('chanerr');
+			next;
+		}
+
 		if (!$self->{isolate} && $self->{routefilter}) {
 			$filter = undef;
 			if ($r) {
@@ -1196,7 +1336,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');
@@ -1214,12 +1354,13 @@ sub send_route
 				$routeit = adjust_hops($self, $line);  # adjust its hop count by node name
 				next unless $routeit;
 			}
-			
+
 			$self->send($routeit);
 		}
 	}
 }
 
+# broadcast everywhere
 sub broadcast_route
 {
 	my $self = shift;
@@ -1235,12 +1376,38 @@ sub broadcast_route
 	}
 	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 ($generate == \&pc16 || $generate==\&pc17) {
+				next unless $dxchan->user->wantsendpc16;
+			}
 			$dxchan->send_route($origin, $generate, @_);
 		}
 	}
@@ -1252,16 +1419,17 @@ 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 $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;
@@ -1274,15 +1442,15 @@ sub broadcast_route_pc9x
 
 	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->{do_pc9x};
 			next unless $dxchan->isa('DXProt');
+			next unless $dxchan->{do_pc9x};
 
 			$dxchan->send($line);
 		}
@@ -1295,7 +1463,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
@@ -1304,7 +1472,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
@@ -1312,7 +1480,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
@@ -1320,7 +1488,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
@@ -1339,11 +1507,13 @@ sub route_pc41
 	broadcast_route($self, $origin, \&pc41, $line, 1, @_);
 }
 
+# this is probably obsolete now
 sub route_pc50
 {
 	my $self = shift;
 	my $origin = shift;
 	my $line = shift;
+
 	broadcast_route($self, $origin, \&pc50, $line, 1, @_);
 }
 
@@ -1376,7 +1546,7 @@ 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');
@@ -1394,7 +1564,7 @@ sub eph_dup
 	$s =~ s/\^H\d\d?\^?\~?$//;
 	$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'); 
+	dbg("PCPROT: emphemeral duplicate") if $r && isdbg('chanerr');
 	return $r;
 }
 
@@ -1412,7 +1582,7 @@ sub eph_del_regex
 sub eph_clean
 {
 	my ($key, $val);
-	
+
 	while (($key, $val) = each %eph) {
 		if ($main::systime >= $val) {
 			delete $eph{$key};
@@ -1441,10 +1611,10 @@ sub run_cmd
 # 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
@@ -1457,7 +1627,7 @@ sub import_chat
 		dbg("can\'t open $chatimportfn $!") if isdbg('msg');
 		Log('msg', "can\'t open $chatimportfn $!");
 		return;
-	} 
+	}
 
 	my @names = readdir(DIR);
 	closedir(DIR);
@@ -1468,7 +1638,7 @@ sub import_chat
 		my $fn = "$chatimportfn/$name";
 		next unless -f $fn;
 		unless (open(MSG, $fn)) {
-	 		dbg("can\'t open import file $fn $!") if isdbg('msg');
+			dbg("can\'t open import file $fn $!") if isdbg('msg');
 			Log('msg', "can\'t open import file $fn $!");
 			unlink($fn);
 			next;
@@ -1482,18 +1652,15 @@ sub import_chat
 
 		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());
-				}
+			if ($target eq 'ALL' || $target eq 'LOCAL' || $target eq 'SYSOP' || $target eq 'WX') {
+				my $sysop = uc $target eq 'SYSOP' ? '*' : ' ';
+				my $wx = uc $target eq 'WX' ? '1' : '0';
+				my $via = $target;
+				$via = '*' if $target eq 'ALL' || $target eq 'SYSOP';
+				Log('ann', $target, $main::mycall, $text);
+				$main::me->normal(DXProt::pc93($target, $main::mycall, $via, $text));
 			} else {
-				my $msgid = nextchatmsgid();
-				$text = "#$msgid $text";
-				send_chat($main::me, pc12($main::mycall, $text, '*', $target), $main::mycall, '*', $text, $target, $main::mycall, '0');
+				DXCommandmode::send_chats($main::me, $target, $text);
 			}
 		}
 	}
@@ -1506,7 +1673,7 @@ sub start_pc92_find
 	my $target = shift;
 	my $key = "$dxchan->{call}|$target";
 	if ($pc92_find{$key}) {
-		
+
 	}
 }
 
@@ -1514,7 +1681,7 @@ sub start_pc92_find
 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');
 }
 
@@ -1523,4 +1690,4 @@ sub clean_pc92_find
 
 }
 1;
-__END__ 
+__END__