X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=03887493ffaa5b6b451d327b523250883d8d754b;hb=101516b420ac77cd9eb8294651104e43f3461c06;hp=dbe7faf8e7f63340b3ee4ef262e8ea7505ed6380;hpb=ea7e97b115dd46656a5aa7fabd19990e98a50df5;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index dbe7faf8..03887493 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -35,7 +35,7 @@ use Route::Node;
 
 use strict;
 use vars qw($me $pc11_max_age $pc23_max_age
-			$last_hour $last10 %emph  %pings %rcmds
+			$last_hour $last10 %eph  %pings %rcmds
 			%nodehops $baddx $badspotter $badnode $censorpc
 			$allowzero $decode_dk0wcy $send_opernam @checklist);
 
@@ -286,7 +286,7 @@ sub normal
 	# 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]) . ")");
+		dbg("PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")") if isdbg('chan');
 		return;
 	}
 
@@ -295,7 +295,7 @@ sub normal
 	eval {
 		$pcr = Local::pcprot($self, $pcno, @field);
 	};
-#	dbg('local', "Local::pcprot error $@") if $@;
+#	dbg("Local::pcprot error $@") if isdbg('local') if $@;
 	return if $pcr;
 	
  SWITCH: {
@@ -305,7 +305,7 @@ sub normal
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[3])) {
-					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chan');
 					return;
 				}
 			}
@@ -340,13 +340,13 @@ sub normal
 			
 			# if this is a 'nodx' node then ignore it
 			if ($badnode->in($field[7])) {
-				dbg('chan', "PCPROT: Bad Node, dropped");
+				dbg("PCPROT: Bad Node, dropped") if isdbg('chan');
 				return;
 			}
 			
 			# if this is a 'bad spotter' user then ignore it
 			if ($badspotter->in($field[6])) {
-				dbg('chan', "PCPROT: Bad Spotter, dropped");
+				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chan');
 				return;
 			}
 			
@@ -354,13 +354,13 @@ 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', "PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
+				dbg("PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n") if isdbg('chan');
 				return;
 			}
 
 			# is it 'baddx'
 			if ($baddx->in($field[2])) {
-				dbg('chan', "PCPROT: Bad DX spot, ignored");
+				dbg("PCPROT: Bad DX spot, ignored") if isdbg('chan');
 				return;
 			}
 			
@@ -368,17 +368,17 @@ sub normal
 			$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");
+				dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chan');
 				return;
 			}
 			if (Spot::dup($field[1], $field[2], $d, $field[5])) {
-				dbg('chan', "PCPROT: Duplicate Spot ignored\n");
+				dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chan');
 				return;
 			}
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[5])) {
-					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chan');
 					return;
 				}
 			}
@@ -388,7 +388,7 @@ sub normal
 			if ($self->{inspotsfilter}) {
 				my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
 				unless ($filter) {
-					dbg('chan', "PCPROT: Rejected by filter");
+					dbg("PCPROT: Rejected by filter") if isdbg('chan');
 					return;
 				}
 			}
@@ -455,7 +455,7 @@ sub normal
 			eval {
 				$r = Local::spot($self, @spot);
 			};
-#			dbg('local', "Local::spot1 error $@") if $@;
+#			dbg("Local::spot1 error $@") if isdbg('local') if $@;
 			return if $r;
 
 			# DON'T be silly and send on PC26s!
@@ -470,14 +470,14 @@ sub normal
 			# announce duplicate checking
 			$field[3] =~ s/^\s+//;  # remove leading blanks
 			if (AnnTalk::dup($field[1], $field[2], $field[3])) {
-				dbg('chan', "PCPROT: Duplicate Announce ignored");
+				dbg("PCPROT: Duplicate Announce ignored") if isdbg('chan');
 				return;
 			}
 
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[3])) {
-					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chan');
 					return;
 				}
 			}
@@ -502,7 +502,7 @@ sub normal
 					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', "PCPROT: Rejected by filter");
+						dbg("PCPROT: Rejected by filter") if isdbg('chan');
 						return;
 					}
 				}
@@ -534,17 +534,17 @@ sub normal
 			my $newline = "PC16^";
 			
 			if ($ncall eq $main::mycall) {
-				dbg('chan', "PCPROT: trying to alter config on this node from outside!");
+				dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chan');
 				return;
 			}
 			$dxchan = DXChannel->get($ncall);
 			if ($dxchan && $dxchan ne $self) {
-				dbg('chan', "PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!");
+				dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chan');
 				return;
 			}
 			my $parent = Route::Node::get($ncall); 
 			unless ($parent) {
-				dbg('chan', "PCPROT: Node $ncall not in config");
+				dbg("PCPROT: Node $ncall not in config") if isdbg('chan');
 				return;
 			}
 			my $i;
@@ -554,7 +554,15 @@ sub normal
 				next unless $call && $conf && defined $here && is_callsign($call);
 				$conf = $conf eq '*';
 
-				push @rout, $parent->add_user($call, Route::here($here)|Route::conf($conf));
+				my $r = Route::User::get($call);
+				my $flags = Route::here($here)|Route::conf($conf);
+				
+				if ($r && $r->flags != $flags) {
+					$r->flags($flags);
+					push @rout, $r;
+				} elsif (!$r) {
+					push @rout, $parent->add_user($call, $flags);
+				}
 				
 				# add this station to the user database, if required
 				$call =~ s/-\d+$//o;        # remove ssid for users
@@ -570,7 +578,6 @@ sub normal
 			# queue up any messages (look for privates only)
 			DXMsg::queue_msg(1) if $self->state eq 'normal';     
 
-			dbg('route', "B/C PC16 on $ncall for: " . join(',', map{$_->call} @rout)) if @rout;
 			$self->route_pc16($parent, @rout) if @rout;
 			return;
 		}
@@ -578,22 +585,22 @@ sub normal
 		if ($pcno == 17) {		# remove a user
 			my $dxchan;
 			my $ncall = $field[2];
+			my $ucall = $field[1];
 			if ($ncall eq $main::mycall) {
-				dbg('chan', "PCPROT: trying to alter config on this node from outside!");
+				dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chan');
 				return;
 			}
 			$dxchan = DXChannel->get($ncall);
 			if ($dxchan && $dxchan ne $self) {
-				dbg('chan', "PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!");
+				dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chan');
 				return;
 			}
 			my $parent = Route::Node::get($ncall);
 			unless ($parent) {
-				dbg('chan', "PCPROT: Route::Node $ncall not in config");
+				dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chan');
 				return;
 			}
-			my @rout = $parent->del_user($field[1]);
-			dbg('route', "B/C PC17 on $ncall for: $field[1]");
+			my @rout = $parent->del_user($ucall);
 			$self->route_pc17($parent, @rout) if @rout;
 			return;
 		}
@@ -603,11 +610,7 @@ sub normal
 
 			# first clear out any nodes on this dxchannel
 			my $parent = Route::Node::get($self->{call});
-			my @rout;
-			for ($parent->nodes) {
-				my $r = Route::Node::get($_);
-				push @rout, $r->del_node if $r;
-			}
+			my @rout = $parent->del_nodes;
 			$self->route_pc21(@rout, $parent);
 			$self->send_local_config();
 			$self->send(pc20());
@@ -636,9 +639,10 @@ sub normal
 
 				# update it if required
 				my $r;
-				if ($parent->call eq $call && !$parent->version) {
+				my $flags = Route::here($here)|Route::conf($conf);
+				if ($parent->call eq $call && ($parent->version ne $ver || $parent->flags != $flags)) {
 					$parent->version($ver);
-					$parent->flags(Route::here($here)|Route::conf($conf));
+					$parent->flags($flags);
 					push @rout, $parent;
 				} elsif ($parent->call ne $call) {
 					next if $call eq $main::mycall || $call eq $self->{call};
@@ -647,7 +651,7 @@ sub normal
 					push @rout, $r if $r;
 				} else {
 					$r = Route::Node::get($call);
-					if ($r && (!$r->version || $r->version eq '0000')) {
+					if ($r && ($r->version ne $ver || $r->flags != $flags)) {
 						$r->version($ver);
 						$r->flags(Route::here($here)|Route::conf($conf));
 						push @rout, $r;
@@ -672,8 +676,6 @@ sub normal
 				$user->put;
 			}
 
-			dbg('route', "B/C PC19 for: " . join(',', map{$_->call} @rout)) if @rout;
-			
 			$self->route_pc19(@rout) if @rout;
 			return;
 		}
@@ -689,25 +691,24 @@ sub normal
 			my $call = uc $field[1];
 			my @rout;
 			my $parent = Route::Node::get($self->{call});
+			unless ($parent) {
+				dbg("PCPROT: Route::Node $call not in config") if isdbg('chan');
+				return;
+			}
+			my $node = Route::Node::get($call);
 			
 			if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
 				if ($call eq $self->{call}) {
-					dbg('chan', "PCPROT: Trying to disconnect myself with PC21");
+					dbg("PCPROT: Trying to disconnect myself with PC21") if isdbg('chan');
 					return;
 				}
 
 				# routing objects
-				if ($parent) {
-					push @rout, $parent->del_node($call);
-				} else {
-					dbg('chan', "PCPROT: Route::Node $call not in config");
-				}
+				push @rout, $node->del($parent) if $node;
 			} else {
-				dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!");
+				dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chan');
 				return;
 			}
-			dbg('route', "B/C PC21 for: " . join(',', (map{$_->call} @rout))) if @rout;
-			
 			$self->route_pc21(@rout) if @rout;
 			return;
 		}
@@ -735,11 +736,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', "PCPROT: WWV Date ($field[1] $field[2]) out of range");
+				dbg("PCPROT: WWV Date ($field[1] $field[2]) out of range") if isdbg('chan');
 				return;
 			}
 			if (Geomag::dup($d,$sfi,$k,$i,$field[6])) {
-				dbg('chan', "PCPROT: Dup WWV Spot ignored\n");
+				dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chan');
 				return;
 			}
 			$field[7] =~ s/-\d+$//o;            # remove spotter's ssid
@@ -750,7 +751,7 @@ sub normal
 			eval {
 				$rep = Local::wwv($self, $field[1], $field[2], $sfi, $k, $i, @field[6..8], $r);
 			};
-#			dbg('local', "Local::wwv2 error $@") if $@;
+#			dbg("Local::wwv2 error $@") if isdbg('local') if $@;
 			return if $rep;
 
 			# DON'T be silly and send on PC27s!
@@ -767,7 +768,9 @@ sub normal
 			$ref->here($field[2]) if $ref;
 			$ref = Route::User::get($call);
 			$ref->here($field[2]) if $ref;
-			last SWITCH;
+			
+			$self->route_pc24($ref, $field[3]) if $ref && !eph_dup($line);
+			return;
 		}
 		
 		if ($pcno == 25) {      # merge request
@@ -776,7 +779,7 @@ sub normal
 				return;
 			}
 			if ($field[2] eq $main::mycall) {
-				dbg('chan', "PCPROT: Trying to merge to myself, ignored");
+				dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chan');
 				return;
 			}
 
@@ -879,15 +882,16 @@ sub normal
 			if ($field[1] eq $self->{call}) {
 				$self->disconnect(1);
 			} else {
-				dbg('chan', "PCPROT: came in on wrong channel");
+				dbg("PCPROT: came in on wrong channel") if isdbg('chan');
 			}
 			return;
 		}
 		
 		if ($pcno == 41) {		# user info
 			# add this station to the user database, if required
-			my $user = DXUser->get_current($field[1]);
-			$user = DXUser->new($field[1]) if !$user;
+			my $call = $field[1];
+			my $user = DXUser->get_current($call);
+			$user = DXUser->new($call) if !$user;
 			
 			if ($field[2] == 1) {
 				$user->name($field[3]);
@@ -903,37 +907,45 @@ sub normal
 			}
 			$user->lastoper($main::systime);   # to cut down on excessive for/opers being generated
 			$user->put;
-			last SWITCH;
+			my $ref = Route::get($call);
+			$self->route_pc41($ref, $call, $field[2], $field[3], $field[4]) if $ref && !eph_dup($line);
+			return;
 		}
+
 		if ($pcno == 43) {
 			last SWITCH;
 		}
+
 		if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47 || $pcno == 48) {
 			DXDb::process($self, $line);
 			return;
 		}
 		
 		if ($pcno == 50) {		# keep alive/user list
-			my $node = Route::Node::get($field[1]);
+			my $call = $field[1];
+			my $node = Route::Node::get($call);
 			if ($node) {
 				return unless $node->call eq $self->{call};
 				$node->usercount($field[2]);
+				$self->route_pc50($node, $field[2], $field[3]) unless eph_dup($line);
 			}
-			last SWITCH;
+			return;
 		}
 		
 		if ($pcno == 51) {		# incoming ping requests/answers
+			my $to = $field[1];
+			my $from = $field[2];
+			my $flag = $field[3];
 			
 			# is it for us?
-			if ($field[1] eq $main::mycall) {
-				my $flag = $field[3];
+			if ($to eq $main::mycall) {
 				if ($flag == 1) {
-					$self->send(pc51($field[2], $field[1], '0'));
+					$self->send(pc51($from, $to, '0'));
 				} else {
 					# it's a reply, look in the ping list for this one
-					my $ref = $pings{$field[2]};
+					my $ref = $pings{$from};
 					if ($ref) {
-						my $tochan =  DXChannel->get($field[2]);
+						my $tochan =  DXChannel->get($from);
 						while (@$ref) {
 							my $r = shift @$ref;
 							my $dxchan = DXChannel->get($r->{call});
@@ -942,7 +954,7 @@ sub normal
 							if ($dxchan->is_user) {
 								my $s = sprintf "%.2f", $t; 
 								my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
-								$dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave))
+								$dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
 							} elsif ($dxchan->is_node) {
 								if ($tochan) {
 									$tochan->{nopings} = $tochan->user->nopings || 2; # pump up the timer
@@ -960,29 +972,31 @@ sub normal
 				}
 			} else {
 				# route down an appropriate thingy
-				$self->route($field[1], $line);
+				$self->route($to, $line);
 			}
 			return;
 		}
 
 		if ($pcno == 75) {		# dunno but route it
-			if ($field[1] ne $main::mycall) {
-				$self->route($field[1], $line);
+			my $call = $field[1];
+			if ($call ne $main::mycall) {
+				$self->route($call, $line);
 			}
 			return;
 		}
 
 		if ($pcno == 73) {  # WCY broadcasts
+			my $call = $field[1];
 			
 			# do some de-duping
-			my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
+			my $d = cltounix($call, 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', "PCPROT: WCY Date ($field[1] $field[2]) out of range");
+				dbg("PCPROT: WCY Date ($call $field[2]) out of range") if isdbg('chan');
 				return;
 			}
 			@field = map { unpad($_) } @field;
 			if (WCY::dup($d,@field[3..7])) {
-				dbg('chan', "PCPROT: Dup WCY Spot ignored\n");
+				dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chan');
 				return;
 			}
 		
@@ -992,7 +1006,7 @@ sub normal
 			eval {
 				$rep = Local::wwv($self, @field[1..12]);
 			};
-			# dbg('local', "Local::wcy error $@") if $@;
+			# dbg("Local::wcy error $@") if isdbg('local') if $@;
 			return if $rep;
 
 			# broadcast to the eager world
@@ -1001,7 +1015,8 @@ sub normal
 		}
 
 		if ($pcno == 84) { # remote commands (incoming)
-			if ($field[1] eq $main::mycall) {
+			my $call = $field[1];
+			if ($call eq $main::mycall) {
 				my $ref = DXUser->get_current($field[2]);
 				my $cref = Route::Node::get($field[2]);
 				Log('rcmd', 'in', $ref->{priv}, $field[2], $field[4]);
@@ -1025,18 +1040,19 @@ sub normal
 					$self->send(pc85($main::mycall, $field[2], $field[3],"$main::mycall:your attempt is logged, Tut tut tut...!"));
 				}
 			} else {
-				my $ref = DXUser->get_current($field[1]);
+				my $ref = DXUser->get_current($call);
 				if ($ref && $ref->is_clx) {
-					$self->route($field[1], $line);
+					$self->route($call, $line);
 				} else {
-					$self->route($field[1], pc34($field[2], $field[1], $field[4]));
+					$self->route($call, pc34($field[2], $call, $field[4]));
 				}
 			}
 			return;
 		}
 
 		if ($pcno == 85) {		# remote command replies
-			if ($field[1] eq $main::mycall) {
+			my $call = $field[1];
+			if ($call eq $main::mycall) {
 				my $dxchan = DXChannel->get($field[3]);
 				if ($dxchan) {
 					$dxchan->send($field[4]);
@@ -1053,11 +1069,11 @@ sub normal
 					}
 				}
 			} else {
-				my $ref = DXUser->get_current($field[1]);
+				my $ref = DXUser->get_current($call);
 				if ($ref && $ref->is_clx) {
-					$self->route($field[1], $line);
+					$self->route($call, $line);
 				} else {
-					$self->route($field[1], pc35($field[2], $field[1], $field[4]));
+					$self->route($call, pc35($field[2], $call, $field[4]));
 				}
 			}
 			return;
@@ -1072,8 +1088,8 @@ sub normal
 	#        REBROADCAST!!!!
 	#
 
-	if (emph_dup($line)) {
-		dbg('chan', "PCPROT: Ephemeral dup, dropped");
+	if (eph_dup($line)) {
+		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chan');
 	} else {
 		unless ($self->{isolate}) {
 			broadcast_ak1a($line, $self); # send it to everyone but me
@@ -1098,7 +1114,9 @@ sub process
 		# send a pc50 out on this channel
 		$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));
+			my $s = pc50($me, scalar DXChannel::get_all_users);
+			eph_dup($s);
+			$dxchan->send($s);
 			$dxchan->{pc50_t} = $t;
 		} 
 
@@ -1116,9 +1134,9 @@ sub process
 
 	# every ten seconds
 	if ($t - $last10 >= 10) {	
-		# clean out emphemera 
+		# clean out ephemera 
 
-		emph_clean();
+		eph_clean();
 
 		$last10 = $t;
 	}
@@ -1388,7 +1406,7 @@ sub send_local_config
 	my @localnodes;
 	my @remotenodes;
 
-	dbg('trace', 'DXProt::send_local_config');
+	dbg('DXProt::send_local_config') if isdbg('trace');
 	
 	# send our nodes
 	if ($self->{isolate}) {
@@ -1412,7 +1430,11 @@ sub send_local_config
 	
 	# get all the users connected on the above nodes and send them out
 	foreach $n (@localnodes, @remotenodes) {
-		send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
+		if ($n) {
+			send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
+		} else {
+			dbg("sent a null value") if isdbg('chan');
+		}
 	}
 }
 
@@ -1426,7 +1448,7 @@ sub route
 	my ($self, $call, $line) = @_;
 
 	if (ref $self && $call eq $self->{call}) {
-		dbg('chan', "PCPROT: Trying to route back to source, dropped");
+		dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chan');
 		return;
 	}
 
@@ -1437,7 +1459,7 @@ sub route
 		$dxchan = $cl->dxchan if $cl;
 		if (ref $dxchan) {
 			if (ref $self && $dxchan eq $self) {
-				dbg('chan', "PCPROT: Trying to route back to source, dropped");
+				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chan');
 				return;
 			}
 		}
@@ -1448,7 +1470,7 @@ sub route
 			$dxchan->send($routeit);
 		}
 	} else {
-		dbg('chan', "PCPROT: No route available, dropped");
+		dbg("PCPROT: No route available, dropped") if isdbg('chan');
 	}
 }
 
@@ -1526,7 +1548,7 @@ sub broadcast_list
 			($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
 			next unless $filter;
 		}
-		next if $sort eq 'ann' && !$dxchan->{ann};
+		next if $sort eq 'ann' && !$dxchan->{ann} && $s !~ /^To\s+LOCAL\s+de\s+(?:$main::myalias|$main::mycall)/i;
 		next if $sort eq 'wwv' && !$dxchan->{wwv};
 		next if $sort eq 'wcy' && !$dxchan->{wcy};
 		next if $sort eq 'wx' && !$dxchan->{wx};
@@ -1644,10 +1666,12 @@ sub disconnect
 	}
 
 	# 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;
+	my $node = Route::Node::get($call);
+	my @rout;
+	if ($node) {
+		@rout = $node->del_nodes;    # at the next level
+		@rout = $node->del($main::routeroot);
+	}
 	
 	# unbusy and stop and outgoing mail
 	my $mref = DXMsg::get_busy($call);
@@ -1699,8 +1723,12 @@ sub send_route
 	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 ($r) {
+				($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;
+			} else {
+				dbg("was sent a null value") if isdbg('chan');
+			}
 		}
 	}
 	if (@rin) {
@@ -1756,24 +1784,44 @@ sub route_pc21
 	broadcast_route($self, \&pc21, scalar @_, @_);
 }
 
-sub emph_dup
+sub route_pc24
+{
+	my $self = shift;
+	broadcast_route($self, \&pc24, 1, @_);
+}
+
+sub route_pc41
+{
+	my $self = shift;
+	broadcast_route($self, \&pc41, 1, @_);
+}
+
+sub route_pc50
+{
+	my $self = shift;
+	broadcast_route($self, \&pc50, 1, @_);
+}
+
+
+
+sub eph_dup
 {
 	my $s = shift;
 
 	# chop the end off
-	$s =~ s/\^H\d\d?\^?~?@//;
-	return 1 if exists $emph{$s};
-	$emph{$s} = $main::systime;
+	$s =~ s/\^H\d\d?\^?~?$//;
+	return 1 if exists $eph{$s};
+	$eph{$s} = $main::systime;
 	return undef;
 }
 
-sub emph_clean
+sub eph_clean
 {
 	my ($key, $val);
 	
-	while (($key, $val) = each %emph) {
+	while (($key, $val) = each %eph) {
 		if ($main::systime - $val > 90) {
-			delete $emph{$key};
+			delete $eph{$key};
 		}
 	}
 }