X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=3fd00e6bb1bce1a4e56169f231d3a378095f2331;hb=refs%2Fheads%2Fnewusers;hp=0ebfb1674cf17564919eea7f243e8e259ba62315;hpb=7ab17f423e9d5f27589cfe31ad962c4ea10e54f5;p=spider.git diff --git a/cmd/dx.pl b/cmd/dx.pl index 0ebfb167..3fd00e6b 100644 --- a/cmd/dx.pl +++ b/cmd/dx.pl @@ -5,16 +5,26 @@ # # Copyright (c) 1998 Dirk Koopman G1TLH # -# $Id$ +# # my ($self, $line) = @_; -my @f = split /\s+/, $line; +my @f = split /\s+/, $line, 3; my $spotter = $self->call; my $spotted; my $freq; my @out; my $valid = 0; +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; @@ -24,24 +34,46 @@ 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+//; - shift @f; - shift @f; + $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++; } -$line =~ s/^$f[0]\s+$f[1]\s*//; + +# make line the rest of the line +$line = $f[2] || " "; +@f = split /\s+/, $line; # bash down the list of bands until a valid one is reached my $bandref; @@ -83,31 +115,51 @@ 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; -# change ^ into : for transmission -$line =~ s/\^/:/og; +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) -if (grep $_ eq $spotted, @DXProt::baddx) { - my $buf = Spot::formatb($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 { - my @spot = Spot::add($freq, $spotted, $main::systime, $line, $spotter, $main::mycall); if (@spot) { - # send orf to the users - DXProt::send_dx_spot($self, DXProt::pc11($spotter, $freq, $spotted, $line), @spot); - -# my $buf = Spot::formatb($freq, $spotted, $main::systime, $line, $spotter); -# DXProt::broadcast_users("$buf\a\a", 'dx', $spot[0]); + # store it + Spot::add(@spot); - # send it orf to the cluster (hang onto your tin helmets) -# DXProt::broadcast_all_ak1a(DXProt::pc11($spotter, $freq, $spotted, $line), $DXProt::me); + # send orf to the users + 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); + } } } return (1, @out); + + + + +