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

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index af28b192..b6c0b759 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -32,7 +32,6 @@ use DXHash;
 use Route;
 use Route::Node;
 use Script;
-use RouteDB;
 use DXProtHandle;
 
 use strict;
@@ -40,12 +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
+			$pc19_version $myprot_version
 			%nodehops $baddx $badspotter $badnode $censorpc
 			$allowzero $decode_dk0wcy $send_opernam @checklist
 			$eph_pc15_restime $pc92_update_period $pc92_obs_timeout
 			%pc92_find $pc92_find_timeout $pc92_short_update_period
-			$next_pc92_obs_timeout
+			$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
@@ -64,23 +65,20 @@ $badnode = new DXHash "badnode";
 $last10 = $last_pc50 = time;
 $ann_to_talk = 1;
 $eph_restime = 60;
-$eph_info_restime = 60*60;
+$eph_info_restime = 18*60*60;
 $eph_pc15_restime = 6*60;
 $eph_pc34_restime = 30;
 $pingint = 5*60;
 $obscount = 2;
 $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 = 60*60;	# the period between outgoing PC92 C updates
-$pc92_short_update_period = 15*60; # shorten the update period after a connection
+$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
-#$pc92_obs_timeout = $pc92_update_period; # the time between obscount countdowns
-$pc92_obs_timeout = 60*60; # the time between obscount for incoming countdowns
-$next_pc92_obs_timeout = $main::systime + 60*60; # the time between obscount countdowns
-
 
 
 @checklist =
@@ -136,7 +134,7 @@ $next_pc92_obs_timeout = $main::systime + 60*60; # the time between obscount cou
  undef,
  undef,
  undef,							# pc60
- undef,
+ [ qw(i f m d t m c c a h) ],		# pc61
  undef,
  undef,
  undef,
@@ -165,7 +163,10 @@ $next_pc92_obs_timeout = $main::systime + 60*60; # the time between obscount cou
  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
@@ -182,7 +183,8 @@ sub check
 	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') {
@@ -201,6 +203,10 @@ 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;
@@ -209,17 +215,25 @@ sub check
 sub update_pc92_next
 {
 	my $self = shift;
-	my $period = shift || $pc92_update_period;
+	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;
@@ -232,9 +246,11 @@ sub init
 	$main::me->{pingave} = 0;
 	$main::me->{registered} = 1;
 	$main::me->{version} = $main::version;
-	$main::me->{build} = "$main::subversion.$main::build";
+	$main::me->{build} = $main::build;
 	$main::me->{do_pc9x} = 1;
-	$main::me->update_pc92_next($pc92_update_period);
+	$main::me->{hostname} = $main::clusteraddr;
+	$main::me->update_pc92_next($pc92_short_update_period);
+	$main::me->update_pc92_keepalive;
 }
 
 #
@@ -256,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;
 }
@@ -271,9 +287,11 @@ 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");
 
@@ -281,7 +299,7 @@ sub start
 	$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};
@@ -297,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)
@@ -306,12 +325,8 @@ sub start
 	$self->{inwcyfilter} = Filter::read_in('wcy', $call, 1) || Filter::read_in('wcy', 'node_default', 1);
 	$self->{inannfilter} = Filter::read_in('ann', $call, 1) || Filter::read_in('ann', 'node_default', 1);
 	$self->{inroutefilter} = Filter::read_in('route', $call, 1) || Filter::read_in('route', 'node_default', 1) unless $self->{isolate};
-	# if there is no route input filter then specify a default one.
-	# obviously this can be changed later by the sysop.
-	if (!$self->{inroutefilter}) {
-		my $dxcc = $self->dxcc;
-		$Route::filterdef->cmd($self, 'route', 'accept', "input by_dxcc $dxcc" );
-	}
+	$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");
@@ -343,8 +358,12 @@ sub start
 	my $script = new Script(lc $call) || new Script('node_default');
 	$script->run($self) if $script;
 
-	# set next_pc92_update time for this node sooner
-	$self->update_pc92_next($self->{outbound} ? $pc92_short_update_period : $pc92_update_period);
+	# 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;
 }
 
 #
@@ -402,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);
 	}
 }
 
@@ -425,38 +450,6 @@ sub process
 	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;
-
-		# 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}};
-			}
-		}
-
-	}
-
-	Investigate::process();
-	clean_pc92_find();
-
 	# every ten seconds
 	if ($t - $last10 >= 10) {
 		# clean out ephemera
@@ -464,26 +457,76 @@ sub process
 		eph_clean();
 		import_chat();
 
-		if ($main::systime >= $next_pc92_obs_timeout) {
-			time_out_pc92_routes();
-			$next_pc92_obs_timeout = $main::systime + $pc92_obs_timeout;
+		$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;
 		}
 
-		$last10 = $t;
+		foreach $dxchan (@dxchan) {
+			next unless $dxchan->is_node;
+			next if $dxchan == $main::me;
+
+			# send the pc50
+			$dxchan->send($pc50s) if !$dxchan->{do_pc9x} && $pc50s;
+
+			# 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');
+				}
+			}
+		}
+
+		clean_pc92_find();
 
 		# 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.
+			# 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}) {
-				dbg("ROUTE: pc92 broadcast candidate: $dxchan->{call}") if isdbg('obscount');
 				if ($dxchan == $main::me || !$dxchan->{do_pc9x}) {
-					$dxchan->broadcast_pc92_update($dxchan->{call});
+					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();
+			$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();
+		}
 	}
 
 	if ($main::systime - 3600 > $last_hour) {
@@ -506,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});
+		}
 	}
 }
 
@@ -746,20 +798,15 @@ sub send_chat
 	# 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]);
 	}
 }
@@ -783,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);
+	}
 }
 
 
@@ -806,8 +867,10 @@ sub send_local_config
 	} 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_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 {
 		# 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
@@ -823,13 +886,13 @@ sub send_local_config
 		my $node;
 		my @rawintcalls = map { $_->nodes } @localnodes if @localnodes;
 		my @intcalls;
-		for $node (@rawintcalls) {
-			push @intcalls, $node unless grep $node eq $_, @intcalls;
+		foreach $node (@rawintcalls) {
+			push @intcalls, $node if grep $_ && $node != $_, @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;
+		foreach $node (@intcalls) {
+			push @remotenodes, Route::Node::get($node) if grep $_ && $node != $_, @rnodes, @remotenodes;
 		}
 		$self->send_route($main::mycall, \&pc19, scalar(@remotenodes), @remotenodes);
 	}
@@ -852,6 +915,7 @@ 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;
@@ -893,9 +957,34 @@ sub broadcast_pc92_update
 	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($pc92_update_period);
+	$self->update_pc92_next;
+}
+
+sub broadcast_pc92_keepalive
+{
+	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
@@ -957,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) {
@@ -1004,7 +1080,7 @@ sub adjust_hops
 	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;
@@ -1013,8 +1089,11 @@ 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;
@@ -1036,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};
@@ -1055,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 {
@@ -1080,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 {
@@ -1130,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")));
 	}
 
@@ -1144,29 +1233,13 @@ 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};
 
@@ -1179,6 +1252,43 @@ 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;
+	}
 }
 
 
@@ -1213,6 +1323,12 @@ sub send_route
 	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) {
@@ -1289,8 +1405,9 @@ sub broadcast_route_nopc9x
 			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, @_);
 		}
 	}
@@ -1390,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, @_);
 }