X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=99fc85ce7e3c42723bec9a8c5da038f2d540beb9;hb=575db552c5a635ce2eb431de07f568113374735f;hp=da138878fc69e4596dd550de40580db9461e13fe;hpb=974132fc71b24d52a34484178d22b97c5ccecef9;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index da138878..99fc85ce 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -30,11 +30,12 @@ use Geomag;
 use WCY;
 use Time::HiRes qw(gettimeofday tv_interval);
 use BadWords;
+use DXHash;
 
 use strict;
 use vars qw($me $pc11_max_age $pc23_max_age
 			$last_hour %pings %rcmds
-			%nodehops @baddx $baddxfn $censorpc
+			%nodehops $baddx $badspotter $badnode $censorpc
 			$allowzero $decode_dk0wcy $send_opernam @checklist);
 
 $me = undef;					# the channel id for this cluster
@@ -45,10 +46,11 @@ $last_hour = time;				# last time I did an hourly periodic update
 %pings = ();                    # outstanding ping requests outbound
 %rcmds = ();                    # outstanding rcmd requests outbound
 %nodehops = ();                 # node specific hop control
-@baddx = ();                    # list of illegal spotted callsigns
 $censorpc = 0;					# Do a BadWords::check on text fields and reject things
-
-$baddxfn = "$main::data/baddx.pl";
+								# loads of 'bad things'
+$baddx = new DXHash "baddx";
+$badspotter = new DXHash "badspotter";
+$badnode = new DXHash "badnode";
 
 @checklist = 
 (
@@ -177,10 +179,6 @@ sub init
 	do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
 	confess $@ if $@;
 	$me->{sort} = 'S';    # S for spider
-
-	# load the baddx file
-	do "$baddxfn" if -e "$baddxfn";
-	print "$@\n" if $@;
 }
 
 #
@@ -279,7 +277,7 @@ sub normal
 	# check for and dump bad protocol messages
 	my $n = check($pcno, @field);
 	if ($n) {
-		dbg('chan', "bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")");
+		dbg('chan', "PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")");
 		return;
 	}
 
@@ -298,7 +296,7 @@ sub normal
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[3])) {
-					dbg('chan', "Bad words: @bad, dropped" );
+					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
 					return;
 				}
 			}
@@ -332,8 +330,14 @@ sub normal
 			}
 			
 			# if this is a 'nodx' node then ignore it
-			if (grep $field[7] =~ /^$_/,  @DXProt::nodx_node) {
-				dbg('chan', "Bad DXNode, dropped");
+			if ($badnode->in($field[7])) {
+				dbg('chan', "PCPROT: Bad Node, dropped");
+				return;
+			}
+			
+			# if this is a 'bad spotter' user then ignore it
+			if ($badspotter->in($field[6])) {
+				dbg('chan', "PCPROT: Bad Spotter, dropped");
 				return;
 			}
 			
@@ -341,26 +345,26 @@ 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('chan', "Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
+				dbg('chan', "PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
 				return;
 			}
 
 			# is it 'baddx'
-			if (grep $field[2] eq $_, @baddx) {
-				dbg('chan', "Bad DX spot, ignored");
+			if ($baddx->in($field[2])) {
+				dbg('chan', "PCPROT: Bad DX spot, ignored");
 				return;
 			}
 			
 			# do some de-duping
 			$field[5] =~ s/^\s+//;      # take any leading blanks off
 			if (Spot::dup($field[1], $field[2], $d, $field[5])) {
-				dbg('chan', "Duplicate Spot ignored\n");
+				dbg('chan', "PCPROT: Duplicate Spot ignored\n");
 				return;
 			}
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[5])) {
-					dbg('chan', "Bad words: @bad, dropped" );
+					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
 					return;
 				}
 			}
@@ -437,14 +441,14 @@ sub normal
 			# announce duplicate checking
 			$field[3] =~ s/^\s+//;  # remove leading blanks
 			if (AnnTalk::dup($field[1], $field[2], $field[3])) {
-				dbg('chan', "Duplicate Announce ignored");
+				dbg('chan', "PCPROT: Duplicate Announce ignored");
 				return;
 			}
 
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[3])) {
-					dbg('chan', "Bad words: @bad, dropped" );
+					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
 					return;
 				}
 			}
@@ -469,7 +473,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('chan', "Rejected by filter");
+						dbg('chan', "PCPROT: Rejected by filter");
 						return;
 					}
 				}
@@ -500,32 +504,32 @@ sub normal
 				# add it to the node table if it isn't present and it's
 				# connected locally
 				$node = DXNode->new($dxchan, $field[1], 0, 1, 5400);
-				dbg('chan', "$field[1] no PC19 yet, autovivified as node");
+				dbg('chan', "PCPROT: $field[1] no PC19 yet, autovivified as node");
 #				broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
 				
 			}
 			if ($field[1] eq $main::mycall || $field[2] eq $main::mycall) {
-				dbg('chan', "LOOP: trying to alter config on this node from outside!");
+				dbg('chan', "PCPROT: trying to alter config on this node from outside!");
 				return;
 			}
 			if ($field[2] eq $main::myalias && DXChannel->get($field[1])) {
-				dbg('chan', "LOOP: trying to connect sysop from outside!");
+				dbg('chan', "PCPROT: trying to connect sysop from outside!");
 				return;
 			}
 			unless ($node) {
-				dbg('chan', "Node $field[1] not in config");
+				dbg('chan', "PCPROT: Node $field[1] not in config");
 				return;
 			}
 			unless ($node->isa('DXNode')) {
-				dbg('chan', "$field[1] is not a node");
+				dbg('chan', "PCPROT: $field[1] is not a node");
 				return;
 			}
 			if ($node->dxchan != $self) {
-				dbg('chan', "LOOP: $field[1] came in on wrong channel");
+				dbg('chan', "PCPROT: $field[1] came in on wrong channel");
 				return;
 			}
 			if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
-				dbg('chan', "LOOP: $field[1] connected locally");
+				dbg('chan', "PCPROT: $field[1] connected locally");
 				return;
 			}
 			my $i;
@@ -536,11 +540,11 @@ sub normal
 				my $ref = DXCluster->get_exact($call); 
 				if ($ref) {
 					if ($ref->isa('DXNode')) {
-						dbg('chan', "LOOP: $call is a node");
+						dbg('chan', "PCPROT: $call is a node");
 						next;
 					}
 					my $rcall = $ref->mynode->call;
-					dbg('chan', "LOOP: already have $call on $rcall");
+					dbg('chan', "PCPROT: already have $call on $rcall");
 					next;
 				}
 				
@@ -569,38 +573,38 @@ sub normal
 				# add it to the node table if it isn't present and it's
 				# connected locally
 				$node = DXNode->new($dxchan, $field[2], 0, 1, 5400);
-				dbg('chan', "$field[2] no PC19 yet, autovivified as node");
+				dbg('chan', "PCPROT: $field[2] no PC19 yet, autovivified as node");
 #				broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
 			}
 			if ($field[1] eq $main::mycall || $field[2] eq $main::mycall) {
-				dbg('chan', "LOOP: trying to alter config on this node from outside!");
+				dbg('chan', "PCPROT: trying to alter config on this node from outside!");
 				return;
 			}
 			if ($field[1] eq $main::myalias && DXChannel->get($field[1])) {
-				dbg('chan', "LOOP: trying to disconnect sysop from outside!");
+				dbg('chan', "PCPROT: trying to disconnect sysop from outside!");
 				return;
 			}
 			unless ($node) {
-				dbg('chan', "Node $field[2] not in config");
+				dbg('chan', "PCPROT: Node $field[2] not in config");
 				return;
 			}
 			unless ($node->isa('DXNode')) {
-				dbg('chan', "LOOP: $field[2] is not a node");
+				dbg('chan', "PCPROT: $field[2] is not a node");
 				return;
 			}
 			if ($node->dxchan != $self) {
-				dbg('chan', "LOOP: $field[2] came in on wrong channel");
+				dbg('chan', "PCPROT: $field[2] came in on wrong channel");
 				return;
 			}
 			if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
-				dbg('chan', "LOOP: $field[2] connected locally");
+				dbg('chan', "PCPROT: $field[2] connected locally");
 				return;
 			}
 			my $ref = DXCluster->get_exact($field[1]);
 			if ($ref) {
 				$ref->del;
 			} else {
-				dbg('chan', "$field[1] not known" );
+				dbg('chan', "PCPROT: $field[1] not known" );
 				return;
 			}
 			last SWITCH;
@@ -638,14 +642,14 @@ sub normal
 				if ($node) {
 					my $dxchan;
 					if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
-						dbg('chan', "LOOP: $call connected locally");
+						dbg('chan', "PCPROT: $call connected locally");
 					}
 				    if ($node->dxchan != $self) {
-						dbg('chan', "LOOP: $call come in on wrong channel");
+						dbg('chan', "PCPROT: $call come in on wrong channel");
 						next;
 					}
 					my $rcall = $node->mynode->call;
-					dbg('chan', "already have $call on $rcall");
+					dbg('chan', "PCPROT: already have $call on $rcall");
 					next;
 				}
 				
@@ -696,29 +700,29 @@ sub normal
 				my $node = DXCluster->get_exact($call);
 				if ($node) {
 					unless ($node->isa('DXNode')) {
-						dbg('chan', "$call is not a node");
+						dbg('chan', "PCPROT: $call is not a node");
 						return;
 					}
 					if ($call eq $self->{call}) {
-						dbg('chan', "LOOP: Trying to disconnect myself with PC21");
+						dbg('chan', "PCPROT: Trying to disconnect myself with PC21");
 						return;
 					} 
 					if ($node->dxchan != $self) {
-						dbg('chan', "LOOP: $call come in on wrong channel");
+						dbg('chan', "PCPROT: $call come in on wrong channel");
 						return;
 					}
 					my $dxchan;
 					if ($dxchan = DXChannel->get($call)) {
-						dbg('chan', "LOOP: $call connected locally");
+						dbg('chan', "PCPROT: $call connected locally");
 						return;
 					}
 					$node->del();
 				} else {
-					dbg('chan', "$call not in table, dropped");
+					dbg('chan', "PCPROT: $call not in table, dropped");
 					return;
 				}
 			} else {
-				dbg('chan', "I WILL NOT be disconnected!");
+				dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!");
 				return;
 			}
 			last SWITCH;
@@ -747,11 +751,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('chan', "WWV Date ($field[1] $field[2]) out of range");
+				dbg('chan', "PCPROT: WWV Date ($field[1] $field[2]) out of range");
 				return;
 			}
 			if (Geomag::dup($d,$sfi,$k,$i,$field[6])) {
-				dbg('chan', "Dup WWV Spot ignored\n");
+				dbg('chan', "PCPROT: Dup WWV Spot ignored\n");
 				return;
 			}
 			$field[7] =~ s/-\d+$//o;            # remove spotter's ssid
@@ -786,7 +790,7 @@ sub normal
 				return;
 			}
 			if ($field[2] eq $main::mycall) {
-				dbg('chan', "Trying to merge to myself, ignored");
+				dbg('chan', "PCPROT: Trying to merge to myself, ignored");
 				return;
 			}
 
@@ -848,7 +852,7 @@ sub normal
 			} else {
 				my $ref = DXUser->get_current($field[1]);
 				if ($ref && $ref->is_clx) {
-					route($field[1], pc84($field[2], $field[1], $field[2], $field[3]));
+					$self->route($field[1], pc84($field[2], $field[1], $field[2], $field[3]));
 				} else {
 					$self->route($field[1], $line);
 				}
@@ -871,7 +875,7 @@ sub normal
 			} else {
 				my $ref = DXUser->get_current($field[1]);
 				if ($ref && $ref->is_clx) {
-					route($field[1], pc85($field[2], $field[1], $field[2], $field[3]));
+					$self->route($field[1], pc85($field[2], $field[1], $field[2], $field[3]));
 				} else {
 					$self->route($field[1], $line);
 				}
@@ -889,7 +893,7 @@ sub normal
 			if ($field[1] eq $self->{call}) {
 				$self->disconnect(1);
 			} else {
-				dbg('chan', "LOOP: came in on wrong channel");
+				dbg('chan', "PCPROT: came in on wrong channel");
 			}
 			return;
 		}
@@ -897,11 +901,6 @@ sub normal
 		if ($pcno == 41) {		# user info
 			# add this station to the user database, if required
 			my $user = DXUser->get_current($field[1]);
-			if (!$user) {
-				# then try without an SSID
-				$field[1] =~ s/-\d+$//o;
-				$user = DXUser->get_current($field[1]);
-			}
 			$user = DXUser->new($field[1]) if !$user;
 			
 			if ($field[2] == 1) {
@@ -961,7 +960,7 @@ sub normal
 								$dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave))
 							} elsif ($dxchan->is_node) {
 								if ($tochan) {
-									$tochan->{nopings} = 2; # pump up the timer
+									$tochan->{nopings} = $tochan->user->nopings || 2; # pump up the timer
 									push @{$tochan->{pingtime}}, $t;
 									shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
 									my $st;
@@ -993,12 +992,12 @@ sub normal
 			# do some de-duping
 			my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
 			if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
-				dbg('chan', "WCY Date ($field[1] $field[2]) out of range");
+				dbg('chan', "PCPROT: WCY Date ($field[1] $field[2]) out of range");
 				return;
 			}
 			@field = map { unpad($_) } @field;
 			if (WCY::dup($d,@field[3..7])) {
-				dbg('chan', "Dup WCY Spot ignored\n");
+				dbg('chan', "PCPROT: Dup WCY Spot ignored\n");
 				return;
 			}
 		
@@ -1045,7 +1044,7 @@ sub normal
 				if ($ref && $ref->is_clx) {
 					$self->route($field[1], $line);
 				} else {
-					route($field[1], pc34($field[2], $field[1], $field[4]));
+					$self->route($field[1], pc34($field[2], $field[1], $field[4]));
 				}
 			}
 			return;
@@ -1073,7 +1072,7 @@ sub normal
 				if ($ref && $ref->is_clx) {
 					$self->route($field[1], $line);
 				} else {
-					route($field[1], pc35($field[2], $field[1], $field[4]));
+					$self->route($field[1], pc35($field[2], $field[1], $field[4]));
 				}
 			}
 			return;
@@ -1230,6 +1229,19 @@ sub send_wwv_spot
 	my $line = shift;
 	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]);
+	if (@dxcc > 0) {
+		$wwv_dxcc = $dxcc[1]->dxcc;
+		$wwv_itu = $dxcc[1]->itu;
+		$wwv_cq = $dxcc[1]->cq;						
+	}
+	@dxcc = Prefix::extract($_[8]);
+	if (@dxcc > 0) {
+		$org_dxcc = $dxcc[1]->dxcc;
+		$org_itu = $dxcc[1]->itu;
+		$org_cq = $dxcc[1]->cq;						
+	}
 	
 	# 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
@@ -1238,7 +1250,7 @@ sub send_wwv_spot
 		my ($filter, $hops);
 
 		if ($dxchan->{wwvfilter}) {
-			 ($filter, $hops) = $dxchan->{wwvfilter}->it(@_, $self->{call} );
+			($filter, $hops) = $dxchan->{wwvfilter}->it(@_, $self->{call}, $wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq);
 			 next unless $filter;
 		}
 		if ($dxchan->is_node) {
@@ -1274,6 +1286,19 @@ sub send_wcy_spot
 	my $line = shift;
 	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]);
+	if (@dxcc > 0) {
+		$wcy_dxcc = $dxcc[1]->dxcc;
+		$wcy_itu = $dxcc[1]->itu;
+		$wcy_cq = $dxcc[1]->cq;						
+	}
+	@dxcc = Prefix::extract($_[12]);
+	if (@dxcc > 0) {
+		$org_dxcc = $dxcc[1]->dxcc;
+		$org_itu = $dxcc[1]->itu;
+		$org_cq = $dxcc[1]->cq;						
+	}
 	
 	# 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
@@ -1282,7 +1307,7 @@ sub send_wcy_spot
 		my ($filter, $hops);
 
 		if ($dxchan->{wcyfilter}) {
-			 ($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call} );
+			($filter, $hops) = $dxchan->{wcyfilter}->it(@_, $self->{call}, $wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq);
 			 next unless $filter;
 		}
 		if ($dxchan->is_clx || $dxchan->is_spider || $dxchan->is_dxnet) {
@@ -1333,10 +1358,25 @@ sub send_announce
 		$target = "WX"; 
 		$to = '';
 	}
-	$target = "All" if !$target;
+	$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);
+	my @dxcc = Prefix::extract($_[0]);
+	if (@dxcc > 0) {
+		$ann_dxcc = $dxcc[1]->dxcc;
+		$ann_itu = $dxcc[1]->itu;
+		$ann_cq = $dxcc[1]->cq;						
+	}
+	@dxcc = Prefix::extract($_[4]);
+	if (@dxcc > 0) {
+		$org_dxcc = $dxcc[1]->dxcc;
+		$org_itu = $dxcc[1]->itu;
+		$org_cq = $dxcc[1]->cq;						
+	}
+
 	# 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) {
@@ -1344,19 +1384,6 @@ sub send_announce
 		my ($filter, $hops);
 
 		if ($dxchan->{annfilter}) {
-			my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-			my @dxcc = Prefix::extract($_[0]);
-			if (@dxcc > 0) {
-				$ann_dxcc = $dxcc[1]->dxcc;
-				$ann_itu = $dxcc[1]->itu;
-				$ann_cq = $dxcc[1]->cq;						
-			}
-			@dxcc = Prefix::extract($_[4]);
-			if (@dxcc > 0) {
-				$org_dxcc = $dxcc[1]->dxcc;
-				$org_itu = $dxcc[1]->itu;
-				$org_cq = $dxcc[1]->cq;						
-			}
 			($filter, $hops) = $dxchan->{annfilter}->it(@_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 			next unless $filter;
 		} 
@@ -1443,7 +1470,7 @@ sub route
 	my ($self, $call, $line) = @_;
 
 	if (ref $self && $call eq $self->{call}) {
-		dbg('chan', "Trying to route back to source, dropped");
+		dbg('chan', "PCPROT: Trying to route back to source, dropped");
 		return;
 	}
 
@@ -1452,12 +1479,20 @@ sub route
 	unless ($dxchan) {
 		my $cl = DXCluster->get_exact($call);
 		$dxchan = $cl->dxchan if $cl;
+		if (ref $dxchan) {
+			if (ref $self && $dxchan eq $self) {
+				dbg('chan', "PCPROT: Trying to route back to source, dropped");
+				return;
+			}
+		}
 	}
 	if ($dxchan) {
 		my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
 		if ($routeit) {
 			$dxchan->send($routeit);
 		}
+	} else {
+		dbg('chan', "PCPROT: No route available, dropped");
 	}
 }