set def sendverity=0, some hostname changes

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index f86b46a681c00299ba77d5efbc7e596123b01d16..4a80df0e2fae37ab9202c2786b352383b6ff0d67 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -23,6 +23,10 @@ my $oline = $line;
 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'
+Log('cmd', "$self->{call}|$addr|dx|$line");
+
 my @bad;
 if (@bad = BadWords::check($line)) {   
        $self->badcount(($self->badcount||0) + @bad);
@@ -73,9 +77,7 @@ $line =~ s/^\s*$f[0]\s+$f[1]\s+//;
 $line =~ s/\t+/ /g;                            # do this here because it needs to be stopped ASAP!
 $line ||= ' ';
 
-my $addr = $self->hostname;
 if ($self->conn && $self->conn->peerhost) {
-#      $ipaddr = $addr unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
        $ipaddr ||= $addr; # force a PC61 
 } elsif ($self->inscript) {
        $ipaddr = "script";
@@ -150,7 +152,7 @@ return (1, @out) unless $valid;
 
 # Store it here (but only if it isn't baddx)
 my $t = (int ($main::systime/60)) * 60;
-return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line, $spotter);
+return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line, $spotter, $main::mycall);
 my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall, $ipaddr);
 
 #$DB::single = 1;
@@ -168,7 +170,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, $line,  $ipaddr);
        
        $self->dx_spot(undef, undef, @spot);
        if ($self->isslugged) {
@@ -184,5 +186,3 @@ return (1, @out);
 
 
 
-
-