X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=3f4575aa3907ca18ac361c364d5978eaff05a2e9;hb=3a975cc50b24798726adab18cf9d57bf4c2c530a;hp=8ca96434b1448a44f9cdfeb133025cf0247cdbcc;hpb=3f1c5ab45aa13e99da6bea0bfcc6d4434beb5871;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 8ca96434..3f4575aa 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -15,7 +15,6 @@ use DXUtil;
 use DXChannel;
 use DXUser;
 use DXM;
-use DXCluster;
 use DXProtVars;
 use DXCommandmode;
 use DXLog;
@@ -29,12 +28,16 @@ use AnnTalk;
 use Geomag;
 use WCY;
 use Time::HiRes qw(gettimeofday tv_interval);
+use BadWords;
+use DXHash;
+use Route;
+use Route::Node;
 
 use strict;
 use vars qw($me $pc11_max_age $pc23_max_age
 			$last_hour %pings %rcmds
-			%nodehops @baddx $baddxfn 
-			$allowzero $decode_dk0wcy $send_opernam);
+			%nodehops $baddx $badspotter $badnode $censorpc
+			$allowzero $decode_dk0wcy $send_opernam @checklist);
 
 $me = undef;					# the channel id for this cluster
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
@@ -44,10 +47,128 @@ $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
-@baddx = ();                    # list of illegal spotted callsigns
-
-
-$baddxfn = "$main::data/baddx.pl";
+$censorpc = 1;					# Do a BadWords::check on text fields and reject things
+								# loads of 'bad things'
+$baddx = new DXHash "baddx";
+$badspotter = new DXHash "badspotter";
+$badnode = new DXHash "badnode";
+
+@checklist = 
+(
+ [ qw(c c m bp bc c) ],			# pc10
+ [ qw(f m d t m c c h) ],		# pc11
+ [ qw(c bc m bp bm p h) ],		# pc12
+ [ qw(c h) ],					# 
+ [ qw(c h) ],					# 
+ [ qw(c m h) ],					# 
+ undef ,						# pc16 has to be validated manually
+ [ qw(c c h) ],					# pc17
+ [ qw(m n) ],					# pc18
+ undef ,						# pc19 has to be validated manually
+ undef ,						# pc20 no validation
+ [ qw(c m h) ],					# pc21
+ undef ,						# pc22 no validation
+ [ qw(d n n n n m c c h) ],		# pc23
+ [ qw(c p h) ],					# pc24
+ [ qw(c c n n) ],				# pc25
+ [ qw(f m d t m c c bc) ],		# pc26
+ [ qw(d n n n n m c c bc) ],	# pc27
+ [ qw(c c m c d t p m bp n p bp bc) ], # pc28
+ [ qw(c c n m) ],				# pc29
+ [ qw(c c n) ],					# pc30
+ [ qw(c c n) ],					# pc31
+ [ qw(c c n) ],					# pc32
+ [ qw(c c n) ],					# pc33
+ [ qw(c c m) ],					# pc34
+ [ qw(c c m) ],					# pc35
+ [ qw(c c m) ],					# pc36
+ [ qw(c c n m) ],				# pc37
+ undef,							# pc38 not interested
+ [ qw(c m) ],					# pc39
+ [ qw(c c m p n) ],				# pc40
+ [ qw(c n m h) ],				# pc41
+ [ qw(c c n) ],					# pc42
+ undef,							# pc43 don't handle it
+ [ qw(c c n m m c) ],			# pc44
+ [ qw(c c n m) ],				# pc45
+ [ qw(c c n) ],					# pc46
+ undef,							# pc47
+ undef,							# pc48
+ [ qw(c m h) ],					# pc49
+ [ qw(c n h) ],					# pc50
+ [ qw(c c n) ],					# pc51
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,							# pc60
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,							# pc70
+ undef,
+ undef,
+ [ qw(d n n n n n n m m m c c h) ],	# pc73
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,							# pc80
+ undef,
+ undef,
+ undef,
+ [ qw(c c c m) ],				# pc84
+ [ qw(c c c m) ],				# pc85
+);
+
+# use the entry in the check list to check the field list presented
+# return OK if line NOT in check list (for now)
+sub check
+{
+	my $n = shift;
+	$n -= 10;
+	return 0 if $n < 0 || $n > @checklist; 
+	my $ref = $checklist[$n];
+	return 0 unless ref $ref;
+	
+	my $i;
+	shift;    # not interested in the first field
+	for ($i = 0; $i < @$ref; $i++) {
+		my ($blank, $act) = $$ref[$i] =~ /^(b?)(\w)$/;
+		return 0 unless $act;
+		next if $blank && $_[$i] =~ /^[ \*]$/;
+		if ($act eq 'c') {
+			return $i+1 unless is_callsign($_[$i]);
+		} elsif ($act eq 'm') {
+			return $i+1 unless is_pctext($_[$i]);
+		} elsif ($act eq 'p') {
+			return $i+1 unless is_pcflag($_[$i]);
+		} elsif ($act eq 'f') {
+			return $i+1 unless is_freq($_[$i]);
+		} elsif ($act eq 'n') {
+			return $i+1 unless $_[$i] =~ /^[\d ]+$/;
+		} elsif ($act eq 'h') {
+			return $i+1 unless $_[$i] =~ /^H\d\d?$/;
+		} elsif ($act eq 'd') {
+			return $i+1 unless $_[$i] =~ /^\s*\d+-\w\w\w-[12][90]\d\d$/;
+		} elsif ($act eq 't') {
+			return $i+1 unless $_[$i] =~ /^[012]\d[012345]\dZ$/;
+		}
+	}
+	return 0;
+}
 
 sub init
 {
@@ -58,20 +179,9 @@ sub init
 	$me->{state} = "indifferent";
 	do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
 	confess $@ if $@;
-	#  $me->{sort} = 'M';    # M for me
-
-	# now prime the spot and wwv  duplicates file with data
-    my @today = Julian::unixtoj(time);
-	for (Spot::readfile(@today), Spot::readfile(Julian::sub(@today, 1))) {
-		Spot::dup(@{$_}[0..3]);
-	}
-	for (Geomag::readfile(time)) {
-		Geomag::dup(@{$_}[1..5]);
-	}
-
-	# load the baddx file
-	do "$baddxfn" if -e "$baddxfn";
-	print "$@\n" if $@;
+	$me->{sort} = 'S';    # S for spider
+	$me->{priv} = 9;
+#	$Route::Node::me->adddxchan($me);
 }
 
 #
@@ -81,6 +191,12 @@ sub init
 sub new 
 {
 	my $self = DXChannel::alloc(@_);
+
+	# add this node to the table, the values get filled in later
+	my $pkg = shift;
+	my $call = shift;
+	$main::routeroot->add($call, '0000', Route::here(1)) if $call ne $main::mycall;
+
 	return $self;
 }
 
@@ -102,11 +218,20 @@ sub start
 	$self->{consort} = $line;	# save the connection type
 	$self->{here} = 1;
 
+	# get the output filters
+	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
+	$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) ;
+
+
 	# get the INPUT filters (these only pertain to Clusters)
-	$self->{inspotfilter} = Filter::read_in('spots', $call, 1);
-	$self->{inwwvfilter} = Filter::read_in('wwv', $call, 1);
-	$self->{inwcyfilter} = Filter::read_in('wcy', $call, 1);
-	$self->{inannfilter} = Filter::read_in('ann', $call, 1);
+	$self->{inspotsfilter} = Filter::read_in('spots', $call, 1) || Filter::read_in('spots', 'node_default', 1);
+	$self->{inwwvfilter} = Filter::read_in('wwv', $call, 1) || Filter::read_in('wwv', 'node_default', 1);
+	$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);
 	
 	# set unbuffered and no echo
 	$self->send_now('B',"0");
@@ -122,16 +247,13 @@ sub start
 
 	# send initialisation string
 	unless ($self->{outbound}) {
-		$self->send(pc38()) if DXNode->get_all();
 		$self->send(pc18());
 		$self->{lastping} = $main::systime;
 	} else {
-		# remove from outstanding connects queue
-		@main::outstanding_connects = grep {$_->{call} ne $call} @main::outstanding_connects;
-		$self->{lastping} = $main::systime + $self->pingint / 2;
+		$self->{lastping} = $main::systime + ($self->pingint / 2);
 	}
 	$self->state('init');
-	$self->pc50_t(time);
+	$self->{pc50_t} = $main::systime;
 
 	# send info to all logged in thingies
 	$self->tell_login('loginn');
@@ -146,6 +268,8 @@ sub normal
 {
 	my ($self, $line) = @_;
 	my @field = split /\^/, $line;
+	return unless @field;
+	
 	pop @field if $field[-1] eq '~';
 	
 #	print join(',', @field), "\n";
@@ -158,9 +282,10 @@ sub normal
 	return unless $pcno;
 	return if $pcno < 10 || $pcno > 99;
 
-	# dump bad protocol messages
-	if ($line =~ /\%[01][0-9A-F]/) {
-		dbg('chan', "CORRUPT protocol message - dumped");
+	# check for and dump bad protocol messages
+	my $n = check($pcno, @field);
+	if ($n) {
+		dbg('chan', "PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")");
 		return;
 	}
 
@@ -174,24 +299,27 @@ sub normal
 	
  SWITCH: {
 		if ($pcno == 10) {		# incoming talk
-			
-			unless (is_callsign($field[1]) && is_callsign($field[2]) && is_callsign($field[6])) {
-				dbg('chan', "Corrupt talk, rejected");
-				return;
+
+			# will we allow it at all?
+			if ($censorpc) {
+				my @bad;
+				if (@bad = BadWords::check($field[3])) {
+					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+					return;
+				}
 			}
+
 			# is it for me or one of mine?
 			my ($to, $via, $call, $dxchan);
 			if ($field[5] gt ' ') {
 				$call = $via = $field[2];
 				$to = $field[5];
-				unless (is_callsign($to)) {
-					dbg('chan', "Corrupt talk, rejected");
-					return;
-				}
 			} else {
 				$call = $to = $field[2];
 			}
-			if ($dxchan = DXChannel->get($call)) {
+			$dxchan = DXChannel->get($call);
+			if ($dxchan && $dxchan->is_user) {
+				$field[3] =~ s/\%5E/^/g;
 				$dxchan->talk($field[1], $to, $via, $field[3]);
 			} else {
 				$self->route($field[2], $line); # relay it on its way
@@ -201,16 +329,6 @@ sub normal
 		
 		if ($pcno == 11 || $pcno == 26) { # dx spot
 
-			# are any of the callsign fields invalid?
-            unless ($field[2] !~ m/[^A-Z0-9\-\/]/ && is_callsign($field[6]) && is_callsign($field[7])) {
-				dbg('chan', "Spot contains lower case callsigns or blanks, rejected");
-				return;
-			}
-            if ($field[1] =~ m/[^0-9\.]/) {
-				dbg('chan', "Spot frequency not numeric, rejected");
-				return;
-			}
-
 			# route 'foreign' pc26s 
 			if ($pcno == 26) {
 				if ($field[7] ne $main::mycall) {
@@ -220,8 +338,14 @@ sub normal
 			}
 			
 			# if this is a 'nodx' node then ignore it
-			if (grep $field[7] =~ /^$_/,  @DXProt::nodx_node) {
-				dbg('chan', "Bad DXNode, dropped");
+			if ($badnode->in($field[7])) {
+				dbg('chan', "PCPROT: Bad Node, dropped");
+				return;
+			}
+			
+			# if this is a 'bad spotter' user then ignore it
+			if ($badspotter->in($field[6])) {
+				dbg('chan', "PCPROT: Bad Spotter, dropped");
 				return;
 			}
 			
@@ -229,24 +353,47 @@ sub normal
 			my $d = cltounix($field[3], $field[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('chan', "Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
+				dbg('chan', "PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
 				return;
 			}
 
 			# is it 'baddx'
-			if (grep $field[2] eq $_, @baddx) {
-				dbg('chan', "Bad DX spot, ignored");
+			if ($baddx->in($field[2])) {
+				dbg('chan', "PCPROT: Bad DX spot, ignored");
 				return;
 			}
 			
 			# do some de-duping
 			$field[5] =~ s/^\s+//;      # take any leading blanks off
+			$field[2] = unpad($field[2]);	# take off leading and trailing blanks from spotted callsign
+			if ($field[2] =~ /BUST\w*$/) {
+				dbg('chan', "PCPROT: useless 'BUSTED' spot");
+				return;
+			}
 			if (Spot::dup($field[1], $field[2], $d, $field[5])) {
-				dbg('chan', "Duplicate Spot ignored\n");
+				dbg('chan', "PCPROT: Duplicate Spot ignored\n");
 				return;
 			}
+			if ($censorpc) {
+				my @bad;
+				if (@bad = BadWords::check($field[5])) {
+					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+					return;
+				}
+			}
+
+			my @spot = Spot::prepare($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
+			# global spot filtering on INPUT
+			if ($self->{inspotsfilter}) {
+				my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
+				unless ($filter) {
+					dbg('chan', "PCPROT: Rejected by filter");
+					return;
+				}
+			}
 			
-			my @spot = Spot::add($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
+			# add it 
+			Spot::add(@spot);
 
             #
 			# @spot at this point contains:-
@@ -275,21 +422,25 @@ sub normal
 					my $node;
 					my $to = $user->homenode;
 					my $last = $user->lastoper || 0;
-					if ($send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($node = DXCluster->get_exact($to)) ) {
+					if ($send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($node = Route::Node::get($to)) ) {
 						my $cmd = "forward/opernam $spot[4]";
 						# send the rcmd but we aren't interested in the replies...
-						if ($node && $node->dxchan && $node->dxchan->is_clx) {
+						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 $field[7]) {
 							$to = $field[7];
-							$node = DXCluster->get_exact($to);
-							if ($node && $node->dxchan && $node->dxchan->is_clx) {
-								route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
-							} else {
-								route(undef, $to, pc34($main::mycall, $to, $cmd));
+							$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);
@@ -315,25 +466,42 @@ sub normal
 		}
 		
 		if ($pcno == 12) {		# announces
-			unless (is_callsign($field[1]) && is_callsign($field[5])) {
-				dbg('chan', "Corrupt announce, rejected");
-				return;
-			}
-
 			# announce duplicate checking
 			$field[3] =~ s/^\s+//;  # remove leading blanks
 			if (AnnTalk::dup($field[1], $field[2], $field[3])) {
-				dbg('chan', "Duplicate Announce ignored\n");
+				dbg('chan', "PCPROT: Duplicate Announce ignored");
 				return;
 			}
+
+			if ($censorpc) {
+				my @bad;
+				if (@bad = BadWords::check($field[3])) {
+					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+					return;
+				}
+			}
 			
 			if ($field[2] eq '*' || $field[2] eq $main::mycall) {
 				
 				# global ann filtering on INPUT
 				if ($self->{inannfilter}) {
-					my ($filter, $hops) = Filter::it($self->{inannfilter}, @field[1..6], $self->{call} );
+					my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
+					my @dxcc = Prefix::extract($field[1]);
+					if (@dxcc > 0) {
+						$ann_dxcc = $dxcc[1]->dxcc;
+						$ann_itu = $dxcc[1]->itu;
+						$ann_cq = $dxcc[1]->cq();						
+					}
+					@dxcc = Prefix::extract($field[5]);
+					if (@dxcc > 0) {
+						$org_dxcc = $dxcc[1]->dxcc;
+						$org_itu = $dxcc[1]->itu;
+						$org_cq = $dxcc[1]->cq();						
+					}
+					my ($filter, $hops) = $self->{inannfilter}->it(@field[1..6], $self->{call}, 
+													$ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 					unless ($filter) {
-						dbg('chan', "Rejected by filter");
+						dbg('chan', "PCPROT: Rejected by filter");
 						return;
 					}
 				}
@@ -358,87 +526,88 @@ sub normal
 		}
 		
 		if ($pcno == 16) {		# add a user
-			my $node = DXCluster->get_exact($field[1]); 
+
+			# general checks
 			my $dxchan;
-			if (!$node && ($dxchan = DXChannel->get($field[1]))) {
-				# add it to the node table if it isn't present and it's
-				# connected locally
-				$node = DXNode->new($dxchan, $field[1], 0, 1, 5400);
-				broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
-				
+			my $ncall = $field[1];
+			my $newline = "PC16^";
+			
+			if ($ncall eq $main::mycall) {
+				dbg('chan', "PCPROT: trying to alter config on this node from outside!");
+				return;
 			}
-			return unless $node; # ignore if havn't seen a PC19 for this one yet
-			return unless $node->isa('DXNode');
-			if ($node->dxchan != $self) {
-				dbg('chan', "LOOP: $field[1] came in on wrong channel");
+			$dxchan = DXChannel->get($ncall);
+			if ($dxchan && $dxchan ne $self) {
+				dbg('chan', "PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!");
 				return;
 			}
-			if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
-				dbg('chan', "LOOP: $field[1] connected locally");
+			my $parent = Route::Node::get($ncall); 
+			unless ($parent) {
+				dbg('chan', "PCPROT: Node $ncall not in config");
 				return;
 			}
 			my $i;
-						
+			my @rout;
 			for ($i = 2; $i < $#field; $i++) {
-				my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
-				next if !$call || length $call < 3 || length $call > 8;
-				next if !$confmode;
-				$call = uc $call;
-				next if DXCluster->get_exact($call); # we already have this (loop?)
-				
-				$confmode = $confmode eq '*';
-				DXNodeuser->new($self, $node, $call, $confmode, $here);
+				my ($call, $conf, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
+				next unless $call && $conf && defined $here && is_callsign($call);
+				$conf = $conf eq '*';
+
+				push @rout, $parent->add_user($call, Route::here($here)|Route::conf($conf));
 				
 				# 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($node->call) if !$user->homenode;
-				$user->node($node->call);
+				$user->homenode($parent->call) if !$user->homenode;
+				$user->node($parent->call);
 				$user->lastin($main::systime) unless DXChannel->get($call);
 				$user->put;
 			}
+
 			
 			# queue up any messages (look for privates only)
 			DXMsg::queue_msg(1) if $self->state eq 'normal';     
-			last SWITCH;
+
+			dbg('route', "B/C PC16 on $ncall for: " . join(',', map{$_->call} @rout)) if @rout;
+			$self->route_pc16($parent, @rout) if @rout;
+			return;
 		}
 		
 		if ($pcno == 17) {		# remove a user
-			my $node = DXCluster->get_exact($field[2]);
 			my $dxchan;
-			if (!$node && ($dxchan = DXChannel->get($field[2]))) {
-				# add it to the node table if it isn't present and it's
-				# connected locally
-				$node = DXNode->new($dxchan, $field[2], 0, 1, 5400);
-				broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+			my $ncall = $field[2];
+			if ($ncall eq $main::mycall) {
+				dbg('chan', "PCPROT: trying to alter config on this node from outside!");
 				return;
 			}
-			return unless $node;
-			return unless $node->isa('DXNode');
-			if ($node->dxchan != $self) {
-				dbg('chan', "LOOP: $field[2] came in on wrong channel");
+			$dxchan = DXChannel->get($ncall);
+			if ($dxchan && $dxchan ne $self) {
+				dbg('chan', "PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!");
 				return;
 			}
-			if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
-				dbg('chan', "LOOP: $field[2] connected locally");
+			my $parent = Route::Node::get($ncall);
+			unless ($parent) {
+				dbg('chan', "PCPROT: Route::Node $ncall not in config");
 				return;
 			}
-			my $ref = DXCluster->get_exact($field[1]);
-			$ref->del() if $ref;
-			last SWITCH;
+			my @rout = $parent->del_user($field[1]);
+			dbg('route', "B/C PC17 on $ncall for: $field[1]");
+			$self->route_pc17($parent, @rout) if @rout;
+			return;
 		}
 		
 		if ($pcno == 18) {		# link request
 			$self->state('init');	
 
 			# first clear out any nodes on this dxchannel
-			my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
-			foreach my $node (@gonenodes) {
-				next if $node->dxchan == $DXProt::me;
-				broadcast_ak1a(pc21($node->call, 'Gone, re-init') , $self) unless $self->{isolate}; 
-				$node->del();
+			my $parent = Route::Node::get($self->{call});
+			my @rout;
+			for ($parent->nodes) {
+				my $r = Route::Node::get($_);
+				push @rout, $r->del_node if $r;
 			}
+			$self->route_pc21(@rout, $parent);
 			$self->send_local_config();
 			$self->send(pc20());
 			return;             # we don't pass these on
@@ -447,37 +616,43 @@ sub normal
 		if ($pcno == 19) {		# incoming cluster list
 			my $i;
 			my $newline = "PC19^";
+
+			# new routing list
+			my @rout;
+			my $parent = Route::Node::get($self->{call});
+
+			# parse the PC19
 			for ($i = 1; $i < $#field-1; $i += 4) {
 				my $here = $field[$i];
 				my $call = uc $field[$i+1];
-				my $confmode = $field[$i+2];
+				my $conf = $field[$i+2];
 				my $ver = $field[$i+3];
-
-				$ver = 5400 if !$ver && $allowzero;
-				
-				# now check the call over
-				my $node = DXCluster->get_exact($call);
-				if ($node) {
-					my $dxchan;
-					if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
-						dbg('chan', "LOOP: $call connected locally");
-					}
-				    if ($node->dxchan != $self) {
-						dbg('chan', "LOOP: $call come in on wrong channel");
-						next;
-					}
-					dbg('chan', "already have $call");
-					next;
-				}
-				
+				next unless defined $here && defined $conf && is_callsign($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
 
-				# add it to the nodes table and outgoing line
-				$newline .= "$here^$call^$confmode^$ver^";
-				DXNode->new($self, $call, $confmode, $here, $ver);
-				
+				# update it if required
+				my $r;
+				if ($parent->call eq $call && !$parent->version) {
+					$parent->version($ver);
+					$parent->flags(Route::here($here)|Route::conf($conf));
+					push @rout, $parent;
+				} elsif ($parent->call ne $call) {
+					next if $call eq $main::mycall || $call eq $self->{call};
+
+					my $r = $parent->add($call, $ver, Route::here($here)|Route::conf($conf));
+					push @rout, $r if $r;
+				} else {
+					$r = Route::Node::get($call);
+					if ($r && (!$r->version || $r->version eq '0000')) {
+						$r->version($ver);
+						$r->flags(Route::here($here)|Route::conf($conf));
+						push @rout, $r;
+					}
+				}
+
 				# 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;
@@ -495,13 +670,11 @@ sub normal
 				$user->lastin($main::systime) unless DXChannel->get($call);
 				$user->put;
 			}
-			
-			return if $newline eq "PC19^";
 
-			# add hop count 
-			$newline .=  get_hops(19) . "^";
-			$line = $newline;
-			last SWITCH;
+			dbg('route', "B/C PC19 for: " . join(',', map{$_->call} @rout)) if @rout;
+			
+			$self->route_pc19(@rout) if @rout;
+			return;
 		}
 		
 		if ($pcno == 20) {		# send local configuration
@@ -513,25 +686,29 @@ sub normal
 		
 		if ($pcno == 21) {		# delete a cluster from the list
 			my $call = uc $field[1];
+			my @rout;
+			my $parent = Route::Node::get($self->{call});
+			
 			if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
-				my $node = DXCluster->get_exact($call);
-				if ($node) {
-					if ($node->dxchan != $self) {
-						dbg('chan', "LOOP: $call come in on wrong channel");
-						return;
-					}
-					my $dxchan;
-					if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
-						dbg('chan', "LOOP: $call connected locally");
-						return;
-					}
-					$node->del();
-				} else {
-					dbg('chan', "$call not in table, dropped");
+				if ($call eq $self->{call}) {
+					dbg('chan', "PCPROT: Trying to disconnect myself with PC21");
 					return;
 				}
+
+				# routing objects
+				if ($parent) {
+					push @rout, $parent->del_node($call);
+				} else {
+					dbg('chan', "PCPROT: Route::Node $call not in config");
+				}
+			} else {
+				dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!");
+				return;
 			}
-			last SWITCH;
+			dbg('route', "B/C PC21 for: " . join(',', (map{$_->call} @rout))) if @rout;
+			
+			$self->route_pc21(@rout) if @rout;
+			return;
 		}
 		
 		if ($pcno == 22) {
@@ -557,11 +734,11 @@ sub normal
 			my ($r) = $field[6] =~ /R=(\d+)/;
 			$r = 0 unless $r;
 			if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
-				dbg('chan', "WWV Date ($field[1] $field[2]) out of range");
+				dbg('chan', "PCPROT: WWV Date ($field[1] $field[2]) out of range");
 				return;
 			}
 			if (Geomag::dup($d,$sfi,$k,$i,$field[6])) {
-				dbg('chan', "Dup WWV Spot ignored\n");
+				dbg('chan', "PCPROT: Dup WWV Spot ignored\n");
 				return;
 			}
 			$field[7] =~ s/-\d+$//o;            # remove spotter's ssid
@@ -585,7 +762,9 @@ sub normal
 		
 		if ($pcno == 24) {		# set here status
 			my $call = uc $field[1];
-			my $ref = DXCluster->get_exact($call);
+			my $ref = Route::Node::get($call);
+			$ref->here($field[2]) if $ref;
+			$ref = Route::User::get($call);
 			$ref->here($field[2]) if $ref;
 			last SWITCH;
 		}
@@ -596,7 +775,7 @@ sub normal
 				return;
 			}
 			if ($field[2] eq $main::mycall) {
-				dbg('chan', "Trying to merge to myself, ignored");
+				dbg('chan', "PCPROT: Trying to merge to myself, ignored");
 				return;
 			}
 
@@ -626,7 +805,7 @@ sub normal
 			if ($pcno == 49 || $field[1] eq $main::mycall) {
 				DXMsg::process($self, $line);
 			} else {
-				$self->route($field[1], $line);
+				$self->route($field[1], $line) unless $self->is_clx;
 			}
 			return;
 		}
@@ -634,9 +813,9 @@ sub normal
 		if ($pcno == 34 || $pcno == 36) { # remote commands (incoming)
 			if ($field[1] eq $main::mycall) {
 				my $ref = DXUser->get_current($field[2]);
-				my $cref = DXCluster->get($field[2]);
+				my $cref = Route::Node::get($field[2]);
 				Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]);
-				unless (!$cref || !$ref || $cref->mynode->call ne $ref->homenode) {    # not allowed to relay RCMDS!
+				unless (!$cref || !$ref || $cref->call ne $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};
@@ -658,7 +837,7 @@ sub normal
 			} else {
 				my $ref = DXUser->get_current($field[1]);
 				if ($ref && $ref->is_clx) {
-					route($field[1], pc84($field[2], $field[1], $field[2], $field[3]));
+					$self->route($field[1], pc84($field[2], $field[1], $field[2], $field[3]));
 				} else {
 					$self->route($field[1], $line);
 				}
@@ -681,7 +860,7 @@ sub normal
 			} else {
 				my $ref = DXUser->get_current($field[1]);
 				if ($ref && $ref->is_clx) {
-					route($field[1], pc85($field[2], $field[1], $field[2], $field[3]));
+					$self->route($field[1], pc85($field[2], $field[1], $field[2], $field[3]));
 				} else {
 					$self->route($field[1], $line);
 				}
@@ -696,18 +875,17 @@ sub normal
 		}
 		
 		if ($pcno == 39) {		# incoming disconnect
-			$self->disconnect(1);
+			if ($field[1] eq $self->{call}) {
+				$self->disconnect(1);
+			} else {
+				dbg('chan', "PCPROT: came in on wrong channel");
+			}
 			return;
 		}
 		
 		if ($pcno == 41) {		# user info
 			# add this station to the user database, if required
 			my $user = DXUser->get_current($field[1]);
-			if (!$user) {
-				# then try without an SSID
-				$field[1] =~ s/-\d+$//o;
-				$user = DXUser->get_current($field[1]);
-			}
 			$user = DXUser->new($field[1]) if !$user;
 			
 			if ($field[2] == 1) {
@@ -735,11 +913,10 @@ sub normal
 		}
 		
 		if ($pcno == 50) {		# keep alive/user list
-			my $node = DXCluster->get_exact($field[1]);
+			my $node = Route::Node::get($field[1]);
 			if ($node) {
-				return unless $node->isa('DXNode');
-				return unless $node->dxchan == $self;
-				$node->update_users($field[2]);
+				return unless $node->call eq $self->{call};
+				$node->usercount($field[2]);
 			}
 			last SWITCH;
 		}
@@ -767,7 +944,7 @@ sub normal
 								$dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave))
 							} elsif ($dxchan->is_node) {
 								if ($tochan) {
-									$tochan->{nopings} = 2; # pump up the timer
+									$tochan->{nopings} = $tochan->user->nopings || 2; # pump up the timer
 									push @{$tochan->{pingtime}}, $t;
 									shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
 									my $st;
@@ -787,17 +964,24 @@ sub normal
 			return;
 		}
 
+		if ($pcno == 75) {		# dunno but route it
+			if ($field[1] ne $main::mycall) {
+				$self->route($field[1], $line);
+			}
+			return;
+		}
+
 		if ($pcno == 73) {  # WCY broadcasts
 			
 			# do some de-duping
 			my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
 			if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
-				dbg('chan', "WCY Date ($field[1] $field[2]) out of range");
+				dbg('chan', "PCPROT: WCY Date ($field[1] $field[2]) out of range");
 				return;
 			}
 			@field = map { unpad($_) } @field;
 			if (WCY::dup($d,@field[3..7])) {
-				dbg('chan', "Dup WCY Spot ignored\n");
+				dbg('chan', "PCPROT: Dup WCY Spot ignored\n");
 				return;
 			}
 		
@@ -818,9 +1002,9 @@ sub normal
 		if ($pcno == 84) { # remote commands (incoming)
 			if ($field[1] eq $main::mycall) {
 				my $ref = DXUser->get_current($field[2]);
-				my $cref = DXCluster->get($field[2]);
+				my $cref = Route::Node::get($field[2]);
 				Log('rcmd', 'in', $ref->{priv}, $field[2], $field[4]);
-				unless ($field[4] =~ /rcmd/i || !$cref || !$ref || $cref->mynode->call ne $ref->homenode) {    # not allowed to relay RCMDS!
+				unless ($field[4] =~ /rcmd/i || !$cref || !$ref || $cref->call ne $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};
@@ -844,7 +1028,7 @@ sub normal
 				if ($ref && $ref->is_clx) {
 					$self->route($field[1], $line);
 				} else {
-					route($field[1], pc34($field[2], $field[1], $field[4]));
+					$self->route($field[1], pc34($field[2], $field[1], $field[4]));
 				}
 			}
 			return;
@@ -872,7 +1056,7 @@ sub normal
 				if ($ref && $ref->is_clx) {
 					$self->route($field[1], $line);
 				} else {
-					route($field[1], pc35($field[2], $field[1], $field[4]));
+					$self->route($field[1], pc35($field[2], $field[1], $field[4]));
 				}
 			}
 			return;
@@ -907,9 +1091,10 @@ sub process
 		next if $dxchan == $me;
 		
 		# send a pc50 out on this channel
-		if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) {
+		$dxchan->{pc50_t} = $main::systime unless exists $dxchan->{pc50_t};
+		if ($t >= $dxchan->{pc50_t} + $DXProt::pc50_interval) {
 			$dxchan->send(pc50(scalar DXChannel::get_all_users));
-			$dxchan->pc50_t($t);
+			$dxchan->{pc50_t} = $t;
 		} 
 
 		# send a ping out on this channel
@@ -928,9 +1113,9 @@ sub process
 	my $val;
 	my $cutoff;
 	if ($main::systime - 3600 > $last_hour) {
-		Spot::process;
-		Geomag::process;
-		AnnTalk::process;
+#		Spot::process;
+#		Geomag::process;
+#		AnnTalk::process;
 		$last_hour = $main::systime;
 	}
 }
@@ -938,46 +1123,11 @@ sub process
 #
 # finish up a pc context
 #
-sub finish
-{
-	my $self = shift;
-	my $call = $self->call;
-	my $conn = shift;
-	my $ref = DXCluster->get_exact($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
-	my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
-	my $node;
-	
-	foreach $node (@gonenodes) {
-		next if $node->call eq $call;
-		broadcast_ak1a(pc21($node->call, 'Gone') , $self) unless $self->{isolate}; 
-		$node->del();
-	}
-
-	# remove outstanding pings
-	delete $pings{$call};
-	
-	# now broadcast to all other ak1a nodes that I have gone
-	broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate};
-
-	# I was the last node visited
-    $self->user->node($main::mycall);
-
-	# send info to all logged in thingies
-	$self->tell_login('logoutn');
-
-	Log('DXProt', $call . " Disconnected");
-	$ref->del() if $ref;
-}
 
 #
 # some active measures
 #
+
 sub send_dx_spot
 {
 	my $self = shift;
@@ -988,11 +1138,12 @@ sub send_dx_spot
 	# 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 == $me;
 		my $routeit;
 		my ($filter, $hops);
 
-		if ($dxchan->{spotfilter}) {
-		    ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} );
+		if ($dxchan->{spotsfilter}) {
+		    ($filter, $hops) = $dxchan->{spotsfilter}->it(@_, $self->{call} );
 			next unless $filter;
 		}
 		
@@ -1013,6 +1164,7 @@ sub send_dx_spot
 		} elsif ($dxchan->is_user && $dxchan->{dx}) {
 			my $buf = Spot::formatb($dxchan->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
 			$buf .= "\a\a" if $dxchan->{beep};
+			$buf =~ s/\%5E/^/g;
 			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
 				$dxchan->send($buf);
 			} else {
@@ -1028,19 +1180,33 @@ sub send_wwv_spot
 	my $line = shift;
 	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($_[7]);
+	if (@dxcc > 0) {
+		$wwv_dxcc = $dxcc[1]->dxcc;
+		$wwv_itu = $dxcc[1]->itu;
+		$wwv_cq = $dxcc[1]->cq;						
+	}
+	@dxcc = Prefix::extract($_[8]);
+	if (@dxcc > 0) {
+		$org_dxcc = $dxcc[1]->dxcc;
+		$org_itu = $dxcc[1]->itu;
+		$org_cq = $dxcc[1]->cq;						
+	}
 	
 	# 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 == $self;
+		next if $dxchan == $me;
 		my $routeit;
 		my ($filter, $hops);
 
 		if ($dxchan->{wwvfilter}) {
-			 ($filter, $hops) = Filter::it($dxchan->{wwvfilter}, @_, $self->{call} );
+			($filter, $hops) = $dxchan->{wwvfilter}->it(@_, $self->{call}, $wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq);
 			 next unless $filter;
 		}
 		if ($dxchan->is_node) {
-			next if $dxchan == $self;
 			if ($hops) {
 				$routeit = $line;
 				$routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
@@ -1072,19 +1238,32 @@ sub send_wcy_spot
 	my $line = shift;
 	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($_[11]);
+	if (@dxcc > 0) {
+		$wcy_dxcc = $dxcc[1]->dxcc;
+		$wcy_itu = $dxcc[1]->itu;
+		$wcy_cq = $dxcc[1]->cq;						
+	}
+	@dxcc = Prefix::extract($_[12]);
+	if (@dxcc > 0) {
+		$org_dxcc = $dxcc[1]->dxcc;
+		$org_itu = $dxcc[1]->itu;
+		$org_cq = $dxcc[1]->cq;						
+	}
 	
 	# 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 == $me;
 		my $routeit;
 		my ($filter, $hops);
 
 		if ($dxchan->{wcyfilter}) {
-			 ($filter, $hops) = Filter::it($dxchan->{wcyfilter}, @_, $self->{call} );
+			($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call}, $wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq);
 			 next unless $filter;
 		}
-		if ($dxchan->is_clx || $dxchan->is_spider) {
-			next if $dxchan == $self;
+		if ($dxchan->is_clx || $dxchan->is_spider || $dxchan->is_dxnet) {
 			if ($hops) {
 				$routeit = $line;
 				$routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
@@ -1131,22 +1310,38 @@ sub send_announce
 		$target = "WX"; 
 		$to = '';
 	}
-	$target = "All" if !$target;
+	$target = "ALL" if !$target;
 	
 	Log('ann', $target, $_[0], $text);
 
+	# obtain country codes etc 
+	my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
+	my @dxcc = Prefix::extract($_[0]);
+	if (@dxcc > 0) {
+		$ann_dxcc = $dxcc[1]->dxcc;
+		$ann_itu = $dxcc[1]->itu;
+		$ann_cq = $dxcc[1]->cq;						
+	}
+	@dxcc = Prefix::extract($_[4]);
+	if (@dxcc > 0) {
+		$org_dxcc = $dxcc[1]->dxcc;
+		$org_itu = $dxcc[1]->itu;
+		$org_cq = $dxcc[1]->cq;						
+	}
+
 	# 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 == $self;
+		next if $dxchan == $me;
 		my $routeit;
 		my ($filter, $hops);
 
 		if ($dxchan->{annfilter}) {
-			($filter, $hops) = Filter::it($dxchan->{annfilter}, @_, $self->{call} );
+			($filter, $hops) = $dxchan->{annfilter}->it(@_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 			next unless $filter;
 		} 
 		if ($dxchan->is_node && $_[1] ne $main::mycall) {  # i.e not specifically routed to me
-			next if $dxchan == $self;
 			if ($hops) {
 				$routeit = $line;
 				$routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
@@ -1160,9 +1355,13 @@ sub send_announce
 				$dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
 				
 			}
-		} elsif ($dxchan->is_user && $dxchan->{ann}) {
+		} elsif ($dxchan->is_user) {
+			unless ($dxchan->{ann}) {
+				next if $_[0] ne $main::myalias && $_[0] ne $main::mycall;
+			}
 			next if $target eq 'SYSOP' && $dxchan->{priv} < 5;
 			my $buf = "$to$target de $_[0]: $text";
+			$buf =~ s/\%5E/^/g;
 			$buf .= "\a\a" if $dxchan->{beep};
 			if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
 				$dxchan->send($buf);
@@ -1180,37 +1379,32 @@ sub send_local_config
 	my @nodes;
 	my @localnodes;
 	my @remotenodes;
-		
+
+	dbg('trace', 'DXProt::send_local_config');
+	
 	# send our nodes
 	if ($self->{isolate}) {
-		@localnodes = (DXCluster->get_exact($main::mycall));
+		@localnodes = ( $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
-		@nodes = DXNode::get_all();
-		@nodes = grep { $_->{call} ne $main::mycall } @nodes;
-		@nodes = grep { $_->dxchan != $self } @nodes if @nodes;
-		@nodes = grep { !$_->dxchan->{isolate} } @nodes if @nodes;
-		@localnodes = grep { $_->dxchan->{call} eq $_->{call} } @nodes if @nodes;
-		unshift @localnodes, DXCluster->get_exact($main::mycall);
-		@remotenodes = grep { $_->dxchan->{call} ne $_->{call} } @nodes if @nodes;
-	}
-
-	my @s = $me->pc19(@localnodes, @remotenodes);
-	for (@s) {
-		my $routeit = adjust_hops($self, $_);
-		$self->send($routeit) if $routeit;
+		my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} } DXChannel::get_all_nodes();
+		@localnodes = map { Route::Node::get($_->{call}) or die "connot find node $_->{call}" } @dxchan if @dxchan;
+		my @intcalls = map { $_->nodes } @localnodes if @localnodes;
+		my $ref = Route::Node::get($self->{call});
+		my @rnodes = $ref->nodes;
+		for my $n (@intcalls) {
+			push @remotenodes, Route::Node::get($n) unless grep $n eq $_, @rnodes;
+		}
+		unshift @localnodes, $main::routeroot;
 	}
 	
+	send_route($self, \&pc19, scalar(@localnodes)+scalar(@remotenodes), @localnodes, @remotenodes);
+	
 	# get all the users connected on the above nodes and send them out
 	foreach $n (@localnodes, @remotenodes) {
-		my @users = values %{$n->list};
-		my @s = pc16($n, @users);
-		for (@s) {
-			my $routeit = adjust_hops($self, $_);
-			$self->send($routeit) if $routeit;
-		}
+		send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
 	}
 }
 
@@ -1222,21 +1416,32 @@ sub send_local_config
 sub route
 {
 	my ($self, $call, $line) = @_;
-	my $cl = DXCluster->get_exact($call);
-	if ($cl) {       # don't route it back down itself
-		if (ref $self && $call eq $self->{call}) {
-			dbg('chan', "Trying to route back to source, dropped");
-			return;
-		}
-		my $hops;
-		my $dxchan = $cl->{dxchan};
-		if ($dxchan) {
-			my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
-			if ($routeit) {
-				$dxchan->send($routeit) if $dxchan;
+
+	if (ref $self && $call eq $self->{call}) {
+		dbg('chan', "PCPROT: Trying to route back to source, dropped");
+		return;
+	}
+
+	# always send it down the local interface if available
+	my $dxchan = DXChannel->get($call);
+	unless ($dxchan) {
+		my $cl = Route::Node::get($call);
+		$dxchan = $cl->dxchan if $cl;
+		if (ref $dxchan) {
+			if (ref $self && $dxchan eq $self) {
+				dbg('chan', "PCPROT: Trying to route back to source, dropped");
+				return;
 			}
 		}
 	}
+	if ($dxchan) {
+		my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
+		if ($routeit) {
+			$dxchan->send($routeit);
+		}
+	} else {
+		dbg('chan', "PCPROT: No route available, dropped");
+	}
 }
 
 # broadcast a message to all clusters taking into account isolation
@@ -1245,12 +1450,14 @@ sub broadcast_ak1a
 {
 	my $s = shift;				# the line to be rebroadcast
 	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = DXChannel::get_all_ak1a();
+	my @dxchan = DXChannel::get_all_nodes();
 	my $dxchan;
 	
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	foreach $dxchan (@dxchan) {
 		next if grep $dxchan == $_, @except;
+		next if $dxchan == $me;
+		
 		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
 		$dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
 	}
@@ -1262,12 +1469,14 @@ sub broadcast_all_ak1a
 {
 	my $s = shift;				# the line to be rebroadcast
 	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = DXChannel::get_all_ak1a();
+	my @dxchan = DXChannel::get_all_nodes();
 	my $dxchan;
 	
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	foreach $dxchan (@dxchan) {
 		next if grep $dxchan == $_, @except;
+		next if $dxchan == $me;
+
 		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
 		$dxchan->send($routeit);
 	}
@@ -1302,10 +1511,11 @@ sub broadcast_list
 	
 	foreach $dxchan (@_) {
 		my $filter = 1;
+		next if $dxchan == $me;
 		
 		if ($sort eq 'dx') {
 		    next unless $dxchan->{dx};
-			($filter) = Filter::it($dxchan->{spotfilter}, @{$fref}) if ref $fref;
+			($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
 			next unless $filter;
 		}
 		next if $sort eq 'ann' && !$dxchan->{ann};
@@ -1406,8 +1616,9 @@ sub addrcmd
 	$r->{cmd} = $cmd;
 	$rcmds{$to} = $r;
 
-	my $ref = DXCluster->get_exact($to);
-    if ($ref && $ref->dxchan && $ref->dxchan->is_clx) {
+	my $ref = Route::Node::get($to);
+	my $dxchan = $ref->dxchan;
+    if ($dxchan && $dxchan->is_clx) {
 		route(undef, $to, pc84($main::mycall, $to, $self->{call}, $cmd));
 	} else {
 		route(undef, $to, pc34($main::mycall, $to, $cmd));
@@ -1417,20 +1628,42 @@ sub addrcmd
 sub disconnect
 {
 	my $self = shift;
-	my $nopc39 = shift;
+	my $pc39flag = shift;
+	my $call = $self->call;
 
-	if ($self->{conn} && !$nopc39) {
+	unless ($pc39flag && $pc39flag == 1) {
 		$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
 	}
 
+	# do routing stuff
+#	my $node = Route::Node::get($self->{call});
+#	my @rout = $node->del_nodes if $node;
+	my @rout = $main::routeroot->del_node($call);
+	dbg('route', "B/C PC21 (from PC39) for: " . join(',', (map{ $_->call } @rout))) if @rout;
+	
+	# 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(@rout) if @rout;
+	}
+
+	# remove outstanding pings
+	delete $pings{$call};
+	
+	# I was the last node visited
+    $self->user->node($main::mycall);
+
+	# send info to all logged in thingies
+	$self->tell_login('logoutn');
+
+	Log('DXProt', $call . " Disconnected");
+
 	$self->SUPER::disconnect;
 }
 
-# check that a field only has callsign characters in it
-sub is_callsign
-{
-	return $_[0] !~ /[^A-Z0-9\-]/
-}
 
 # 
 # send a talk message to this thingy
@@ -1443,5 +1676,77 @@ sub talk
 	$self->send(DXProt::pc10($from, $to, $via, $line));
 	Log('talk', $self->call, $from, $via?$via:$main::mycall, $line);
 }
+
+# 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
+sub send_route
+{
+	my $self = shift;
+	my $generate = shift;
+	my $no = shift;     # the no of things to filter on 
+	my $routeit;
+	my ($filter, $hops);
+	my @rin;
+	
+	if ($self->{routefilter}) {
+		for (; @_ && $no; $no--) {
+			my $r = shift;
+			($filter, $hops) = $self->{routefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq);
+			push @rin, $r if $filter;
+		}
+	}
+	if (@rin) {
+		foreach my $line (&$generate(@rin, @_)) {
+			if ($hops) {
+				$routeit = $line;
+				$routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
+			} else {
+				$routeit = adjust_hops($self, $line);  # adjust its hop count by node name
+				next unless $routeit;
+			}
+			$self->send($routeit);
+		}
+	}
+}
+
+sub broadcast_route
+{
+	my $self = shift;
+	my $generate = shift;
+	my @dxchan = DXChannel::get_all_nodes();
+	my $dxchan;
+	my $line;
+	
+	foreach $dxchan (@dxchan) {
+		next if $dxchan == $self;
+		next if $dxchan == $me;
+		$dxchan->send_route($generate, @_);
+	}
+}
+
+sub route_pc16
+{
+	my $self = shift;
+	broadcast_route($self, \&pc16, 1, @_);
+}
+
+sub route_pc17
+{
+	my $self = shift;
+	broadcast_route($self, \&pc17, 1, @_);
+}
+
+sub route_pc19
+{
+	my $self = shift;
+	broadcast_route($self, \&pc19, scalar @_, @_);
+}
+
+sub route_pc21
+{
+	my $self = shift;
+	broadcast_route($self, \&pc21, scalar @_, @_);
+}
+
 1;
 __END__