X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=ba79e43e0419ffab6a528e62123ba5ae41886929;hb=89643eba546b3cda9ba83a527919fad79651b858;hp=e07e3ba04f179a13e7431ceb799cc5a4a556de4c;hpb=6462efdcfd799f0b0c032565f19eea085ca0dba9;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index e07e3ba0..ba79e43e 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -349,6 +349,18 @@ sub normal
 				$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;
+			}
+
+			# if this is a 'bad spotter' user then ignore it
+			if ($badspotter->in($from)) {
+				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])) {
@@ -549,6 +561,18 @@ sub normal
 				}
 			}
 
+			# 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
+			if ($badspotter->in($field[1])) {
+				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+				return;
+			}
+
 			if ($field[2] eq '*' || $field[2] eq $main::mycall) {
 
 
@@ -756,7 +780,7 @@ sub normal
 				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');
-					return;
+					next;
 				}
 
 				# update it if required