add ip addresses to dxspots emitted as PC61

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index fd233eb1afc55dedf78f50d0ca5e529975288c99..d8dd56cbbd7ee76bf0507242d3eea7d9d8ee1ead 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -5,7 +5,7 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my ($self, $line) = @_;
@@ -15,7 +15,16 @@ my $spotted;
 my $freq;
 my @out;
 my $valid = 0;
-return (1, $self->msg('e5')) if $self->remotecmd;
+my $localonly;
+return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
+return (1, $self->msg('e28')) unless $self->registered;
+
+my @bad;
+if (@bad = BadWords::check($line)) {   
+       $self->badcount(($self->badcount||0) + @bad);
+       LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")");
+       $localonly++; 
+}
 
 # do we have at least two args?
 return (1, $self->msg('dx2')) unless @f >= 2;
@@ -25,22 +34,41 @@ 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;
 }
 
 # get the freq and callsign either way round
-if ($f[0] =~ /[A-Za-z]/) {
+if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
        $spotted = uc $f[0];
        $freq = $f[1];
-} elsif ($f[0] =~ /^[0-9\.\,]+$/) {
+} elsif (is_freq($f[0]) && $f[1] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
     $freq = $f[0];
        $spotted = uc $f[1];
 } else {
-       return (1, $self->msg('dx2'));
+       return (1, $self->msg('dx3'));
+}
+
+# check some other things
+# remove ssid from calls
+my $callnoid = $self->call;
+$callnoid =~ s/-\d+$//;
+my $spotternoid = $spotter;
+$spotternoid =~ s/-\d+$//;
+if ($DXProt::baddx->in($spotted)) {
+       $localonly++; 
+}
+if ($DXProt::badspotter->in($callnoid)) { 
+       LogDbg('DXCommand', "$self->{call} badspotter with $callnoid ($line)");
+       $localonly++; 
+}
+if ($callnoid ne $spotternoid && $DXProt::badspotter->in($spotternoid)) { 
+       LogDbg('DXCommand', "$self->{call} badspotter with $spotternoid ($line)");
+       $localonly++; 
 }
 
 # make line the rest of the line
@@ -87,30 +115,43 @@ push @out, $self->msg('dx1', $freq) unless $valid;
 # check we have a callsign :-)
 if ($spotted le ' ') {
        push @out, $self->msg('dx2');
-       
        $valid = 0;
 }
 
 return (1, @out) unless $valid;
 
-my @bad;
-if (@bad = BadWords::check($line)) {
-       return (1, $self->msg('e17', @bad));
+my $ipaddr;
+
+if ($self->conn->peerhost) {
+       my $addr = $self->conn->peerhost;
+       $ipaddr = $addr unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
 }
 
 # Store it here (but only if it isn't baddx)
-if (grep $_ eq $spotted, @DXProt::baddx) {
-       my $buf = Spot::formatb($self->user->wantgrid, $freq, $spotted, $main::systime, $line, $spotter);
-       push @out, $buf;
+my $t = (int ($main::systime/60)) * 60;
+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);
+
+if ($freq =~ /^69/ || $localonly) {
+
+       # heaven forfend that we get a 69Mhz band :-)
+       if ($freq =~ /^69/) {
+               $self->badcount(($self->badcount||0) + 1);
+       }
+
+       $self->dx_spot(undef, undef, @spot);
+       return (1);
 } else {
-       return (1, $self->msg('dup')) if Spot::dup($freq, $spotted, (int ($main::systime/60)) * 60, $line);
-       my @spot = Spot::prepare($freq, $spotted, $main::systime, $line, $spotter, $main::mycall);
        if (@spot) {
                # store it 
                Spot::add(@spot);
 
                # send orf to the users
-               DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
+               if ($ipaddr) {
+                       DXProt::send_dx_spot($self, DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr), @spot);
+               } else {
+                       DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot);
+               }
        }
 }