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

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 03887493..8bfd6c3e 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -275,10 +275,8 @@ sub normal
 	
 #	print join(',', @field), "\n";
 						
-	# ignore any lines that don't start with PC
-	return if !$field[0] =~ /^PC/;
 	
-	# process PC frames
+	# process PC frames, this will fail unless the frame starts PCnn
 	my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
 	return unless $pcno;
 	return if $pcno < 10 || $pcno > 99;
@@ -286,7 +284,7 @@ sub normal
 	# check for and dump bad protocol messages
 	my $n = check($pcno, @field);
 	if ($n) {
-		dbg("PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")") if isdbg('chan');
+		dbg("PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")") if isdbg('chanerr');
 		return;
 	}
 
@@ -305,7 +303,7 @@ sub normal
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[3])) {
-					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chan');
+					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
 					return;
 				}
 			}
@@ -340,13 +338,13 @@ sub normal
 			
 			# if this is a 'nodx' node then ignore it
 			if ($badnode->in($field[7])) {
-				dbg("PCPROT: Bad Node, dropped") if isdbg('chan');
+				dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
 				return;
 			}
 			
 			# if this is a 'bad spotter' user then ignore it
 			if ($badspotter->in($field[6])) {
-				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chan');
+				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
 				return;
 			}
 			
@@ -354,13 +352,13 @@ sub normal
 			my $d = cltounix($field[3], $field[4]);
 			# bang out (and don't pass on) if date is invalid or the spot is too old (or too young)
 			if (!$d || ($pcno == 11 && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
-				dbg("PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n") if isdbg('chan');
+				dbg("PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n") if isdbg('chanerr');
 				return;
 			}
 
 			# is it 'baddx'
 			if ($baddx->in($field[2])) {
-				dbg("PCPROT: Bad DX spot, ignored") if isdbg('chan');
+				dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
 				return;
 			}
 			
@@ -368,17 +366,17 @@ sub normal
 			$field[5] =~ s/^\s+//;      # take any leading blanks off
 			$field[2] = unpad($field[2]);	# take off leading and trailing blanks from spotted callsign
 			if ($field[2] =~ /BUST\w*$/) {
-				dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chan');
+				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('chan');
+				dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr');
 				return;
 			}
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[5])) {
-					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chan');
+					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
 					return;
 				}
 			}
@@ -388,7 +386,7 @@ sub normal
 			if ($self->{inspotsfilter}) {
 				my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
 				unless ($filter) {
-					dbg("PCPROT: Rejected by filter") if isdbg('chan');
+					dbg("PCPROT: Rejected by input spot filter") if isdbg('chanerr');
 					return;
 				}
 			}
@@ -470,14 +468,14 @@ sub normal
 			# 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('chan');
+				dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
 				return;
 			}
 
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[3])) {
-					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chan');
+					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
 					return;
 				}
 			}
@@ -502,7 +500,7 @@ sub normal
 					my ($filter, $hops) = $self->{inannfilter}->it(@field[1..6], $self->{call}, 
 													$ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 					unless ($filter) {
-						dbg("PCPROT: Rejected by filter") if isdbg('chan');
+						dbg("PCPROT: Rejected by input announce filter") if isdbg('chanerr');
 						return;
 					}
 				}
@@ -534,19 +532,23 @@ sub normal
 			my $newline = "PC16^";
 			
 			if ($ncall eq $main::mycall) {
-				dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chan');
+				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('chan');
+				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('chan');
+				dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
 				return;
 			}
+			
+			# input filter if required
+			return unless $self->in_filter_route($parent);
+			
 			my $i;
 			my @rout;
 			for ($i = 2; $i < $#field; $i++) {
@@ -587,19 +589,23 @@ sub normal
 			my $ncall = $field[2];
 			my $ucall = $field[1];
 			if ($ncall eq $main::mycall) {
-				dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chan');
+				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('chan');
+				dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
 				return;
 			}
 			my $parent = Route::Node::get($ncall);
 			unless ($parent) {
-				dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chan');
+				dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
 				return;
 			}
+
+			# input filter if required
+			return unless $self->in_filter_route($parent);
+
 			my @rout = $parent->del_user($ucall);
 			$self->route_pc17($parent, @rout) if @rout;
 			return;
@@ -638,23 +644,32 @@ sub normal
 				next if length $call < 3; # min 3 letter callsigns
 
 				# update it if required
-				my $r;
+				my $r = Route::Node::get($call);
 				my $flags = Route::here($here)|Route::conf($conf);
-				if ($parent->call eq $call && ($parent->version ne $ver || $parent->flags != $flags)) {
-					$parent->version($ver);
-					$parent->flags($flags);
-					push @rout, $parent;
-				} elsif ($parent->call ne $call) {
-					next if $call eq $main::mycall || $call eq $self->{call};
-
-					my $r = $parent->add($call, $ver, Route::here($here)|Route::conf($conf));
-					push @rout, $r if $r;
-				} else {
-					$r = Route::Node::get($call);
-					if ($r && ($r->version ne $ver || $r->flags != $flags)) {
+				if ($r) {
+					my $ar;
+					if ($call ne $parent->call) {
+						if ($self->in_filter_route($r)) {
+							$ar = $parent->add($call, $ver, $flags);
+							push @rout, $ar if $ar;
+						} else {
+							next;
+						}
+					}
+					if ($r->version ne $ver || $r->flags != $flags) {
 						$r->version($ver);
-						$r->flags(Route::here($here)|Route::conf($conf));
+						$r->flags($flags);
+						push @rout, $r unless $ar;
+					}
+				} else {
+					next if $call eq $main::mycall || $call eq $self->{call};
+					
+					my $new = Route->new($call);          # throw away
+				    if ($self->in_filter_route($new)) {
+						my $r = $parent->add($call, $ver, $flags);
 						push @rout, $r;
+					} else {
+						next;
 					}
 				}
 
@@ -692,21 +707,25 @@ sub normal
 			my @rout;
 			my $parent = Route::Node::get($self->{call});
 			unless ($parent) {
-				dbg("PCPROT: Route::Node $call not in config") if isdbg('chan');
+				dbg("PCPROT: Route::Node $call not in config") if isdbg('chanerr');
 				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('chan');
+					dbg("PCPROT: Trying to disconnect myself with PC21") if isdbg('chanerr');
 					return;
 				}
 
-				# routing objects
-				push @rout, $node->del($parent) if $node;
+				if ($node) {
+					# input filter it
+					return unless $self->in_filter_route($node);
+
+					# routing objects
+					push @rout, $node->del($parent);
+				}
 			} else {
-				dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chan');
+				dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chanerr');
 				return;
 			}
 			$self->route_pc21(@rout) if @rout;
@@ -736,11 +755,11 @@ sub normal
 			my ($r) = $field[6] =~ /R=(\d+)/;
 			$r = 0 unless $r;
 			if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
-				dbg("PCPROT: WWV Date ($field[1] $field[2]) out of range") if isdbg('chan');
+				dbg("PCPROT: WWV Date ($field[1] $field[2]) out of range") if isdbg('chanerr');
 				return;
 			}
 			if (Geomag::dup($d,$sfi,$k,$i,$field[6])) {
-				dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chan');
+				dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chanerr');
 				return;
 			}
 			$field[7] =~ s/-\d+$//o;            # remove spotter's ssid
@@ -764,12 +783,21 @@ sub normal
 		
 		if ($pcno == 24) {		# set here status
 			my $call = uc $field[1];
-			my $ref = Route::Node::get($call);
-			$ref->here($field[2]) if $ref;
-			$ref = Route::User::get($call);
-			$ref->here($field[2]) if $ref;
+			my ($nref, $uref);
+			$nref = Route::Node::get($call) && $nref->here($field[2]);
+			$uref = Route::User::get($call) && $uref->here($field[2]);
+			return unless $nref || $uref;	# if we don't know where they are, it's pointless sending it on
 			
-			$self->route_pc24($ref, $field[3]) if $ref && !eph_dup($line);
+			unless (eph_dup($line)) {
+				if ($nref) {
+					return unless $self->in_filter_route($nref);
+					$self->route_pc24($nref, $field[3])
+				}
+				if ($uref) {
+					return unless $self->in_filter_route($uref);
+					$self->route_pc24($uref, $field[3]);
+				}
+			}
 			return;
 		}
 		
@@ -779,7 +807,7 @@ sub normal
 				return;
 			}
 			if ($field[2] eq $main::mycall) {
-				dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chan');
+				dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chanerr');
 				return;
 			}
 
@@ -882,7 +910,7 @@ sub normal
 			if ($field[1] eq $self->{call}) {
 				$self->disconnect(1);
 			} else {
-				dbg("PCPROT: came in on wrong channel") if isdbg('chan');
+				dbg("PCPROT: came in on wrong channel") if isdbg('chanerr');
 			}
 			return;
 		}
@@ -907,7 +935,11 @@ sub normal
 			}
 			$user->lastoper($main::systime);   # to cut down on excessive for/opers being generated
 			$user->put;
-			my $ref = Route::get($call);
+			my $ref = Route::get($call) || Route->new($call);
+
+			# input filter if required
+			return unless $self->in_filter_route($ref);
+
 			$self->route_pc41($ref, $call, $field[2], $field[3], $field[4]) if $ref && !eph_dup($line);
 			return;
 		}
@@ -927,6 +959,10 @@ sub normal
 			if ($node) {
 				return unless $node->call eq $self->{call};
 				$node->usercount($field[2]);
+
+				# input filter if required
+				return unless $self->in_filter_route($node);
+
 				$self->route_pc50($node, $field[2], $field[3]) unless eph_dup($line);
 			}
 			return;
@@ -991,12 +1027,12 @@ sub normal
 			# do some de-duping
 			my $d = cltounix($call, sprintf("%02d18Z", $field[2]));
 			if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
-				dbg("PCPROT: WCY Date ($call $field[2]) out of range") if isdbg('chan');
+				dbg("PCPROT: WCY Date ($call $field[2]) out of range") if isdbg('chanerr');
 				return;
 			}
 			@field = map { unpad($_) } @field;
 			if (WCY::dup($d,@field[3..7])) {
-				dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chan');
+				dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chanerr');
 				return;
 			}
 		
@@ -1089,7 +1125,7 @@ sub normal
 	#
 
 	if (eph_dup($line)) {
-		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chan');
+		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
 	} else {
 		unless ($self->{isolate}) {
 			broadcast_ak1a($line, $self); # send it to everyone but me
@@ -1416,7 +1452,7 @@ sub send_local_config
 		# 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();
-		@localnodes = map { Route::Node::get($_->{call}) or die "connot find node $_->{call}" } @dxchan if @dxchan;
+		@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});
 		my @rnodes = $ref->nodes;
@@ -1433,7 +1469,7 @@ sub send_local_config
 		if ($n) {
 			send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
 		} else {
-			dbg("sent a null value") if isdbg('chan');
+			dbg("sent a null value") if isdbg('chanerr');
 		}
 	}
 }
@@ -1448,18 +1484,18 @@ sub route
 	my ($self, $call, $line) = @_;
 
 	if (ref $self && $call eq $self->{call}) {
-		dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chan');
+		dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
 		return;
 	}
 
 	# always send it down the local interface if available
 	my $dxchan = DXChannel->get($call);
 	unless ($dxchan) {
-		my $cl = Route::Node::get($call);
+		my $cl = Route::get($call);
 		$dxchan = $cl->dxchan if $cl;
 		if (ref $dxchan) {
 			if (ref $self && $dxchan eq $self) {
-				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chan');
+				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chanerr');
 				return;
 			}
 		}
@@ -1470,7 +1506,7 @@ sub route
 			$dxchan->send($routeit);
 		}
 	} else {
-		dbg("PCPROT: No route available, dropped") if isdbg('chan');
+		dbg("PCPROT: No route available, dropped") if isdbg('chanerr');
 	}
 }
 
@@ -1720,15 +1756,23 @@ sub send_route
 	my ($filter, $hops);
 	my @rin;
 	
-	if ($self->{routefilter}) {
-		for (; @_ && $no; $no--) {
-			my $r = shift;
+	for (; @_ && $no; $no--) {
+		my $r = shift;
+		
+		if ($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);
-				push @rin, $r if $filter;
+				if ($filter) {
+					push @rin, $r;
+				} else {
+					dbg("DXPROT: $self->{call}/" . $r->call . " rejected by output filter") if isdbg('chanerr');
+				}
 			} else {
-				dbg("was sent a null value") if isdbg('chan');
+				dbg("was sent a null value") if isdbg('chanerr');
 			}
+		} else {
+			push @rin, $r;
 		}
 	}
 	if (@rin) {
@@ -1740,7 +1784,7 @@ sub send_route
 				$routeit = adjust_hops($self, $line);  # adjust its hop count by node name
 				next unless $routeit;
 			}
-			$self->send($routeit);
+			$self->send($routeit) if $self->{routefilter} || !$self->{isolate};
 		}
 	}
 }
@@ -1756,7 +1800,11 @@ sub broadcast_route
 	foreach $dxchan (@dxchan) {
 		next if $dxchan == $self;
 		next if $dxchan == $me;
-		$dxchan->send_route($generate, @_);
+		if ($dxchan->{routefilter} || !$self->{isolate}) {
+			$dxchan->send_route($generate, @_) 
+		} else {
+			dbg('DXPROT: isolated') if isdbg('chanerr');
+		}
 	}
 }
 
@@ -1802,7 +1850,18 @@ sub route_pc50
 	broadcast_route($self, \&pc50, 1, @_);
 }
 
-
+sub in_filter_route
+{
+	my $self = shift;
+	my $r = shift;
+	my ($filter, $hops) = (1, 1);
+	
+	if ($self->{inroutefilter}) {
+		($filter, $hops) = $self->{inroutefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq);
+		dbg("PCPROT: $self->{call}/" . $r->call . ' rejected by in_filter_route') if !$filter && isdbg('chanerr');
+	}
+	return $filter;
+}
 
 sub eph_dup
 {