X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=c3a98ecd9c81c37784f73bb812988dedc8f11baf;hb=be3846f8cab76d9b7397d2306d5b94a5040ee918;hp=af94ecac44a4e0e143e155d0c0987da0d5c20ffd;hpb=e9c1322080e18fb8f6f3f0e54bfcbdf3f4da3909;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index af94ecac..c3a98ecd 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";
+$censorpc = 1;					# Do a BadWords::check on text fields and reject things
+								# 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 $@;
 }
 
 #
@@ -332,8 +330,14 @@ sub normal
 			}
 			
 			# if this is a 'nodx' node then ignore it
-			if (grep $field[7] =~ /^$_/,  @DXProt::nodx_node) {
-				dbg('chan', "PCPROT: 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;
 			}
 			
@@ -346,13 +350,18 @@ sub normal
 			}
 
 			# is it 'baddx'
-			if (grep $field[2] eq $_, @baddx) {
+			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
+			$field[2] = unpad($field[2]);	# take off leading and trailing blanks from spotted callsign
+			if ($field[2] =~ /BUST|BUSTED$/) {
+				dbg('chan', "PCPROT: useless 'BUSTED' spot");
+				return;
+			}
 			if (Spot::dup($field[1], $field[2], $d, $field[5])) {
 				dbg('chan', "PCPROT: Duplicate Spot ignored\n");
 				return;
@@ -592,12 +601,16 @@ sub normal
 				dbg('chan', "PCPROT: $field[2] came in on wrong channel");
 				return;
 			}
-			if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
-				dbg('chan', "PCPROT: $field[2] connected locally");
+			if ($dxchan = DXChannel->get($field[1])) {
+				dbg('chan', "PCPROT: $field[1] connected locally");
 				return;
 			}
 			my $ref = DXCluster->get_exact($field[1]);
 			if ($ref) {
+				if ($ref->mynode != $node) {
+					dbg('chan', "PCPROT: $field[1] came in from wrong node $field[2]");
+					return;
+				}
 				$ref->del;
 			} else {
 				dbg('chan', "PCPROT: $field[1] not known" );