Merge branch 'test' into mojo

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 7cf460cc0d7d9a9b3319d0945b815fe8d3c49f56..a6475347569bae6ce7084ada8aa4b6c3a09a9df7 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -24,7 +24,8 @@ return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
 return (1, $self->msg('e28')) unless $self->isregistered;
 
 
-my $addr = $self->hostname || '127.0.0.1';
+my $addr = DXCommandmode::alias_localhost($self->hostname || '127.0.0.1');
+
 Log('cmd', "$self->{call}|$addr|dx|$line");
 
 my @bad;
@@ -75,7 +76,7 @@ if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
 }
 $line =~ s/^\s*$f[0]//;
 $line =~ s/^\s*$f[1]//;
-$line =~ unpad($line);
+$line = unpad($line);
 $line =~ s/\t+/ /g;                            # do this here because it needs to be stopped ASAP!
 $line ||= ' ';
 
@@ -95,7 +96,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 +173,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) {