remove console warning, dupe fields

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 7cf460cc0d7d9a9b3319d0945b815fe8d3c49f56..e8e56dc1e596e91408cd50bab9e7544933a58fee 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -95,7 +95,7 @@ my $callnoid = basecall($self->{call});
 if ($DXProt::baddx->in($spotted)) {
        $localonly++; 
 }
-if ($DXProt::badspotter->in($spotternoid)) { 
+if ($DXProt::badspotter->in($spotternoid) || $self->badip) { 
        LogDbg('DXCommand', "badspotter $spotternoid as $spotter ($oline) from $addr");
        $localonly++; 
 }
@@ -172,7 +172,7 @@ if ($freq =~ /^69/ || $localonly) {
 } else {
        # send orf to the users
        $ipaddr ||= $main::mycall;      # emergency backstop
-       my $spot = DXProt::pc61($spotter, $freq, $spotted, $line,  $ipaddr);
+       my $spot = DXProt::pc61($spotter, $freq, $spotted, unpad($line),  $ipaddr);
        
        $self->dx_spot(undef, undef, @spot);
        if ($self->isslugged) {