X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=8e8dfea73c49b817d56328031cbbdfbc5938efa7;hb=3909c2de5f181bb15cad7b225697f87a6df5731a;hp=c96d787e41ba3f27010ef46b385d72765a84e2df;hpb=47158622c85b4b2ee92f60027e7ef6e1f83b0301;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index c96d787e..8e8dfea7 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -35,20 +35,24 @@ use Route::Node;
 use Script;
 use Investigate;
 use RouteDB;
-
+use Thingy;
+use Thingy::Dx;
+use Thingy::Rt;
+use Thingy::Ping;
+use Thingy::T;
+use Thingy::Hello;
+use Thingy::Bye;
 
 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);
 
@@ -75,6 +79,7 @@ $eph_pc34_restime = 30;
 $pingint = 5*60;
 $obscount = 2;
 $chatdupeage = 20 * 60 * 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
 
@@ -205,6 +210,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;
+	
+	$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} = $myprot_version + int ($main::version * 100);
+	$main::me->{build} = $main::build;
+	$main::me->{lastcf} = $main::me->{lasthello} = time;
 }
 
 #
@@ -218,8 +238,7 @@ sub new
 	# add this node to the table, the values get filled in later
 	my $pkg = shift;
 	my $call = shift;
-	$main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
-
+	$main::routeroot->add($call, '5000', 1) if $call ne $main::mycall;
 	return $self;
 }
 
@@ -289,6 +308,11 @@ sub start
 	$self->state('init');
 	$self->{pc50_t} = $main::systime;
 
+	# ALWAYS output the hello
+	my $thing = Thingy::Hello->new(user => $call, h => $self->{here});
+	$thing->broadcast($self);
+	$self->lasthello($main::systime);
+	
 	# send info to all logged in thingies
 	$self->tell_login('loginn');
 
@@ -307,20 +331,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
@@ -329,9 +339,6 @@ sub normal
 {
 	my ($self, $line) = @_;
 
-	# remove any incoming PC90 frames
-	removepc90($line);
-
 	my @field = split /\^/, $line;
 	return unless @field;
 	
@@ -339,7 +346,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) {
@@ -354,6 +360,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";
@@ -418,12 +434,12 @@ sub handle_10
 	}
 
 	# remember a route to this node and also the node on which this user is
-	RouteDB::update($_[6], $self->{call});
+	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;
+	$dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall;
+	$dxchan = DXChannel::get($to) unless $dxchan;
 	if ($dxchan && $dxchan->is_user) {
 		$_[3] =~ s/\%5E/^/g;
 		$dxchan->talk($from, $to, $via, $_[3]);
@@ -495,7 +511,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;
 	}
@@ -520,26 +536,14 @@ sub handle_11
 #	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->process($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
@@ -593,20 +597,6 @@ sub handle_11
 			}
 		}
 	}
-				
-	# local processing 
-	my $r;
-	eval {
-		$r = Local::spot($self, @spot);
-	};
-	#			dbg("Local::spot1 error $@") if isdbg('local') if $@;
-	return if $r;
-
-	# DON'T be silly and send on PC26s!
-	return if $pcno == 26;
-
-	# send out the filtered spots
-	send_dx_spot($self, $line, @spot) if @spot;
 }
 		
 # announces
@@ -647,7 +637,7 @@ sub handle_12
 
 	my $dxchan;
 	
-	if ((($dxchan = DXChannel->get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){
+	if ((($dxchan = DXChannel::get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){
 		$self->send_chat($line, @_[1..6]);
 	} elsif ($_[2] eq '*' || $_[2] eq $main::mycall) {
 
@@ -698,7 +688,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?
@@ -710,14 +700,14 @@ sub handle_16
 	RouteDB::update($ncall, $self->{call});
 
 	# do we believe this call? 
-	unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
-		if (my $ivp = Investigate::get($ncall, $self->{call})) {
-			$ivp->store_pcxx($pcno,$line,$origin,@_);
-		} else {
-			dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
-		}
-		return;
-	}
+#	unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
+#		if (my $ivp = Investigate::get($ncall, $self->{call})) {
+#			$ivp->store_pcxx($pcno,$line,$origin,@_);
+#		} else {
+#			dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
+#		}
+#		return;
+#	}
 
 	if (eph_dup($line)) {
 		dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
@@ -729,61 +719,6 @@ 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);
-			}
-
-			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');
@@ -792,19 +727,28 @@ sub handle_16
 
 		# input filter if required
 		return unless $self->in_filter_route($parent);
+	} else {
+		dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
+		return;
 	}
 
+	# is he under the control of the new protocol?
+	if ($parent && $parent->np) {
+		dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr');
+		return;
+	}
+		
 	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;
@@ -812,10 +756,10 @@ sub handle_16
 			dbg("PCPROT: $call is a node") if isdbg('chanerr');
 			next;
 		}
-				
+		
 		$r = Route::User::get($call);
-		my $flags = Route::here($here)|Route::conf($conf);
-				
+		my $flags = $here;
+		
 		if ($r) {
 			my $au = $r->addparent($parent);					
 			if ($r->flags != $flags) {
@@ -827,17 +771,17 @@ sub handle_16
 			push @rout, $parent->add_user($call, $flags);
 		}
 		
-				
+		
 		# 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->lastin($main::systime) unless DXChannel::get($call);
 		$user->put;
 	}
-	$self->route_pc16($origin, $line, $parent, @rout) if @rout;
+	$self->route_pc16($origin, $line, $parent, @rout) if @rout && (DXChannel::get($parent->call) || $parent->np);
 }
 		
 # remove a user
@@ -866,14 +810,14 @@ sub handle_17
 	RouteDB::delete($ncall, $self->{call});
 
 	# do we believe this call? 
-	unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
-		if (my $ivp = Investigate::get($ncall, $self->{call})) {
-			$ivp->store_pcxx($pcno,$line,$origin,@_);
-		} else {
-			dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
-		}
-		return;
-	}
+#	unless ($ncall eq $self->{call} || $self->is_believed($ncall)) {
+#		if (my $ivp = Investigate::get($ncall, $self->{call})) {
+#			$ivp->store_pcxx($pcno,$line,$origin,@_);
+#		} else {
+#			dbg("PCPROT: We don't believe $ncall on $self->{call}") if isdbg('chanerr');
+#		}
+#		return;
+#	}
 
 	my $uref = Route::User::get($ucall);
 	unless ($uref) {
@@ -890,6 +834,12 @@ sub handle_17
 		return;
 	}
 
+	# is he under the control of the new protocol?
+	if ($parent && $parent->np) {
+		dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr');
+		return;
+	}
+
 	# input filter if required and then remove user if present
 	if ($parent) {
 #		return unless $self->in_filter_route($parent);	
@@ -904,7 +854,7 @@ sub handle_17
 	}
 
 	$uref = Route->new($ucall) unless $uref; # throw away
-	$self->route_pc17($origin, $line, $parent, $uref);
+	$self->route_pc17($origin, $line, $parent, $uref) if (DXChannel::get($parent->call) || ($parent->isa('Route::Node') && $parent->np));
 }
 		
 # link request
@@ -918,8 +868,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(0 + $1);
+		$self->user->version(0 + $1);
 		$self->build(0 + $2);
 		$self->user->build(0 + $2);
 		unless ($self->is_spider) {
@@ -934,7 +884,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();
@@ -956,9 +906,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;
 	}
@@ -967,7 +917,7 @@ sub handle_19
 	if ($origin ne $self->call) {
 		my $op = Route::Node::get($origin);
 		unless ($op) {
-			$op = $parent->add($origin, 5000, Route::here(1));
+			$op = $parent->add($origin, 5000, 1);
 			my $user = DXUser->get_current($origin);
 			if (!$user) {
 				$user = DXUser->new($origin);
@@ -1000,9 +950,9 @@ sub handle_19
 		next if $call eq $main::mycall;
 
 		# check that this PC19 isn't trying to alter the wrong dxchan
-		my $dxchan = DXChannel->get($call);
+		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;
 		}
 
@@ -1017,23 +967,23 @@ sub handle_19
 		}
 		$user->sort('A') unless $user->is_node;
 
-		RouteDB::update($call, $self->{call});
+		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});
-				$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}") if isdbg('chanerr');
-			}
-			$user->put;
-			next;
-		}
+#		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 $origin") if isdbg('chanerr');
+#			}
+#			$user->put;
+#			next;
+#		}
 
 		if (eph_dup($genline)) {
 			dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr');
@@ -1041,8 +991,13 @@ sub handle_19
 		}
 
 		my $r = Route::Node::get($call);
-		my $flags = Route::here($here)|Route::conf($conf);
+		my $flags = $here;
 
+		# is he under the control of the new protocol?
+		if ($r && $r->np) {
+			dbg("PCPROT: $call aranea node, ignored") if isdbg('chanerr');
+			next;
+		}
 		# modify the routing table if it is in it, otherwise store it in the pc19list for now
 		if ($r) {
 			my $ar;
@@ -1054,15 +1009,10 @@ sub handle_19
 					next;
 				}
 			}
-			if ($r->version ne $ver || $r->flags != $flags) {
-				$r->version($ver);
-				$r->flags($flags);
-				push @rout, $r unless $ar;
-			}
 		} 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);
@@ -1071,10 +1021,6 @@ sub handle_19
 				} else {
 					next;
 				}
-			} 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;
 			}
 		}
 
@@ -1082,11 +1028,12 @@ sub handle_19
 		my $mref = DXMsg::get_busy($call);
 		$mref->stop_msg($call) if $mref;
 				
-		$user->lastin($main::systime) unless DXChannel->get($call);
+		$user->lastin($main::systime) unless DXChannel::get($call);
 		$user->put;
 	}
 
-
+	# we only output information that we regard as reliable
+	@rout = grep {$_ && (DXChannel::get($_->{call}) || $_->np) } @rout;
 	$self->route_pc19($origin, $line, @rout) if @rout;
 }
 		
@@ -1101,6 +1048,11 @@ sub handle_20
 	$self->send(pc22());
 	$self->state('normal');
 	$self->{lastping} = 0;
+	my $thing = Thingy::Rt->new(user=>$self->{call});
+	my $nref = Route::Node::get($self->{call});
+	$thing->copy_pc16_data($nref);
+	$thing->broadcast($self);
+	$self->lastcf($main::systime);
 }
 		
 # delete a cluster from the list
@@ -1121,54 +1073,56 @@ sub handle_21
 		return;
 	}
 
-	RouteDB::delete($call, $self->{call});
+	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})) {
-			$ivp->store_pcxx($pcno,$line,$origin,@_);
-		} else {
-			dbg("PCPROT: We don't believe $call on $self->{call}") if isdbg('chanerr');
-		}
-		return;
-	}
+#	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');
+#		}
+#		return;
+#	}
 
 	# check to see if we are in the pc19list, if we are then don't bother with any of
 	# 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 ];
-		delete $pc19list{$call} unless @{$pc19list{$call}};
-	} else {
-				
-		my $parent = Route::Node::get($self->{call});
-		unless ($parent) {
-			dbg("DXPROT: my parent $self->{call} has disappeared");
-			$self->disconnect;
-			return;
-		}
-		if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
-			my $node = Route::Node::get($call);
-			if ($node) {
-						
-				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');
-					return;
-				}
-						
-				# input filter it
-				return unless $self->in_filter_route($node);
-						
-				# routing objects
-				push @rout, $node->del($parent);
+
+	my $parent = Route::Node::get($origin);
+	unless ($parent) {
+		dbg("DXPROT: my parent $origin has disappeared");
+		$self->disconnect;
+		return;
+	}
+	if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
+		my $node = Route::Node::get($call);
+		if ($node) {
+			
+			my $dxchan = DXChannel::get($call);
+			if ($dxchan && $dxchan != $self) {
+				dbg("PCPROT: PC21 from $origin trying to alter locally connected $call, ignored!") if isdbg('chanerr');
+				return;
 			}
-		} else {
-			dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr');
-			return;
+			
+			# input filter it
+			return unless $self->in_filter_route($node);
+			
+			# is he under the control of the new protocol?
+			if ($node->np) {
+				dbg("PCPROT: $call aranea node, ignored") if isdbg('chanerr');
+				return;
+			}
+			
+			# routing objects
+			push @rout, $node->del($parent);
 		}
+	} else {
+		dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr');
+		return;
 	}
 
+	@rout = grep {$_ && (DXChannel::get($_->{call}) || $_->np) } @rout;
 	$self->route_pc21($origin, $line, @rout) if @rout;
 }
 		
@@ -1181,6 +1135,11 @@ sub handle_22
 	my $origin = shift;
 	$self->state('normal');
 	$self->{lastping} = 0;
+	my $thing = Thingy::Rt->new(user=>$self->{call});
+	my $nref = Route::Node::get($self->{call});
+	$thing->copy_pc16_data($nref);
+	$thing->broadcast($self);
+	$self->lastcf($main::systime);
 }
 				
 # WWV info
@@ -1383,7 +1342,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');
@@ -1499,11 +1458,11 @@ sub handle_50
 
 	my $call = $_[1];
 
-	RouteDB::update($call, $self->{call});
+	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
@@ -1520,70 +1479,15 @@ sub handle_51
 	my $pcno = shift;
 	my $line = shift;
 	my $origin = shift;
-	my $to = $_[1];
-	my $from = $_[2];
-	my $flag = $_[3];
 
-			
-	# is it for us?
-	if ($to eq $main::mycall) {
-		if ($flag == 1) {
-			$self->send(pc51($from, $to, '0'));
-		} else {
-			# it's a reply, look in the ping list for this one
-			my $ref = $pings{$from};
-			if ($ref) {
-				my $tochan =  DXChannel->get($from);
-				while (@$ref) {
-					my $r = shift @$ref;
-					my $dxchan = DXChannel->get($r->{call});
-					next unless $dxchan;
-					my $t = tv_interval($r->{t}, [ gettimeofday ]);
-					if ($dxchan->is_user) {
-						my $s = sprintf "%.2f", $t; 
-						my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
-						$dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
-					} elsif ($dxchan->is_node) {
-						if ($tochan) {
-							my $nopings = $tochan->user->nopings || $obscount;
-							push @{$tochan->{pingtime}}, $t;
-							shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
-							
-							# cope with a missed ping, this means you must set the pingint large enough
-							if ($t > $tochan->{pingint}  && $t < 2 * $tochan->{pingint} ) {
-								$t -= $tochan->{pingint};
-							}
-							
-							# calc smoothed RTT a la TCP
-							if (@{$tochan->{pingtime}} == 1) {
-								$tochan->{pingave} = $t;
-							} else {
-								$tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
-							}
-							$tochan->{nopings} = $nopings; # pump up the timer
-							if (my $ivp = Investigate::get($from, $self->{call})) {
-								$ivp->handle_ping;
-							}
-						} elsif (my $rref = Route::Node::get($r->{call})) {
-							if (my $ivp = Investigate::get($from, $self->{call})) {
-								$ivp->handle_ping;
-							}
-						}
-					}
-				}
-			}
-		}
-	} else {
-
-		RouteDB::update($from, $self->{call});
-
-		if (eph_dup($line)) {
-			dbg("PCPROT: dup PC51 detected") if isdbg('chanerr');
-			return;
-		}
-		# route down an appropriate thingy
-		$self->route($to, $line);
+	if (eph_dup($line, 60)) {
+		dbg("PCPROT: dup PC51 detected") if isdbg('chanerr');
+		return;
 	}
+
+	my $thing = Thingy::Ping->new(origin=>$main::mycall);
+	$thing->from_DXProt($self, $line, @_);
+	$thing->handle($self);
 }
 
 # dunno but route it
@@ -1684,7 +1588,7 @@ sub handle_default
 sub process
 {
 	my $t = time;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my $pc50s;
 	
@@ -1714,13 +1618,15 @@ sub process
 		}
 	}
 
-	Investigate::process();
+#	Investigate::process();
 
 	# every ten seconds
 	if ($t - $last10 >= 10) {	
 		# clean out ephemera 
 
 		eph_clean();
+		import_chat();
+		
 
 		$last10 = $t;
 	}
@@ -1739,36 +1645,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) = @_;
@@ -1794,7 +1670,7 @@ sub send_wwv_spot
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my @dxcc = ((Prefix::cty_data($_[6]))[0..2], (Prefix::cty_data($_[7]))[0..2]);
 
@@ -1828,7 +1704,7 @@ sub send_wcy_spot
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my @dxcc = ((Prefix::cty_data($_[10]))[0..2], (Prefix::cty_data($_[11]))[0..2]);
 	
@@ -1861,7 +1737,7 @@ sub send_announce
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my $target;
 	my $to = 'To ';
@@ -1926,7 +1802,7 @@ sub send_chat
 {
 	my $self = shift;
 	my $line = shift;
-	my @dxchan = DXChannel->get_all();
+	my @dxchan = DXChannel::get_all();
 	my $dxchan;
 	my $target = $_[3];
 	my $text = unpad($_[2]);
@@ -2022,7 +1898,7 @@ sub send_local_config
         # don't appear outside of this node
 
 		# send locally connected nodes
-		my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
+		my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && ($_->is_node || $_->is_aranea) } DXChannel::get_all();
 		@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
 		$self->send_route($main::mycall, \&pc19, scalar(@localnodes)+1, $main::routeroot, @localnodes);
 
@@ -2037,6 +1913,7 @@ sub send_local_config
 		for $node (@intcalls) {
 			push @remotenodes, Route::Node::get($node) unless grep $node eq $_, @rnodes, @remotenodes;
 		}
+		@remotenodes = grep {$_ && (DXChannel::get($_->{call}) || $_->np) } @remotenodes;
 		$self->send_route($main::mycall, \&pc19, scalar(@remotenodes), @remotenodes);
 	}
 	
@@ -2067,7 +1944,7 @@ sub route
 	}
 
 	# always send it down the local interface if available
-	my $dxchan = DXChannel->get($call);
+	my $dxchan = DXChannel::get($call);
 	if ($dxchan) {
 		dbg("route: $call -> $dxchan->{call} direct" ) if isdbg('route');
 	} else {
@@ -2090,7 +1967,7 @@ sub route
 				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
 				return;
 			}
-			$dxchan = DXChannel->get($rcall);
+			$dxchan = DXChannel::get($rcall);
 			dbg("route: $call -> $rcall using RouteDB" ) if isdbg('route') && $dxchan;
 		}
 	}
@@ -2142,7 +2019,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;
 		}
@@ -2167,22 +2044,9 @@ sub load_hops
 sub addping
 {
 	my ($from, $to, $via) = @_;
-	my $ref = $pings{$to} || [];
-	my $r = {};
-	$r->{call} = $from;
-	$r->{t} = [ gettimeofday ];
-	if ($via && (my $dxchan = DXChannel->get($via))) {
-		$dxchan->send(pc51($to, $main::mycall, 1));
-	} else {
-		route(undef, $to, pc51($to, $main::mycall, 1));
-	}
-	push @$ref, $r;
-	$pings{$to} = $ref;
-	my $u = DXUser->get_current($to);
-	if ($u) {
-		$u->lastping(($via || $from), $main::systime);
-		$u->put;
-	}
+	my $thing = Thingy::Ping->new_ping($from eq $main::mycall ? () : (user=>$from), $via ? (touser=> $to, group => $via) : (group => $to));
+	$thing->remember;
+	$thing->broadcast;
 }
 
 sub process_rcmd
@@ -2223,13 +2087,13 @@ sub process_rcmd_reply
 	if ($tonode eq $main::mycall) {
 		my $s = $rcmds{$fromnode};
 		if ($s) {
-			my $dxchan = DXChannel->get($s->{call});
-			my $ref = $user eq $tonode ? $dxchan : (DXChannel->get($user) || $dxchan);
+			my $dxchan = DXChannel::get($s->{call});
+			my $ref = $user eq $tonode ? $dxchan : (DXChannel::get($user) || $dxchan);
 			$ref->send($line) if $ref;
 			delete $rcmds{$fromnode} if !$dxchan;
 		} else {
 			# send unsolicited ones to the sysop
-			my $dxchan = DXChannel->get($main::myalias);
+			my $dxchan = DXChannel::get($main::myalias);
 			$dxchan->send($line) if $dxchan;
 		}
 	} else {
@@ -2329,11 +2193,14 @@ sub disconnect
 	
 	# broadcast to all other nodes that all the nodes connected to via me are gone
 	unless ($pc39flag && $pc39flag == 2) {
+		my $thing = Thingy::Bye->new(user=>$call);
+		$thing->broadcast($self);
+
 		$self->route_pc21($main::mycall, undef, @rout) if @rout;
 	}
 
 	# remove outstanding pings
-	delete $pings{$call};
+	Thingy::Ping::forget($call);
 	
 	# I was the last node visited
     $self->user->node($main::mycall);
@@ -2549,5 +2416,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__