Now (apparent) apparently working

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index 46d427e0fb57333c5fe78a2425394429df65ac7c..17fd97b799d4fd348e63962ff182c402d3703e39 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -16,14 +16,18 @@ my $freq;
 my @out;
 my $valid = 0;
 my $localonly;
-return (1, $self->msg('e5')) if $self->remotecmd;
-return (1, $self->msg('e28')) unless $self->registered;
+my $oline = $line;
+
+#$DB::single=1;
+
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
+return (1, $self->msg('e28')) unless $self->isregistered;
 
 my @bad;
 if (@bad = BadWords::check($line)) {   
        $self->badcount(($self->badcount||0) + @bad);
-       Log('DXCommand', "$self->{call} swore: $line");
-       $localonly++;
+       LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
+       $localonly++; 
 }
 
 # do we have at least two args?
@@ -34,10 +38,11 @@ return (1, $self->msg('dx2')) unless @f >= 2;
 # can be in any order
 
 if ($f[0] =~ /^by$/i) {
+       return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv;
     $spotter = uc $f[1];
-    $line =~ s/^\s*$f[0]\s+$f[1]\s+//;
-       $line = $f[2];
-       @f = split /\s+/, $line;
+    $line =~ s/\s*$f[0]\s+$f[1]\s+//;
+#      $line = $f[2];
+       @f = split /\s+/, $line, 3;
        return (1, $self->msg('dx2')) unless @f >= 2;
 }
 
@@ -52,6 +57,39 @@ 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]+$/;
+       $ipaddr = $addr; # force a PC61 
+} elsif ($self->inscript) {
+       $ipaddr = "script";
+}
+
+# check some other things
+# remove ssid from calls
+my $spotternoid = basecall($spotter);
+my $callnoid = basecall($self->{call});
+
+#$DB::single = 1;
+
+if ($DXProt::baddx->in($spotted)) {
+       $localonly++; 
+}
+if ($DXProt::badspotter->in($spotternoid)) { 
+       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) from $addr, not passed on to cluster");
+       $localonly++;
+}
+
 # make line the rest of the line
 $line = $f[2] || " ";
 @f = split /\s+/, $line;
@@ -103,10 +141,12 @@ 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('dupspot')) if Spot::dup($freq, $spotted, $t, $line, $spotter);
-my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall);
+return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, $t, $line, $spotter);
+my @spot = Spot::prepare($freq, $spotted, $t, $line, $spotter, $main::mycall, $ipaddr);
+
+#$DB::single = 1;
 
-if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
+if ($freq =~ /^69/ || $localonly) {
 
        # heaven forfend that we get a 69Mhz band :-)
        if ($freq =~ /^69/) {
@@ -114,14 +154,27 @@ if ($DXProt::baddx->in($spotted) || $freq =~ /^69/ || $localonly) {
        }
 
        $self->dx_spot(undef, undef, @spot);
+
        return (1);
 } else {
-       if (@spot) {
-               # store it 
-               Spot::add(@spot);
-
                # send orf to the users
-               DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
+       my $spot;
+
+       if ($ipaddr) {
+               $spot = DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr);
+       }
+       #else {
+       #       $spot = DXProt::pc11($spotter, $freq, $spotted, $line);
+       #}
+       
+       $self->dx_spot(undef, undef, @spot);
+       dbg "$self->{call} islugged until " . atime($self->{isslugged}) if $self->{isslugged} && isdbg('sh/dx');
+       if ($self->isslugged) {
+               push @{$self->{sluggedpcs}}, [61, $spot, \@spot];
+       } else {
+               # store in spots database 
+               Spot::add(@spot);
+               DXProt::send_dx_spot($self, $spot, @spot);
        }
 }