X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=05111d40ba11e2456635fdbf14f4281782030365;hb=393e17fd3a08dd94596f1c02d4d20f6f9a44954f;hp=8903f12195fcb539107345b5bbc584ac19ae3382;hpb=23d5848190b73200389fdfc2291e3453b3b91b15;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 8903f121..05111d40 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -34,19 +34,23 @@ use Route;
 use Route::Node;
 use Script;
 use Investigate;
+use RouteDB;
+use Thingy;
+use Thingy::Dx;
+use Thingy::Rt;
+use Thingy::Ping;
+use Thingy::T;
 
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
+
+main::mkver($VERSION = q$Revision$);
 
 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
-			$investigation_int $pc19_version
+			$pingint $obscount %pc19list $chatdupeage $chatimportfn
+			$investigation_int $pc19_version $myprot_version
 			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
 			$allowzero $decode_dk0wcy $send_opernam @checklist);
 
@@ -73,7 +77,8 @@ $eph_pc34_restime = 30;
 $pingint = 5*60;
 $obscount = 2;
 $chatdupeage = 20 * 60 * 60;
-$investigation_int = 7*86400;	# time between checks to see if we can see this node
+$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
 
 @checklist = 
@@ -203,6 +208,21 @@ sub init
 {
 	do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
 	confess $@ if $@;
+
+	my $user = DXUser->get($main::mycall);
+	die "User $main::mycall not setup or disappeared RTFM" unless $user;
+	
+	$myprot_version += $main::version*100;
+	$main::me = DXProt->new($main::mycall, 0, $user); 
+	$main::me->{here} = 1;
+	$main::me->{state} = "indifferent";
+	$main::me->{sort} = 'S';    # S for spider
+	$main::me->{priv} = 9;
+	$main::me->{metric} = 0;
+	$main::me->{pingave} = 0;
+	$main::me->{registered} = 1;
+	$main::me->{version} = 5251 + $main::version;
+	$main::me->{build} = $main::build;
 }
 
 #
@@ -305,20 +325,6 @@ sub sendinit
 	$self->send(pc18());
 }
 
-sub removepc90
-{
-	$_[0] =~ s/^PC90\^[-A-Z0-9]+\^\d+\^//;
-	$_[0] =~ s/^PC91\^[-A-Z0-9]+\^\d+\^[-A-Z0-9]+\^//;
-}
-
-#sub send
-#{
-#	my $self = shift;
-#	while (@_) {
-#		my $line = shift;
-#		$self->SUPER::send($line);
-#	}
-#}
 
 #
 # This is the normal pcxx despatcher
@@ -327,9 +333,6 @@ sub normal
 {
 	my ($self, $line) = @_;
 
-	# remove any incoming PC90 frames
-	removepc90($line);
-
 	my @field = split /\^/, $line;
 	return unless @field;
 	
@@ -337,7 +340,6 @@ sub normal
 	
 #	print join(',', @field), "\n";
 						
-	
 	# process PC frames, this will fail unless the frame starts PCnn
 	my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
 	unless (defined $pcno && $pcno >= 10 && $pcno <= 99) {
@@ -352,6 +354,16 @@ sub normal
 		return;
 	}
 
+	# decrement any hop fields at this point
+	if ($line =~ /\^H(\d\d?)\^?~?$/) {
+		my $hops = $1 - 1;
+		if ($hops < 0) {
+			dbg("PCPROT: zero hop count, dumped") if isdbg('chanerr');
+			return;
+		}
+		$line =~ s/\^H\d\d?(\^?~?)$/^H$hops$1/;
+	}
+
 	my $origin = $self->{call};
 	no strict 'subs';
 	my $sub = "handle_$pcno";
@@ -415,6 +427,10 @@ sub handle_10
 		}
 	}
 
+	# remember a route to this node and also the node on which this user is
+	RouteDB::update($_[6], $origin);
+#	RouteDB::update($to, $_[6]);
+
 	# it is here and logged on
 	$dxchan = DXChannel->get($main::myalias) if $to eq $main::mycall;
 	$dxchan = DXChannel->get($to) unless $dxchan;
@@ -435,6 +451,8 @@ sub handle_10
 		return;
 	}
 
+	# can we see an interface to send it down?
+	
 	# not visible here, send a message of condolence
 	$vref = undef;
 	$ref = Route::get($from);
@@ -487,7 +505,7 @@ sub handle_11
 	}
 
 	# is it 'baddx'
-	if ($baddx->in($_[2]) || BadWords::check($_[2]) || $_[2] =~ /COCK/) {
+	if ($baddx->in($_[2]) || BadWords::check($_[2])) {
 		dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
 		return;
 	}
@@ -507,28 +525,19 @@ sub handle_11
 		}
 	}
 
-
+	# remember a route
+#	RouteDB::update($_[7], $self->{call});
+#	RouteDB::update($_[6], $_[7]);
+	
 	my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $_[6], $_[7]);
-	# global spot filtering on INPUT
-	if ($self->{inspotsfilter}) {
-		my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
-		unless ($filter) {
-			dbg("PCPROT: Rejected by input spot filter") if isdbg('chanerr');
-			return;
-		}
-	}
+
+	my $thing = Thingy::Dx->new(origin=>$main::mycall);
+	$thing->from_DXProt(DXProt=>$line,spotdata=>\@spot);
+	$thing->queue($self);
 
 	# this goes after the input filtering, but before the add
 	# so that if it is input filtered, it isn't added to the dup
 	# list. This allows it to come in from a "legitimate" source
-	if (Spot::dup($_[1], $_[2], $d, $_[5], $_[6])) {
-		dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
-		return;
-	}
-
-	# add it 
-	Spot::add(@spot);
-
 	#
 	# @spot at this point contains:-
 	# freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node
@@ -595,7 +604,7 @@ sub handle_11
 	return if $pcno == 26;
 
 	# send out the filtered spots
-	send_dx_spot($self, $line, @spot) if @spot;
+#	send_dx_spot($self, $line, @spot) if @spot;
 }
 		
 # announces
@@ -633,12 +642,17 @@ sub handle_12
 		return;
 	}
 
+
 	my $dxchan;
 	
 	if ((($dxchan = DXChannel->get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){
 		$self->send_chat($line, @_[1..6]);
 	} elsif ($_[2] eq '*' || $_[2] eq $main::mycall) {
 
+		# remember a route
+#		RouteDB::update($_[5], $self->{call});
+#		RouteDB::update($_[1], $_[5]);
+
 		# ignore something that looks like a chat line coming in with sysop
 		# flag - this is a kludge...
 		if ($_[3] =~ /^\#\d+ / && $_[4] eq '*') {
@@ -682,7 +696,7 @@ sub handle_16
 			
 	# dos I want users from this channel?
 	unless ($self->user->wantpc16) {
-		dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr');
+		dbg("PCPROT: don't send users to $origin") if isdbg('chanerr');
 		return;
 	}
 	# is it me?
@@ -691,12 +705,16 @@ sub handle_16
 		return;
 	}
 
+
+	RouteDB::update($ncall, $origin);
+
 	# do we believe this call? 
-	unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
-		if (my $ivp = Investigate::get($ncall, $self->{call})) {
+	unless ($ncall eq $origin || $self->is_believed($ncall)) {
+		if (my $ivp = Investigate::get($ncall, $origin)) {
 			$ivp->store_pcxx($pcno,$line,$origin,@_);
+		} else {
+			dbg("PCPROT: We don't believe $ncall on $origin") if isdbg('chanerr');
 		}
-		dbg("PCPROT: We don't believe $ncall on $self->{call}");
 		return;
 	}
 
@@ -709,116 +727,39 @@ sub handle_16
 
 	# if there is a parent, proceed, otherwise if there is a latent PC19 in the PC19list, 
 	# fix it up in the routing tables and issue it forth before the PC16
-	unless ($parent) {
-		my $nl = $pc19list{$ncall};
-
-		if ($nl && @_ > 3) { # 3 because of the hop count!
-
-			# this is a new (remembered) node, now attach it to me if it isn't in filtered
-			# and we haven't disallowed it
-			my $user = DXUser->get_current($ncall);
-			if (!$user) {
-				$user = DXUser->new($ncall);
-				$user->sort('A');
-				$user->priv(1);	# I have relented and defaulted nodes
-				$user->lockout(1);
-				$user->homenode($ncall);
-				$user->node($ncall);
-			}
+	if ($parent) {
 
-			my $wantpc19 = $user->wantroutepc19;
-			if ($wantpc19 || !defined $wantpc19) {
-				my $new = Route->new($ncall); # throw away
-				if ($self->in_filter_route($new)) {
-					my @nrout;
-					for (@$nl) {
-						$parent = Route::Node::get($_->[0]);
-						$dxchan = $parent->dxchan if $parent;
-						if ($dxchan && $dxchan ne $self) {
-							dbg("PCPROT: PC19 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
-							$parent = undef;
-						}
-						if ($parent) {
-							my $r = $parent->add($ncall, $_->[1], $_->[2]);
-							push @nrout, $r unless @nrout;
-						}
-					}
-					$user->wantroutepc19(1) unless defined $wantpc19; # for now we work on the basis that pc16 = real route 
-					$user->lastin($main::systime) unless DXChannel->get($ncall);
-					$user->put;
-						
-					# route the pc19 - this will cause 'stuttering PC19s' for a while
-					$self->route_pc19($origin, $line, @nrout) if @nrout ;
-					$parent = Route::Node::get($ncall);
-					unless ($parent) {
-						dbg("PCPROT: lost $ncall after sending PC19 for it?");
-						return;
-					}
-				} else {
-					return;
-				}
-				delete $pc19list{$ncall};
-			}
-		} else {
-			dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
-			return;
-		}
-	} else {
-				
 		$dxchan = $parent->dxchan;
 		if ($dxchan && $dxchan ne $self) {
-			dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+			dbg("PCPROT: PC16 from $origin trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
 			return;
 		}
 
-		# input filter if required
-		return unless $self->in_filter_route($parent);
-	}
-
-	my $i;
-	my @rout;
-	for ($i = 2; $i < $#_; $i++) {
-		my ($call, $conf, $here) = $_[$i] =~ /^(\S+) (\S) (\d)/o;
-		next unless $call && $conf && defined $here && is_callsign($call);
-		next if $call eq $main::mycall;
-
-		eph_del_regex("^PC17\\^$call\\^$ncall");
+		
+		my $i;
+		my $rout;
+		for ($i = 2; $i < $#_; $i++) {
+			my ($call, $conf, $here) = $_[$i] =~ /^(\S+) (\S) (\d)/o;
+			next unless $call && $conf && defined $here && is_callsign($call);
+			next if $call eq $main::mycall;
+			
+			eph_del_regex("^PC17\\^$call\\^$ncall");
 				
-		$conf = $conf eq '*';
-
-		# reject this if we think it is a node already
-		my $r = Route::Node::get($call);
-		my $u = DXUser->get_current($call) unless $r;
-		if ($r || ($u && $u->is_node)) {
-			dbg("PCPROT: $call is a node") if isdbg('chanerr');
-			next;
+			my $flags = $here ? 1 : 0;
+			$rout .= ":U$flags$call";
 		}
-				
-		$r = Route::User::get($call);
-		my $flags = Route::here($here)|Route::conf($conf);
-				
-		if ($r) {
-			my $au = $r->addparent($parent);					
-			if ($r->flags != $flags) {
-				$r->flags($flags);
-				$au = $r;
-			}
-			push @rout, $r if $au;
+		
+
+		if ($rout) {
+			my $thing = Thingy::Rt->new(origin=>$main::mycall, user=>$self->{call});
+			$thing->from_DXProt(t=>'eau', d=>"N1$ncall$rout", DXProt=>$line);
+			$thing->queue($self);
 		} else {
-			push @rout, $parent->add_user($call, $flags);
+			dbg("PCPROT: No usable users") if isdbg('chanerr');
 		}
-		
-				
-		# add this station to the user database, if required
-		$call =~ s/-\d+$//o;	# remove ssid for users
-		my $user = DXUser->get_current($call);
-		$user = DXUser->new($call) if !$user;
-		$user->homenode($parent->call) if !$user->homenode;
-		$user->node($parent->call);
-		$user->lastin($main::systime) unless DXChannel->get($call);
-		$user->put;
+	} else {
+		dbg("PCPROT: no PC19 seen for $ncall" ) if isdbg('chanerr');
 	}
-	$self->route_pc16($origin, $line, $parent, @rout) if @rout;
 }
 		
 # remove a user
@@ -836,7 +777,7 @@ sub handle_17
 			
 	# do I want users from this channel?
 	unless ($self->user->wantpc16) {
-		dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr');
+		dbg("PCPROT: don't send users to $origin") if isdbg('chanerr');
 		return;
 	}
 	if ($ncall eq $main::mycall) {
@@ -844,12 +785,15 @@ sub handle_17
 		return;
 	}
 
+	RouteDB::delete($ncall, $origin);
+
 	# do we believe this call? 
-	unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
-		if (my $ivp = Investigate::get($ncall, $self->{call})) {
+	unless ($ncall eq $origin || $self->is_believed($ncall)) {
+		if (my $ivp = Investigate::get($ncall, $origin)) {
 			$ivp->store_pcxx($pcno,$line,$origin,@_);
+		} else {
+			dbg("PCPROT: We don't believe $ncall on $origin") if isdbg('chanerr');
 		}
-		dbg("PCPROT: We don't believe $ncall on $self->{call}");
 		return;
 	}
 
@@ -864,25 +808,19 @@ sub handle_17
 
 	$dxchan = $parent->dxchan if $parent;
 	if ($dxchan && $dxchan ne $self) {
-		dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+		dbg("PCPROT: PC17 from $origin trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
 		return;
 	}
 
-	# input filter if required and then remove user if present
-	if ($parent) {
-#		return unless $self->in_filter_route($parent);	
-		$parent->del_user($uref) if $uref;
-	} else {
-		$parent = Route->new($ncall);  # throw away
-	}
-
 	if (eph_dup($line)) {
 		dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
 		return;
 	}
 
 	$uref = Route->new($ucall) unless $uref; # throw away
-	$self->route_pc17($origin, $line, $parent, $uref);
+	my $thing = Thingy::Rt->new(origin=>$main::mycall, user=>$self->{call});
+	$thing->from_DXProt(t=>'edu', d=>"N1$ncall:U1$ucall", DXProt=>$line);
+	$thing->queue($self);
 }
 		
 # link request
@@ -896,8 +834,8 @@ sub handle_18
 
 	# record the type and version offered
 	if ($_[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+\.\d+)/) {
-		$self->version(53 + $1);
-		$self->user->version(53 + $1);
+		$self->version(52.51 + $1);
+		$self->user->version(52.51 + $1);
 		$self->build(0 + $2);
 		$self->user->build(0 + $2);
 		unless ($self->is_spider) {
@@ -912,7 +850,7 @@ sub handle_18
 	}
 
 	# first clear out any nodes on this dxchannel
-	my $parent = Route::Node::get($self->{call});
+	my $parent = Route::Node::get($origin);
 	my @rout = $parent->del_nodes;
 	$self->route_pc21($origin, $line, @rout, $parent) if @rout;
 	$self->send_local_config();
@@ -934,9 +872,9 @@ sub handle_19
 	my @rout;
 
 	# first get the INTERFACE node
-	my $parent = Route::Node::get($self->{call});
+	my $parent = Route::Node::get($origin);
 	unless ($parent) {
-		dbg("DXPROT: my parent $self->{call} has disappeared");
+		dbg("DXPROT: my parent $origin has disappeared");
 		$self->disconnect;
 		return;
 	}
@@ -949,13 +887,13 @@ sub handle_19
 			my $user = DXUser->get_current($origin);
 			if (!$user) {
 				$user = DXUser->new($origin);
-				$user->sort('S');
 				$user->priv(1);		# I have relented and defaulted nodes
 				$user->lockout(1);
 				$user->homenode($origin);
 				$user->node($origin);
 				$user->wantroutepc19(1);
 			}
+			$user->sort('A') unless $user->is_node;
 			$user->put;
 		}
 		$parent = $op;
@@ -980,7 +918,7 @@ sub handle_19
 		# check that this PC19 isn't trying to alter the wrong dxchan
 		my $dxchan = DXChannel->get($call);
 		if ($dxchan && $dxchan != $self) {
-			dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
+			dbg("PCPROT: PC19 from $origin trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr');
 			next;
 		}
 
@@ -988,25 +926,28 @@ sub handle_19
 		my $user = DXUser->get_current($call);
 		if (!$user) {
 			$user = DXUser->new($call);
-			$user->sort('A');
 			$user->priv(1);		# I have relented and defaulted nodes
 			$user->lockout(1);
 			$user->homenode($call);
 			$user->node($call);
 		}
+		$user->sort('A') unless $user->is_node;
+
+		RouteDB::update($call, $origin);
 
 		# do we believe this call?
 		my $genline = "PC19^$here^$call^$conf^$ver^$_[-1]^"; 
-		unless ($call eq $self->{call} || $self->is_believed($call)) {
-			my $pt = $user->lastping($self->{call}) || 0;
-			if ($pt+$investigation_int < $main::systime && !Investigate::get($call, $self->{call})) {
-				my $ivp  = Investigate->new($call, $self->{call});
+		unless ($call eq $origin || $self->is_believed($call)) {
+			my $pt = $user->lastping($origin) || 0;
+			if ($pt+$investigation_int < $main::systime && !Investigate::get($call, $origin)) {
+				my $ivp  = Investigate->new($call, $origin);
 				$ivp->version($ver);
 				$ivp->here($here);
 				$ivp->store_pcxx($pcno,$genline,$origin,'PC19',$here,$call,$conf,$ver,$_[-1]);
 			} else {
-				dbg("PCPROT: We don't believe $call on $self->{call}");
+				dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr');
 			}
+			$user->put;
 			next;
 		}
 
@@ -1037,7 +978,7 @@ sub handle_19
 		} else {
 
 			# if he is directly connected or allowed then add him, otherwise store him up for later
-			if ($call eq $self->{call} || $user->wantroutepc19) {
+			if ($call eq $origin || $user->wantroutepc19) {
 				my $new = Route->new($call); # throw away
 				if ($self->in_filter_route($new)) {
 					my $ar = $parent->add($call, $ver, $flags);
@@ -1049,7 +990,7 @@ sub handle_19
 			} else {
 				$pc19list{$call} = [] unless exists $pc19list{$call};
 				my $nl = $pc19list{$call};
-				push @{$pc19list{$call}}, [$self->{call}, $ver, $flags] unless grep $_->[0] eq $self->{call}, @$nl;
+				push @{$pc19list{$call}}, [$origin, $ver, $flags] unless grep $_->[0] eq $origin, @$nl;
 			}
 		}
 
@@ -1096,12 +1037,15 @@ sub handle_21
 		return;
 	}
 
+	RouteDB::delete($call, $origin);
+
 	# check if we believe this
-	unless ($call eq $self->{call} || $self->is_believed($call)) {
-		if (my $ivp = Investigate::get($call, $self->{call})) {
+	unless ($call eq $origin || $self->is_believed($call)) {
+		if (my $ivp = Investigate::get($call, $origin)) {
 			$ivp->store_pcxx($pcno,$line,$origin,@_);
+		} else {
+			dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr');
 		}
-		dbg("PCPROT: We don't believe $call on $self->{call}");
 		return;
 	}
 
@@ -1109,13 +1053,13 @@ sub handle_21
 	# this routing table manipulation, just remove it from the list and dump it
 	my @rout;
 	if (my $nl = $pc19list{$call}) {
-		$pc19list{$call} = [ grep {$_->[0] ne $self->{call}} @$nl ];
+		$pc19list{$call} = [ grep {$_->[0] ne $origin} @$nl ];
 		delete $pc19list{$call} unless @{$pc19list{$call}};
 	} else {
 				
-		my $parent = Route::Node::get($self->{call});
+		my $parent = Route::Node::get($origin);
 		unless ($parent) {
-			dbg("DXPROT: my parent $self->{call} has disappeared");
+			dbg("DXPROT: my parent $origin has disappeared");
 			$self->disconnect;
 			return;
 		}
@@ -1125,7 +1069,7 @@ sub handle_21
 						
 				my $dxchan = DXChannel->get($call);
 				if ($dxchan && $dxchan != $self) {
-					dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr');
+					dbg("PCPROT: PC21 from $origin trying to alter locally connected $call, ignored!") if isdbg('chanerr');
 					return;
 				}
 						
@@ -1355,7 +1299,7 @@ sub handle_39
 	my $pcno = shift;
 	my $line = shift;
 	my $origin = shift;
-	if ($_[1] eq $self->{call}) {
+	if ($_[1] eq $origin) {
 		$self->disconnect(1);
 	} else {
 		dbg("PCPROT: came in on wrong channel") if isdbg('chanerr');
@@ -1470,9 +1414,12 @@ sub handle_50
 	my $origin = shift;
 
 	my $call = $_[1];
+
+	RouteDB::update($call, $origin);
+
 	my $node = Route::Node::get($call);
 	if ($node) {
-		return unless $node->call eq $self->{call};
+		return unless $node->call eq $origin;
 		$node->usercount($_[2]);
 
 		# input filter if required
@@ -1530,11 +1477,11 @@ sub handle_51
 								$tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
 							}
 							$tochan->{nopings} = $nopings; # pump up the timer
-							if (my $ivp = Investigate::get($from, $self->{call})) {
+							if (my $ivp = Investigate::get($from, $origin)) {
 								$ivp->handle_ping;
 							}
 						} elsif (my $rref = Route::Node::get($r->{call})) {
-							if (my $ivp = Investigate::get($from, $self->{call})) {
+							if (my $ivp = Investigate::get($from, $origin)) {
 								$ivp->handle_ping;
 							}
 						}
@@ -1543,6 +1490,9 @@ sub handle_51
 			}
 		}
 	} else {
+
+		RouteDB::update($from, $origin);
+
 		if (eph_dup($line)) {
 			dbg("PCPROT: dup PC51 detected") if isdbg('chanerr');
 			return;
@@ -1687,6 +1637,8 @@ sub process
 		# clean out ephemera 
 
 		eph_clean();
+		import_chat();
+		
 
 		$last10 = $t;
 	}
@@ -1705,36 +1657,6 @@ sub process
 #
 
 
-sub send_dx_spot
-{
-	my $self = shift;
-	my $line = shift;
-	my @dxchan = DXChannel->get_all();
-	my $dxchan;
-	
-	# send it if it isn't the except list and isn't isolated and still has a hop count
-	# taking into account filtering and so on
-	foreach $dxchan (@dxchan) {
-		next if $dxchan == $main::me;
-		next if $dxchan == $self && $self->is_node;
-		$dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call});
-	}
-}
-
-sub dx_spot
-{
-	my $self = shift;
-	my $line = shift;
-	my $isolate = shift;
-	my ($filter, $hops);
-
-	if ($self->{spotsfilter}) {
-		($filter, $hops) = $self->{spotsfilter}->it(@_);
-		return unless $filter;
-	}
-	send_prot_line($self, $filter, $hops, $isolate, $line);
-}
-
 sub send_prot_line
 {
 	my ($self, $filter, $hops, $isolate, $line) = @_;
@@ -2022,6 +1944,7 @@ sub send_local_config
 #
 # is called route(to, pcline);
 #
+
 sub route
 {
 	my ($self, $call, $line) = @_;
@@ -2033,7 +1956,9 @@ sub route
 
 	# always send it down the local interface if available
 	my $dxchan = DXChannel->get($call);
-	unless ($dxchan) {
+	if ($dxchan) {
+		dbg("route: $call -> $dxchan->{call} direct" ) if isdbg('route');
+	} else {
 		my $cl = Route::get($call);
 		$dxchan = $cl->dxchan if $cl;
 		if (ref $dxchan) {
@@ -2041,8 +1966,23 @@ sub route
 				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
 				return;
 			}
+			dbg("route: $call -> $dxchan->{call} using normal route" ) if isdbg('route');
 		}
 	}
+
+	# try the backstop method
+	unless ($dxchan) {
+		my $rcall = RouteDB::get($call);
+		if ($rcall) {
+			if ($self && $rcall eq $self->{call}) {
+				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
+				return;
+			}
+			$dxchan = DXChannel->get($rcall);
+			dbg("route: $call -> $rcall using RouteDB" ) if isdbg('route') && $dxchan;
+		}
+	}
+
 	if ($dxchan) {
 		my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
 		if ($routeit) {
@@ -2090,7 +2030,7 @@ sub adjust_hops
 			$s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
 		} else {
 			# simply decrement it
-			$hops--;
+#			$hops--;               this is done on receipt now
 			return "" if !$hops;
 			$s =~ s/\^H(\d+)(\^~?)$/\^H$hops$2/ if $hops;
 		}
@@ -2255,6 +2195,8 @@ sub disconnect
 			eph_del_regex("^PC1[679].*$c");
 		}
 	}
+
+	RouteDB::delete_interface($call);
 	
 	# remove them from the pc19list as well
 	while (my ($k,$v) = each %pc19list) {
@@ -2454,7 +2396,7 @@ sub eph_dup
 	$s =~ s/\^H\d\d?\^?\~?$//;
 	$r = 1 if exists $eph{$s};    # pump up the dup if it keeps circulating
 	$eph{$s} = $main::systime + $t;
-	dbg("PCPROT: emphemeral duplicate") if $r && isdbg('chan'); 
+	dbg("PCPROT: emphemeral duplicate") if $r && isdbg('chanerr'); 
 	return $r;
 }
 
@@ -2495,5 +2437,69 @@ sub run_cmd
 {
 	goto &DXCommandmode::run_cmd;
 }
+
+
+# import any msgs in the chat directory
+# the messages are sent to the chat group which forms the
+# the first part of the name (eg: solar.1243.txt would be
+# sent to chat group SOLAR)
+# 
+# Each message found is sent: one non-blank line to one chat
+# message. So 4 lines = 4 chat messages.
+# 
+# The special name LOCAL is for local users ANN
+# The special name ALL is for ANN/FULL
+# The special name SYSOP is for ANN/SYSOP
+#
+sub import_chat
+{
+	# are there any to do in this directory?
+	return unless -d $chatimportfn;
+	unless (opendir(DIR, $chatimportfn)) {
+		dbg("can\'t open $chatimportfn $!") if isdbg('msg');
+		Log('msg', "can\'t open $chatimportfn $!");
+		return;
+	} 
+
+	my @names = readdir(DIR);
+	closedir(DIR);
+	my $name;
+	foreach $name (@names) {
+		next if $name =~ /^\./;
+		my $splitit = $name =~ /^split/;
+		my $fn = "$chatimportfn/$name";
+		next unless -f $fn;
+		unless (open(MSG, $fn)) {
+	 		dbg("can\'t open import file $fn $!") if isdbg('msg');
+			Log('msg', "can\'t open import file $fn $!");
+			unlink($fn);
+			next;
+		}
+		my @msg = map { s/\r?\n$//; $_ } <MSG>;
+		close(MSG);
+		unlink($fn);
+
+		my @cat = split /\./, $name;
+		my $target = uc $cat[0];
+
+		foreach my $text (@msg) {
+			next unless $text && $text !~ /^\s*#/;
+			if ($target eq 'ALL' || $target eq 'LOCAL' || $target eq 'SYSOP') {
+				my $sysopflag = $target eq 'SYSOP' ? '*' : ' ';
+				if ($target ne 'LOCAL') {
+					send_announce($main::me, pc12($main::mycall, $text, '*', $sysopflag), $main::mycall, '*', $text, $sysopflag, $main::mycall, '0');
+				} else {
+					Log('ann', 'LOCAL', $main::mycall, $text);
+					DXChannel::broadcast_list("To LOCAL de ${main::mycall}: $text\a", 'ann', undef, DXCommandmode->get_all());
+				}
+			} else {
+				my $msgid = nextchatmsgid();
+				$text = "#$msgid $text";
+				send_chat($main::me, pc12($main::mycall, $text, '*', $target), $main::mycall, '*', $text, $target, $main::mycall, '0');
+			}
+		}
+	}
+}
+
 1;
 __END__