Fix create_sysop.pl to work on base git install

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 0a790a93e4512db4a10f53aa60328c031a00b45b..c18a2df372f9d7751e8df8adcc7182a611b8ab64 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -55,6 +55,16 @@ if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
        return (1, $self->msg('dx3'));
 }
 
+
+my $ipaddr;
+my $addr = $self->hostname;
+
+if ($self->conn && $self->conn->peerhost) {
+       $ipaddr = $addr unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
+} elsif ($self->inscript) {
+       $ipaddr = "script";
+}
+
 # check some other things
 # remove ssid from calls
 my $spotternoid = basecall($spotter);
@@ -66,14 +76,14 @@ if ($DXProt::baddx->in($spotted)) {
        $localonly++; 
 }
 if ($DXProt::badspotter->in($spotternoid)) { 
-       LogDbg('DXCommand', "badspotter $spotternoid as $spotter ($oline)");
+       LogDbg('DXCommand', "badspotter $spotternoid as $spotter ($oline) from $addr");
        $localonly++; 
 }
 
 dbg "spotter $spotternoid/$callnoid\n";
 
 if (($spotted =~ /$spotternoid/ || $spotted =~ /$callnoid/) && $freq < $Spot::minselfspotqrg) {
-       LogDbg('DXCommand', "$spotternoid/$callnoid trying to self spot below ${Spot::minselfspotqrg}KHz ($oline), not passed on to cluster");
+       LogDbg('DXCommand', "$spotternoid/$callnoid trying to self spot below ${Spot::minselfspotqrg}KHz ($oline) from $addr, not passed on to cluster");
        $localonly++;
 }
 
@@ -126,15 +136,6 @@ if ($spotted le ' ') {
 
 return (1, @out) unless $valid;
 
-my $ipaddr;
-
-if ($self->conn && $self->conn->peerhost) {
-       my $addr = $self->hostname;
-       $ipaddr = $addr unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
-} elsif ($self->inscript) {
-       $ipaddr = "script";
-}
-
 # 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);
@@ -155,11 +156,15 @@ if ($freq =~ /^69/ || $localonly) {
                Spot::add(@spot);
 
                # send orf to the users
+               my $spot;
+
                if ($ipaddr) {
-                       DXProt::send_dx_spot($self, DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr), @spot);
+                       $spot = DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr);
                } else {
-                       DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
+                       $spot = DXProt::pc11($spotter, $freq, $spotted, $line);
                }
+
+               DXProt::send_dx_spot($self, $spot, @spot);
        }
 }