X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=08e23640f69d47423b05982bdbdea7a20a27074e;hb=1efae85edb9fd00107a5c3105d7b0d70807de348;hp=f03a610327cdccf0c77e361ce6c77868ff70b99e;hpb=0a92a4608d715cd9cd7eec3c120da651fbb4da5b;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index f03a6103..08e23640 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -46,7 +46,7 @@ $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
-$censorpc = 0;					# Do a BadWords::check on text fields and reject things
+$censorpc = 1;					# Do a BadWords::check on text fields and reject things
 								# loads of 'bad things'
 $baddx = new DXHash "baddx";
 $badspotter = new DXHash "badspotter";
@@ -336,7 +336,7 @@ sub normal
 			}
 			
 			# if this is a 'bad spotter' user then ignore it
-			if ($badspotter->in($field[7])) {
+			if ($badspotter->in($field[6])) {
 				dbg('chan', "PCPROT: Bad Spotter, dropped");
 				return;
 			}
@@ -357,6 +357,7 @@ sub normal
 			
 			# 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 (Spot::dup($field[1], $field[2], $d, $field[5])) {
 				dbg('chan', "PCPROT: Duplicate Spot ignored\n");
 				return;
@@ -596,12 +597,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" );