started OOing of PC protocol stuff

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 310416e8dfda883713b863a969a080867e2d55a6..5ba3b2bd97b0feb7192a2a3847b3e2bf89a693d4 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -159,7 +159,7 @@ sub normal
        return if $pcno < 10 || $pcno > 99;
 
        # dump bad protocol messages
-       if ($line =~ /\%[01][0-9A-F]/) {
+       if ($pcno != 29 && $line =~ /\%[01][0-9A-F]/) {
                dbg('chan', "CORRUPT protocol message - dumped");
                return;
        }
@@ -315,7 +315,7 @@ sub normal
                }
                
                if ($pcno == 12) {              # announces
-                       unless (is_callsign($field[1]) && is_callsign($field[2]) && is_callsign($field[5])) {
+                       unless (is_callsign($field[1]) && is_callsign($field[5])) {
                                dbg('chan', "Corrupt announce, rejected");
                                return;
                        }
@@ -1426,11 +1426,6 @@ sub disconnect
        $self->SUPER::disconnect;
 }
 
-# check that a field only has callsign characters in it
-sub is_callsign
-{
-       return $_[0] !~ /[^A-Z0-9\-]/
-}
 
 # 
 # send a talk message to this thingy