X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fdx.pl;h=956dc4c17b6a2e2233bb63b09862871fb3b2421f;hb=f91073b99369ea05c42364f9462695be7a67016d;hp=27099f243a2a5f9dba15ec8034da0f3f1d6ca296;hpb=ef77e5488c4cc47afe272f6220cc3fa0cddc5829;p=spider.git diff --git a/cmd/dx.pl b/cmd/dx.pl index 27099f24..956dc4c1 100644 --- a/cmd/dx.pl +++ b/cmd/dx.pl @@ -23,6 +23,13 @@ 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'; +$addr = $main::localhost_alias_ipv6 if $addr eq '::1' && $main::localhost_alias_ipv6; +$addr = $main::localhost_alias_ipv4 if $addr =~ /^127\./ && $main::localhost_alias_ipv4; + +Log('cmd', "$self->{call}|$addr|dx|$line"); + my @bad; if (@bad = BadWords::check($line)) { $self->badcount(($self->badcount||0) + @bad); @@ -38,14 +45,27 @@ 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; + return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv > 1; $spotter = uc $f[1]; - $line =~ s/\s*$f[0]\s+$f[1]\s+//; -# $line = $f[2]; - @f = split /\s+/, $line, 3; + $line =~ s/^\s*$f[0]\s+$f[1]\s+//; + @f = split /\s+/, $line, 3; return (1, $self->msg('dx2')) unless @f >= 2; } +my $ipaddr; +@f = split /\s+/, $line, 3; +if ($f[0] eq 'ip') { + return (1, $self->msg('e5')) unless $spotter && $self->priv > 1; + if (is_ipaddr($f[1])) { + $ipaddr = $f[1]; + } else { + return (1, $self->msg('dx4', $f[1])); + } + $line =~ s/^\s*$f[0]\s+$f[1]\s+//; + @f = split /\s+/, $line, 3; +} + + # get the freq and callsign either way round if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) { $spotted = uc $f[0]; @@ -56,14 +76,14 @@ if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) { } else { return (1, $self->msg('dx3')); } - - -my $ipaddr; -my $addr = $self->hostname; +$line =~ s/^\s*$f[0]//; +$line =~ s/^\s*$f[1]//; +$line =~ unpad($line); +$line =~ s/\t+/ /g; # do this here because it needs to be stopped ASAP! +$line ||= ' '; if ($self->conn && $self->conn->peerhost) { -# $ipaddr = $addr unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/; - $ipaddr = $addr; # force a PC61 + $ipaddr ||= $addr; # force a PC61 } elsif ($self->inscript) { $ipaddr = "script"; } @@ -78,7 +98,7 @@ my $callnoid = basecall($self->{call}); if ($DXProt::baddx->in($spotted)) { $localonly++; } -if ($DXProt::badspotter->in($spotternoid)) { +if ($DXProt::badspotter->in($spotternoid) || $self->badip) { LogDbg('DXCommand', "badspotter $spotternoid as $spotter ($oline) from $addr"); $localonly++; } @@ -90,10 +110,6 @@ if (($spotted =~ /$spotternoid/ || $spotted =~ /$callnoid/) && $freq < $Spot::mi $localonly++; } -# 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; my @bb; @@ -141,7 +157,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; @@ -157,15 +173,9 @@ if ($freq =~ /^69/ || $localonly) { return (1); } else { - # send orf to the users - my $spot; - - if ($ipaddr) { - $spot = DXProt::pc61($spotter, $freq, $spotted, $line, $ipaddr); - } - #else { - # $spot = DXProt::pc11($spotter, $freq, $spotted, $line); - #} + # send orf to the users + $ipaddr ||= $main::mycall; # emergency backstop + my $spot = DXProt::pc61($spotter, $freq, $spotted, unpad($line), $ipaddr); $self->dx_spot(undef, undef, @spot); if ($self->isslugged) { @@ -181,5 +191,3 @@ return (1, @out); - -