make set/badnode and badspotter apply to announces and talks as well

diff --git a/Changes b/Changes
index ab3605e267e6c61afe82e41a2b5925c5eb665e54..a610e5193bc70a5c28b299eb71eb18db49cb8633 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,10 +1,13 @@
+19Jun02=======================================================================
+1. make set/badspotter and set/badnode apply to announces and talks as well
+as spots. 
 12Jun02=======================================================================
 1. fixed (un)set/wwv and (un)set/wcy so they don't issue spurious messages.
 Thanks Rene (oz1lqh)
 07Jun02=======================================================================
 1. fix messages in DXDb.pm to point to the correct ones. Thanks Rene (oz1lqh)
 2. add missing wcys and wcyu messages to Messages. Thanks Rene (again)
-2. upissue version number to 1.50 (finally)
+3. upissue version number to 1.50 (finally)
 16Apr02=======================================================================
 1. allow the rest of PC19 to continue if it contains a reference to a locally
 connected node. Thank you Tommy SM3OSM.

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index cab45621fdb22d4f76511040475cbf00c3ba3ccb..ba79e43e0419ffab6a528e62123ba5ae41886929 100644 (file)
--- 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) {