X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=0bd23a7ea16e9c80ed95500d092d113e95caec6b;hb=bea2d5918cc83eb92a5893cb9fbb83741c1644a8;hp=ed8d2e5bf67c10c5d87914e50c4ff62916f335a5;hpb=ece0b001419b8e755540eaff4ce3a558fd7d939f;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ed8d2e5b..0bd23a7e 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -32,14 +32,21 @@ use BadWords;
 use DXHash;
 use Route;
 use Route::Node;
+use Script;
 
 use strict;
-use vars qw($me $pc11_max_age $pc23_max_age
-			$last_hour $last10 %eph  %pings %rcmds
-			%nodehops $baddx $badspotter $badnode $censorpc
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
+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
+			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
 			$allowzero $decode_dk0wcy $send_opernam @checklist);
 
-$me = undef;					# the channel id for this cluster
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
 $pc23_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc23
 
@@ -52,7 +59,12 @@ $censorpc = 1;					# Do a BadWords::check on text fields and reject things
 $baddx = new DXHash "baddx";
 $badspotter = new DXHash "badspotter";
 $badnode = new DXHash "badnode";
-$last10 = time;
+$last10 = $last_pc50 = time;
+$ann_to_talk = 1;
+$rspfcheck = 1;
+$eph_restime = 180;
+$eph_info_restime = 60*60;
+$eph_pc34_restime = 30;
 
 @checklist = 
 (
@@ -173,16 +185,8 @@ sub check
 
 sub init
 {
-	my $user = DXUser->get($main::mycall);
-	$DXProt::myprot_version += $main::version*100;
-	$me = DXProt->new($main::mycall, 0, $user); 
-	$me->{here} = 1;
-	$me->{state} = "indifferent";
 	do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
 	confess $@ if $@;
-	$me->{sort} = 'S';    # S for spider
-	$me->{priv} = 9;
-#	$Route::Node::me->adddxchan($me);
 }
 
 #
@@ -196,7 +200,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, '0000', Route::here(1)) if $call ne $main::mycall;
+	$main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
 
 	return $self;
 }
@@ -209,22 +213,32 @@ sub start
 	my ($self, $line, $sort) = @_;
 	my $call = $self->{call};
 	my $user = $self->{user};
+
+	# log it
+	my $host = $self->{conn}->{peerhost} || "unknown";
+	Log('DXProt', "$call connected from $host");
 	
 	# remember type of connection
 	$self->{consort} = $line;
 	$self->{outbound} = $sort eq 'O';
-	$self->{priv} = $user->priv || 1;     # other clusters can always be 'normal' users
+	my $priv = $user->priv;
+	$priv = $user->priv(1) unless $priv;
+	$self->{priv} = $priv;     # other clusters can always be 'normal' users
 	$self->{lang} = $user->lang || 'en';
 	$self->{isolate} = $user->{isolate};
 	$self->{consort} = $line;	# save the connection type
 	$self->{here} = 1;
+	$self->{width} = 80;
+
+	# sort out registration
+	$self->{registered} = 1;
 
 	# get the output filters
 	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
 	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
 	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'node_default', 0);
 	$self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'node_default', 0) ;
-	$self->{routefilter} = Filter::read_in('route', $call, 0) || Filter::read_in('route', 'node_default', 0) ;
+	$self->{routefilter} = Filter::read_in('route', $call, 0) || Filter::read_in('route', 'node_default', 0) unless $self->{isolate} ;
 
 
 	# get the INPUT filters (these only pertain to Clusters)
@@ -232,11 +246,12 @@ sub start
 	$self->{inwwvfilter} = Filter::read_in('wwv', $call, 1) || Filter::read_in('wwv', 'node_default', 1);
 	$self->{inwcyfilter} = Filter::read_in('wcy', $call, 1) || Filter::read_in('wcy', 'node_default', 1);
 	$self->{inannfilter} = Filter::read_in('ann', $call, 1) || Filter::read_in('ann', 'node_default', 1);
-	$self->{inroutefilter} = Filter::read_in('route', $call, 1) || Filter::read_in('route', 'node_default', 1);
+	$self->{inroutefilter} = Filter::read_in('route', $call, 1) || Filter::read_in('route', 'node_default', 1) unless $self->{isolate};
 	
 	# set unbuffered and no echo
 	$self->send_now('B',"0");
 	$self->send_now('E',"0");
+	$self->conn->echo(0) if $self->conn->can('echo');
 	
 	# ping neighbour node stuff
 	my $ping = $user->pingint;
@@ -244,22 +259,34 @@ sub start
 	$self->{pingint} = $ping;
 	$self->{nopings} = $user->nopings || 2;
 	$self->{pingtime} = [ ];
-	$self->{pingave} = 0;
+	$self->{pingave} = 999;
+	$self->{metric} ||= 100;
+	$self->{lastping} = $main::systime;
 
 	# send initialisation string
 	unless ($self->{outbound}) {
-		$self->send(pc18());
-		$self->{lastping} = $main::systime;
-	} else {
-		$self->{lastping} = $main::systime + ($self->pingint / 2);
+		$self->sendinit;
 	}
+	
 	$self->state('init');
 	$self->{pc50_t} = $main::systime;
 
 	# send info to all logged in thingies
 	$self->tell_login('loginn');
 
-	Log('DXProt', "$call connected");
+	# run a script send the output to the debug file
+	my $script = new Script(lc $call) || new Script('node_default');
+	$script->run($self) if $script;
+}
+
+#
+# send outgoing 'challenge'
+#
+
+sub sendinit
+{
+	my $self = shift;
+	$self->send(pc18());
 }
 
 #
@@ -299,6 +326,9 @@ sub normal
  SWITCH: {
 		if ($pcno == 10) {		# incoming talk
 
+			# rsfp check
+			return if $rspfcheck and !$self->rspfcheck(0, $field[6], $field[1]);
+			
 			# will we allow it at all?
 			if ($censorpc) {
 				my @bad;
@@ -309,20 +339,64 @@ sub normal
 			}
 
 			# is it for me or one of mine?
-			my ($to, $via, $call, $dxchan);
+			my ($from, $to, $via, $call, $dxchan);
+			$from = $field[1];
 			if ($field[5] gt ' ') {
-				$call = $via = $field[2];
+				$via = $field[2];
 				$to = $field[5];
 			} else {
-				$call = $to = $field[2];
+				$to = $field[2];
+			}
+
+			# if this is a 'nodx' node then ignore it
+			if ($badnode->in($field[6]) || ($via && $badnode->in($via))) {
+				dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+				return;
 			}
-			$dxchan = DXChannel->get($main::myalias) if $call eq $main::mycall;
-			$dxchan = DXChannel->get($call) unless $dxchan;
+
+			# if this is a 'bad spotter' user then ignore it
+			my $nossid = $from;
+			$nossid =~ s/-\d+$//;
+			if ($badspotter->in($nossid)) {
+				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+				return;
+			}
+
+			# if we are converting announces to talk is it a dup?
+			if ($ann_to_talk) {
+				if (AnnTalk::is_talk_candidate($from, $field[3]) && AnnTalk::dup($from, $to, $field[3])) {
+					dbg("DXPROT: Dupe talk from announce, dropped") if isdbg('chanerr');
+					return;
+				}
+			}
+
+			# it is here and logged on
+			$dxchan = DXChannel->get($main::myalias) if $to eq $main::mycall;
+			$dxchan = DXChannel->get($to) unless $dxchan;
 			if ($dxchan && $dxchan->is_user) {
 				$field[3] =~ s/\%5E/^/g;
-				$dxchan->talk($field[1], $to, $via, $field[3]);
-			} else {
-				$self->route($field[2], $line); # relay it on its way
+				$dxchan->talk($from, $to, $via, $field[3]);
+				return;
+			}
+
+			# is it elsewhere, visible on the cluster via the to address?
+			# note: this discards the via unless the to address is on
+			# the via address
+			my ($ref, $vref);
+			if ($ref = Route::get($to)) {
+				$vref = Route::Node::get($via) if $via;
+				$vref = undef unless $vref && grep $to eq $_, $vref->users;
+				$ref->dxchan->talk($from, $to, $vref ? $via : undef, $field[3], $field[6]);
+				return;
+			}
+
+			# not visible here, send a message of condolence
+			$vref = undef;
+			$ref = Route::get($from);
+			$vref = $ref = Route::Node::get($field[6]) unless $ref; 
+			if ($ref) {
+				$dxchan = $ref->dxchan;
+				$dxchan->talk($main::mycall, $from, $vref ? $vref->call : undef, $dxchan->msg('talknh', $to) );
 			}
 			return;
 		}
@@ -337,6 +411,9 @@ sub normal
 				}
 			}
 			
+			# rsfp check
+#			return if $rspfcheck and !$self->rspfcheck(1, $field[7], $field[6]);
+
 			# if this is a 'nodx' node then ignore it
 			if ($badnode->in($field[7])) {
 				dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
@@ -344,7 +421,9 @@ sub normal
 			}
 			
 			# if this is a 'bad spotter' user then ignore it
-			if ($badspotter->in($field[6])) {
+			my $nossid = $field[6];
+			$nossid =~ s/-\d+$//;
+			if ($badspotter->in($nossid)) {
 				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
 				return;
 			}
@@ -358,7 +437,7 @@ sub normal
 			}
 
 			# is it 'baddx'
-			if ($baddx->in($field[2])) {
+			if ($baddx->in($field[2]) || BadWords::check($field[2]) || $field[2] =~ /COCK/) {
 				dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
 				return;
 			}
@@ -370,10 +449,6 @@ sub normal
 				dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chanerr');
 				return;
 			}
-			if (Spot::dup($field[1], $field[2], $d, $field[5])) {
-				dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
-				return;
-			}
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[5])) {
@@ -382,6 +457,7 @@ sub normal
 				}
 			}
 
+
 			my @spot = Spot::prepare($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
 			# global spot filtering on INPUT
 			if ($self->{inspotsfilter}) {
@@ -391,7 +467,15 @@ sub normal
 					return;
 				}
 			}
-			
+
+			# 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($field[1], $field[2], $d, $field[5])) {
+				dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
+				return;
+			}
+
 			# add it 
 			Spot::add(@spot);
 
@@ -422,7 +506,7 @@ sub normal
 					my $node;
 					my $to = $user->homenode;
 					my $last = $user->lastoper || 0;
-					if ($to ne $main::mycall && $send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($node = Route::Node::get($to)) ) {
+					if ($send_opernam && $to && $to ne $main::mycall && $main::systime > $last + $DXUser::lastoperinterval && ($node = Route::Node::get($to)) ) {
 						my $cmd = "forward/opernam $spot[4]";
 						# send the rcmd but we aren't interested in the replies...
 						my $dxchan = $node->dxchan;
@@ -466,12 +550,11 @@ sub normal
 		}
 		
 		if ($pcno == 12) {		# announces
+
+#			return if $rspfcheck and !$self->rspfcheck(1, $field[5], $field[1]);
+
 			# announce duplicate checking
 			$field[3] =~ s/^\s+//;  # remove leading blanks
-			if (AnnTalk::dup($field[1], $field[2], $field[3])) {
-				dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
-				return;
-			}
 
 			if ($censorpc) {
 				my @bad;
@@ -480,38 +563,43 @@ sub normal
 					return;
 				}
 			}
-			
+
+			# if this is a 'nodx' node then ignore it
+			if ($badnode->in($field[5])) {
+				dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+				return;
+			}
+
+			# if this is a 'bad spotter' user then ignore it
+			my $nossid = $field[1];
+			$nossid =~ s/-\d+$//;
+			if ($badspotter->in($nossid)) {
+				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+				return;
+			}
+
 			if ($field[2] eq '*' || $field[2] eq $main::mycall) {
-				
-				# global ann filtering on INPUT
-				if ($self->{inannfilter}) {
-					my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-					my @dxcc = Prefix::extract($field[1]);
-					if (@dxcc > 0) {
-						$ann_dxcc = $dxcc[1]->dxcc;
-						$ann_itu = $dxcc[1]->itu;
-						$ann_cq = $dxcc[1]->cq();						
-					}
-					@dxcc = Prefix::extract($field[5]);
-					if (@dxcc > 0) {
-						$org_dxcc = $dxcc[1]->dxcc;
-						$org_itu = $dxcc[1]->itu;
-						$org_cq = $dxcc[1]->cq();						
-					}
-					my ($filter, $hops) = $self->{inannfilter}->it(@field[1..6], $self->{call}, 
-													$ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
-					unless ($filter) {
-						dbg("PCPROT: Rejected by input announce filter") if isdbg('chanerr');
-						return;
+
+
+				# here's a bit of fun, convert incoming ann with a callsign in the first word
+				# or one saying 'to <call>' to a talk if we can route to the recipient
+				if ($ann_to_talk) {
+					my $call = AnnTalk::is_talk_candidate($field[1], $field[3]);
+					if ($call) {
+						my $ref = Route::get($call);
+						if ($ref) {
+							my $dxchan = $ref->dxchan;
+							$dxchan->talk($field[1], $call, undef, $field[3], $field[5]) if $dxchan != $self;
+							return;
+						}
 					}
 				}
-
+	
 				# send it
 				$self->send_announce($line, @field[1..6]);
 			} else {
 				$self->route($field[2], $line);
 			}
-			
 			return;
 		}
 		
@@ -527,6 +615,11 @@ sub normal
 		
 		if ($pcno == 16) {		# add a user
 
+			if (eph_dup($line)) {
+				dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
+				return;
+			}
+
 			# general checks
 			my $dxchan;
 			my $ncall = $field[1];
@@ -536,17 +629,17 @@ sub normal
 				dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
 				return;
 			}
-			$dxchan = DXChannel->get($ncall);
-			if ($dxchan && $dxchan ne $self) {
-				dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
-				return;
-			}
 			my $parent = Route::Node::get($ncall); 
 			unless ($parent) {
 				dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
 				return;
 			}
-			
+			$dxchan = $parent->dxchan;
+			if ($dxchan && $dxchan ne $self) {
+				dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+				return;
+			}
+
 			# input filter if required
 			return unless $self->in_filter_route($parent);
 			
@@ -557,11 +650,19 @@ sub normal
 				next unless $call && $conf && defined $here && is_callsign($call);
 				next if $call eq $main::mycall;
 
-				eph_del_regex("^PC17\^$call\^$ncall");
+				eph_del_regex("^PC17\\^$call\\^$ncall");
 				
 				$conf = $conf eq '*';
 
-				my $r = Route::User::get($call);
+				# 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;
+				}
+				
+				$r = Route::User::get($call);
 				my $flags = Route::here($here)|Route::conf($conf);
 				
 				if ($r) {
@@ -569,7 +670,7 @@ sub normal
 						$r->flags($flags);
 						push @rout, $r;
 					}
-					$r->addparent($ncall);
+					$r->addparent($parent);
 				} else {
 					push @rout, $parent->add_user($call, $flags);
 				}
@@ -583,11 +684,6 @@ sub normal
 				$user->lastin($main::systime) unless DXChannel->get($call);
 				$user->put;
 			}
-
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
-				return;
-			}
 			
 			# queue up any messages (look for privates only)
 			DXMsg::queue_msg(1) if $self->state eq 'normal';     
@@ -601,44 +697,68 @@ sub normal
 			my $ncall = $field[2];
 			my $ucall = $field[1];
 
-			eph_del_regex("^PC16.*$ncall.*$ucall");
+			eph_del_regex("^PC16\\^$ncall.*$ucall");
 			
 			if ($ncall eq $main::mycall) {
 				dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
 				return;
 			}
-			$dxchan = DXChannel->get($ncall);
-			if ($dxchan && $dxchan ne $self) {
-				dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+
+			my $uref = Route::User::get($ucall);
+			unless ($uref) {
+				dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
 				return;
 			}
 			my $parent = Route::Node::get($ncall);
 			unless ($parent) {
 				dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
 				return;
+			}			
+
+			$dxchan = $parent->dxchan;
+			if ($dxchan && $dxchan ne $self) {
+				dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+				return;
 			}
 
 			# input filter if required
 			return unless $self->in_filter_route($parent);
-
-			my @rout = $parent->del_user($ucall);
+			
+			$parent->del_user($uref);
 
 			if (eph_dup($line)) {
 				dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
 				return;
 			}
 
-			$self->route_pc17($parent, @rout) if @rout;
+			$self->route_pc17($parent, $uref);
 			return;
 		}
 		
 		if ($pcno == 18) {		# link request
 			$self->state('init');	
 
+			# record the type and version offered
+			if ($field[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+\.\d+)/) {
+				$self->version(53 + $1);
+				$self->user->version(53 + $1);
+				$self->build(0 + $2);
+				$self->user->build(0 + $2);
+				unless ($self->is_spider) {
+					$self->user->sort('S');
+					$self->user->put;
+					$self->sort('S');
+				}
+			} else {
+				$self->version(50.0);
+				$self->version($field[2] / 100) if $field[2] && $field[2] =~ /^\d+$/;
+				$self->user->version($self->version);
+			}
+
 			# first clear out any nodes on this dxchannel
 			my $parent = Route::Node::get($self->{call});
 			my @rout = $parent->del_nodes;
-			$self->route_pc21(@rout, $parent);
+			$self->route_pc21(@rout, $parent) if @rout;
 			$self->send_local_config();
 			$self->send(pc20());
 			return;             # we don't pass these on
@@ -648,6 +768,11 @@ sub normal
 			my $i;
 			my $newline = "PC19^";
 
+			if (eph_dup($line)) {
+				dbg("PCPROT: dup PC19 detected") if isdbg('chanerr');
+				return;
+			}
+
 			# new routing list
 			my @rout;
 			my $parent = Route::Node::get($self->{call});
@@ -665,14 +790,21 @@ sub normal
 				my $ver = $field[$i+3];
 				next unless defined $here && defined $conf && is_callsign($call);
 
-				eph_del_regex("^PC(?:21\^$call|17\^[^\^]+\^$call)");
+				eph_del_regex("^PC(?:21\\^$call|17\\^[^\\^]+\\^$call)");
 				
 				# check for sane parameters
-				$ver = 5000 if $ver eq '0000';
+#				$ver = 5000 if $ver eq '0000';
 				next if $ver < 5000; # only works with version 5 software
 				next if length $call < 3; # min 3 letter callsigns
 				next if $call eq $main::mycall;
 
+				# 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');
+					next;
+				}
+
 				# update it if required
 				my $r = Route::Node::get($call);
 				my $flags = Route::here($here)|Route::conf($conf);
@@ -716,7 +848,7 @@ sub normal
 					$user = DXUser->new($call);
 					$user->sort('A');
 					$user->priv(1);                   # I have relented and defaulted nodes
-					$self->{priv} = 1;                # to user RCMDs allowed
+					$user->lockout(1);
 					$user->homenode($call);
 					$user->node($call);
 				}
@@ -724,10 +856,6 @@ sub normal
 				$user->put;
 			}
 
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC19 detected") if isdbg('chanerr');
-				return;
-			}
 
 			$self->route_pc19(@rout) if @rout;
 			return;
@@ -737,6 +865,7 @@ sub normal
 			$self->send_local_config();
 			$self->send(pc22());
 			$self->state('normal');
+			$self->{lastping} = 0;
 			return;
 		}
 		
@@ -745,6 +874,13 @@ sub normal
 
 			eph_del_regex("^PC1[79].*$call");
 			
+			# if I get a PC21 from the same callsign as self then treat it
+			# as a PC39: I have gone away
+			if ($call eq $self->call) {
+				$self->disconnect(1);
+				return;
+			}
+
 			my @rout;
 			my $parent = Route::Node::get($self->{call});
 			unless ($parent) {
@@ -752,14 +888,16 @@ sub normal
 				$self->disconnect;
 				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("PCPROT: Trying to disconnect myself with PC21") if isdbg('chanerr');
-					return;
-				}
-
+				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);
 
@@ -771,10 +909,10 @@ sub normal
 				return;
 			}
 
-			if (eph_dup($line)) {
-				dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
-				return;
-			}
+#			if (eph_dup($line)) {
+#				dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
+#				return;
+#			}
 
 			$self->route_pc21(@rout) if @rout;
 			return;
@@ -782,6 +920,7 @@ sub normal
 		
 		if ($pcno == 22) {
 			$self->state('normal');
+			$self->{lastping} = 0;
 			return;
 		}
 				
@@ -795,6 +934,8 @@ sub normal
 				}
 			}
 
+			return if $rspfcheck and !$self->rspfcheck(1, $field[8], $field[7]);
+
 			# do some de-duping
 			my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
 			my $sfi = unpad($field[3]);
@@ -856,7 +997,7 @@ sub normal
 				return;
 			}
 
-			Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[1]");
+			Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[2]");
 			
 			# spots
 			if ($field[3] > 0) {
@@ -879,6 +1020,7 @@ sub normal
 		}
 
 		if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
+			return if $pcno == 49 && eph_dup($line);
 			if ($pcno == 49 || $field[1] eq $main::mycall) {
 				DXMsg::process($self, $line);
 			} else {
@@ -888,11 +1030,16 @@ sub normal
 		}
 		
 		if ($pcno == 34 || $pcno == 36) { # remote commands (incoming)
-			$self->process_rcmd($field[1], $field[2], $field[2], $field[3]);
+			if (eph_dup($line, $eph_pc34_restime)) {
+				dbg("PCPROT: dupe") if isdbg('chanerr');
+			} else {
+				$self->process_rcmd($field[1], $field[2], $field[2], $field[3]);
+			}
 			return;
 		}
 		
 		if ($pcno == 35) {		# remote command replies
+			eph_del_regex("^PC35\\^$field[2]\\^$field[1]\\^");
 			$self->process_rcmd_reply($field[1], $field[2], $field[1], $field[3]);
 			return;
 		}
@@ -906,7 +1053,6 @@ sub normal
 		if ($pcno == 39) {		# incoming disconnect
 			if ($field[1] eq $self->{call}) {
 				$self->disconnect(1);
-				eph_del_regex("^PC(?:1[679]|21).*$field[1]");
 			} else {
 				dbg("PCPROT: came in on wrong channel") if isdbg('chanerr');
 			}
@@ -916,10 +1062,20 @@ sub normal
 		if ($pcno == 41) {		# user info
 			my $call = $field[1];
 
+			if (eph_dup($line, $eph_info_restime)) {
+				dbg("PCPROT: dupe") if isdbg('chanerr');
+				return;
+			}
+			
 			# input filter if required
 #			my $ref = Route::get($call) || Route->new($call);
 #			return unless $self->in_filter_route($ref);
 
+			if ($field[3] eq $field[2] || $field[3] =~ /^\s*$/) {
+				dbg('PCPROT: invalid value') if isdbg('chanerr');
+				return;
+			}
+
 			# add this station to the user database, if required
 			my $user = DXUser->get_current($call);
 			$user = DXUser->new($call) if !$user;
@@ -941,11 +1097,11 @@ sub normal
 			} elsif ($field[2] == 4) {
 				$user->homenode($field[3]);
 			} elsif ($field[2] == 5) {
-				if (is_qra($field[3])) {
-					my ($lat, $long) = DXBearing::qratoll($field[3]);
+				if (is_qra(uc $field[3])) {
+					my ($lat, $long) = DXBearing::qratoll(uc $field[3]);
 					$user->lat($lat);
 					$user->long($long);
-					$user->qra($field[3]);
+					$user->qra(uc $field[3]);
 				} else {
 					dbg('PCPROT: not a valid QRA locator') if isdbg('chanerr');
 					return;
@@ -954,9 +1110,13 @@ sub normal
 			$user->lastoper($main::systime);   # to cut down on excessive for/opers being generated
 			$user->put;
 
+			unless ($self->{isolate}) {
+				DXChannel::broadcast_nodes($line, $self); # send it to everyone but me
+			}
+
 #  perhaps this IS what we want after all
 #			$self->route_pc41($ref, $call, $field[2], $field[3], $field[4]);
-#			return;
+			return;
 		}
 
 		if ($pcno == 43) {
@@ -1009,14 +1169,22 @@ sub normal
 								$dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
 							} elsif ($dxchan->is_node) {
 								if ($tochan) {
-									$tochan->{nopings} = $tochan->user->nopings || 2; # pump up the timer
+									my $nopings = $tochan->user->nopings || 2;
 									push @{$tochan->{pingtime}}, $t;
 									shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
-									my $st;
-									for (@{$tochan->{pingtime}}) {
-										$st += $_;
+
+									# 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->{pingave} = $st / @{$tochan->{pingtime}};
+									$tochan->{nopings} = $nopings; # pump up the timer
 								}
 							} 
 						}
@@ -1051,7 +1219,7 @@ sub normal
 				return;
 			}
 			@field = map { unpad($_) } @field;
-			if (WCY::dup($d,@field[3..7])) {
+			if (WCY::dup($d)) {
 				dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chanerr');
 				return;
 			}
@@ -1060,7 +1228,7 @@ sub normal
 
 			my $rep;
 			eval {
-				$rep = Local::wwv($self, @field[1..12]);
+				$rep = Local::wcy($self, @field[1..12]);
 			};
 			# dbg("Local::wcy error $@") if isdbg('local') if $@;
 			return if $rep;
@@ -1080,6 +1248,9 @@ sub normal
 			
 			return;
 		}
+		if ($pcno == 90) {		# new style PC16,17,19,21
+			return;
+		}
 	}
 	 
 	# if get here then rebroadcast the thing with its Hop count decremented (if
@@ -1094,7 +1265,7 @@ sub normal
 		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
 	} else {
 		unless ($self->{isolate}) {
-			broadcast_ak1a($line, $self); # send it to everyone but me
+			DXChannel::broadcast_nodes($line, $self); # send it to everyone but me
 		}
 	}
 }
@@ -1108,20 +1279,22 @@ sub process
 	my $t = time;
 	my @dxchan = DXChannel->get_all();
 	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 == $me;
-		
-		# 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) {
-			my $s = pc50($me, scalar DXChannel::get_all_users);
-			eph_dup($s);
-			$dxchan->send($s);
-			$dxchan->{pc50_t} = $t;
-		} 
+		next if $dxchan == $main::me;
 
+		# send the pc50 or PC90
+		$dxchan->send($pc50s) if $pc50s;
+		
 		# send a ping out on this channel
 		if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) {
 			if ($dxchan->{nopings} <= 0) {
@@ -1156,6 +1329,7 @@ sub process
 # some active measures
 #
 
+
 sub send_dx_spot
 {
 	my $self = shift;
@@ -1166,7 +1340,7 @@ sub send_dx_spot
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
-		next if $dxchan == $me;
+		next if $dxchan == $main::me;
 		next if $dxchan == $self && $self->is_node;
 		$dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call});
 	}
@@ -1213,13 +1387,13 @@ sub send_wwv_spot
 	my @dxchan = DXChannel->get_all();
 	my $dxchan;
 	my ($wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-	my @dxcc = Prefix::extract($_[7]);
+	my @dxcc = Prefix::extract($_[6]);
 	if (@dxcc > 0) {
 		$wwv_dxcc = $dxcc[1]->dxcc;
 		$wwv_itu = $dxcc[1]->itu;
 		$wwv_cq = $dxcc[1]->cq;						
 	}
-	@dxcc = Prefix::extract($_[8]);
+	@dxcc = Prefix::extract($_[7]);
 	if (@dxcc > 0) {
 		$org_dxcc = $dxcc[1]->dxcc;
 		$org_itu = $dxcc[1]->itu;
@@ -1229,7 +1403,7 @@ sub send_wwv_spot
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
-		next if $dxchan == $me;
+		next if $dxchan == $main::me;
 		next if $dxchan == $self && $self->is_node;
 		my $routeit;
 		my ($filter, $hops);
@@ -1260,13 +1434,13 @@ sub send_wcy_spot
 	my @dxchan = DXChannel->get_all();
 	my $dxchan;
 	my ($wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-	my @dxcc = Prefix::extract($_[11]);
+	my @dxcc = Prefix::extract($_[10]);
 	if (@dxcc > 0) {
 		$wcy_dxcc = $dxcc[1]->dxcc;
 		$wcy_itu = $dxcc[1]->itu;
 		$wcy_cq = $dxcc[1]->cq;						
 	}
-	@dxcc = Prefix::extract($_[12]);
+	@dxcc = Prefix::extract($_[11]);
 	if (@dxcc > 0) {
 		$org_dxcc = $dxcc[1]->dxcc;
 		$org_itu = $dxcc[1]->itu;
@@ -1276,7 +1450,7 @@ sub send_wcy_spot
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
-		next if $dxchan == $me;
+		next if $dxchan == $main::me;
 		next if $dxchan == $self;
 
 		$dxchan->wcy($line, $self->{isolate}, @_, $self->{call}, $wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq);
@@ -1320,8 +1494,7 @@ sub send_announce
 		$to = '';
 	}
 	$target = "ALL" if !$target;
-	
-	Log('ann', $target, $_[0], $text);
+
 
 	# obtain country codes etc 
 	my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
@@ -1338,15 +1511,30 @@ sub send_announce
 		$org_cq = $dxcc[1]->cq;						
 	}
 
+	if ($self->{inannfilter}) {
+		my ($filter, $hops) = 
+			$self->{inannfilter}->it(@_, $self->{call}, 
+									 $ann_dxcc, $ann_itu, $ann_cq,
+									 $org_dxcc, $org_itu, $org_cq);
+		unless ($filter) {
+			dbg("PCPROT: Rejected by input announce filter") if isdbg('chanerr');
+			return;
+		}
+	}
+
+	if (AnnTalk::dup($_[0], $_[1], $_[2])) {
+		dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+		return;
+	}
+
+	Log('ann', $target, $_[0], $text);
+
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
-		next if $dxchan == $me;
+		next if $dxchan == $main::me;
 		next if $dxchan == $self && $self->is_node;
-		my $routeit;
-		my ($filter, $hops);
-
-		$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq)
+		$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 	}
 }
 
@@ -1357,6 +1545,7 @@ sub announce
 	my $isolate = shift;
 	my $to = shift;
 	my $target = shift;
+	my $text = shift;
 	my ($filter, $hops);
 
 	if ($self->{annfilter}) {
@@ -1384,7 +1573,7 @@ sub send_local_config
 		# create a list of all the nodes that are not connected to this connection
 		# and are not themselves isolated, this to make sure that isolated nodes
         # don't appear outside of this node
-		my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} } DXChannel::get_all_nodes();
+		my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
 		@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
 		my @intcalls = map { $_->nodes } @localnodes if @localnodes;
 		my $ref = Route::Node::get($self->{call});
@@ -1395,6 +1584,7 @@ sub send_local_config
 		unshift @localnodes, $main::routeroot;
 	}
 	
+
 	send_route($self, \&pc19, scalar(@localnodes)+scalar(@remotenodes), @localnodes, @remotenodes);
 	
 	# get all the users connected on the above nodes and send them out
@@ -1436,103 +1626,13 @@ sub route
 	if ($dxchan) {
 		my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
 		if ($routeit) {
-			$dxchan->send($routeit) unless $dxchan == $me;
+			$dxchan->send($routeit) unless $dxchan == $main::me;
 		}
 	} else {
 		dbg("PCPROT: No route available, dropped") if isdbg('chanerr');
 	}
 }
 
-# broadcast a message to all clusters taking into account isolation
-# [except those mentioned after buffer]
-sub broadcast_ak1a
-{
-	my $s = shift;				# the line to be rebroadcast
-	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = DXChannel::get_all_nodes();
-	my $dxchan;
-	
-	# send it if it isn't the except list and isn't isolated and still has a hop count
-	foreach $dxchan (@dxchan) {
-		next if grep $dxchan == $_, @except;
-		next if $dxchan == $me;
-		
-		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
-		$dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
-	}
-}
-
-# broadcast a message to all clusters ignoring isolation
-# [except those mentioned after buffer]
-sub broadcast_all_ak1a
-{
-	my $s = shift;				# the line to be rebroadcast
-	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = DXChannel::get_all_nodes();
-	my $dxchan;
-	
-	# send it if it isn't the except list and isn't isolated and still has a hop count
-	foreach $dxchan (@dxchan) {
-		next if grep $dxchan == $_, @except;
-		next if $dxchan == $me;
-
-		my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
-		$dxchan->send($routeit);
-	}
-}
-
-# broadcast to all users
-# storing the spot or whatever until it is in a state to receive it
-sub broadcast_users
-{
-	my $s = shift;				# the line to be rebroadcast
-	my $sort = shift;           # the type of transmission
-	my $fref = shift;           # a reference to an object to filter on
-	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = DXChannel::get_all_users();
-	my $dxchan;
-	my @out;
-	
-	foreach $dxchan (@dxchan) {
-		next if grep $dxchan == $_, @except;
-		push @out, $dxchan;
-	}
-	broadcast_list($s, $sort, $fref, @out);
-}
-
-# broadcast to a list of users
-sub broadcast_list
-{
-	my $s = shift;
-	my $sort = shift;
-	my $fref = shift;
-	my $dxchan;
-	
-	foreach $dxchan (@_) {
-		my $filter = 1;
-		next if $dxchan == $me;
-		
-		if ($sort eq 'dx') {
-		    next unless $dxchan->{dx};
-			($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
-			next unless $filter;
-		}
-		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};
-
-		$s =~ s/\a//og unless $dxchan->{beep};
-
-		if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
-			$dxchan->send($s);	
-		} else {
-			$dxchan->delay($s);
-		}
-	}
-}
-
-
 #
 # obtain the hops from the list for this callsign and pc no 
 #
@@ -1705,15 +1805,20 @@ sub disconnect
 	my $pc39flag = shift;
 	my $call = $self->call;
 
+	return if $self->{disconnecting}++;
+	
 	unless ($pc39flag && $pc39flag == 1) {
 		$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
 	}
 
+	# get rid of any PC16 and 19s
+	eph_del_regex("^PC16\\^$call");
+	eph_del_regex("^PC19\\^.*$call");
+
 	# do routing stuff
 	my $node = Route::Node::get($call);
 	my @rout;
 	if ($node) {
-		@rout = $node->del_nodes;    # at the next level
 		@rout = $node->del($main::routeroot);
 	}
 	
@@ -1746,11 +1851,11 @@ sub disconnect
 #
 sub talk
 {
-	my ($self, $from, $to, $via, $line) = @_;
+	my ($self, $from, $to, $via, $line, $origin) = @_;
 	
 	$line =~ s/\^/\\5E/g;			# remove any ^ characters
-	$self->send(DXProt::pc10($from, $to, $via, $line));
-	Log('talk', $self->call, $from, $via?$via:$main::mycall, $line);
+	$self->send(DXProt::pc10($from, $to, $via, $line, $origin));
+	Log('talk', $to, $from, $via?$via:$self->call, $line) unless $origin && $origin ne $main::mycall;
 }
 
 # send it if it isn't the except list and isn't isolated and still has a hop count
@@ -1767,7 +1872,7 @@ sub send_route
 	for (; @_ && $no; $no--) {
 		my $r = shift;
 		
-		if ($self->{routefilter}) {
+		if (!$self->{isolate} && $self->{routefilter}) {
 			$filter = undef;
 			if ($r) {
 				($filter, $hops) = $self->{routefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq);
@@ -1780,7 +1885,7 @@ sub send_route
 				dbg("was sent a null value") if isdbg('chanerr');
 			}
 		} else {
-			push @rin, $r;
+			push @rin, $r unless $self->{isolate} && $r->call ne $main::mycall;
 		}
 	}
 	if (@rin) {
@@ -1805,13 +1910,13 @@ sub broadcast_route
 	my $dxchan;
 	my $line;
 	
-	foreach $dxchan (@dxchan) {
-		next if $dxchan == $self;
-		next if $dxchan == $me;
-		if ($dxchan->{routefilter}) {
+	unless ($self->{isolate}) {
+		foreach $dxchan (@dxchan) {
+			next if $dxchan == $self;
+			next if $dxchan == $main::me;
+			next if $dxchan->user->wantnp;
+			
 			$dxchan->send_route($generate, @_);
-		} else {
-			$dxchan->send_route($generate, @_) unless $self->{isolate} || $dxchan->{isolate};
 		}
 	}
 }
@@ -1858,6 +1963,12 @@ sub route_pc50
 	broadcast_route($self, \&pc50, 1, @_);
 }
 
+sub route_pc90
+{
+	my $self = shift;
+	broadcast_route($self, \&pc90, 1, @_);
+}
+
 sub in_filter_route
 {
 	my $self = shift;
@@ -1874,12 +1985,14 @@ sub in_filter_route
 sub eph_dup
 {
 	my $s = shift;
+	my $t = shift || $eph_restime;
+	my $r;
 
 	# chop the end off
 	$s =~ s/\^H\d\d?\^?\~?$//;
-	return 1 if exists $eph{$s};
-	$eph{$s} = $main::systime;
-	return undef;
+	$r = 1 if exists $eph{$s};    # pump up the dup if it keeps circulating
+	$eph{$s} = $main::systime + $t;
+	return $r;
 }
 
 sub eph_del_regex
@@ -1898,11 +2011,26 @@ sub eph_clean
 	my ($key, $val);
 	
 	while (($key, $val) = each %eph) {
-		if ($main::systime - $val > 90) {
+		if ($main::systime >= $val) {
 			delete $eph{$key};
 		}
 	}
 }
 
+sub eph_list
+{
+	my ($key, $val);
+	my @out;
+
+	while (($key, $val) = each %eph) {
+		push @out, $key, $val;
+	}
+	return @out;
+}
+
+sub run_cmd
+{
+	goto &DXCommandmode::run_cmd;
+}
 1;
 __END__