projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
headline: RBN set/seeme
[spider.git]
/
cmd
/
dx.pl
diff --git
a/cmd/dx.pl
b/cmd/dx.pl
index 3aeca2ba3e075a060a6ea5c3bfa254215a52928b..e8e56dc1e596e91408cd50bab9e7544933a58fee 100644
(file)
--- a/
cmd/dx.pl
+++ b/
cmd/dx.pl
@@
-45,7
+45,7
@@
if ($f[0] =~ /^by$/i) {
return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv > 1;
$spotter = uc $f[1];
$line =~ s/^\s*$f[0]\s+$f[1]\s+//;
return (1, $self->msg('e5')) unless $main::allowdxby || $self->priv > 1;
$spotter = uc $f[1];
$line =~ s/^\s*$f[0]\s+$f[1]\s+//;
- @f = split /\s+/, $line, 3;
+ @f = split /\s+/, $line, 3;
return (1, $self->msg('dx2')) unless @f >= 2;
}
return (1, $self->msg('dx2')) unless @f >= 2;
}
@@
-75,7
+75,7
@@
if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
}
$line =~ s/^\s*$f[0]//;
$line =~ s/^\s*$f[1]//;
}
$line =~ s/^\s*$f[0]//;
$line =~ s/^\s*$f[1]//;
-$line =~
s/^\s*//
;
+$line =~
unpad($line)
;
$line =~ s/\t+/ /g; # do this here because it needs to be stopped ASAP!
$line ||= ' ';
$line =~ s/\t+/ /g; # do this here because it needs to be stopped ASAP!
$line ||= ' ';
@@
-95,7
+95,7
@@
my $callnoid = basecall($self->{call});
if ($DXProt::baddx->in($spotted)) {
$localonly++;
}
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++;
}
LogDbg('DXCommand', "badspotter $spotternoid as $spotter ($oline) from $addr");
$localonly++;
}
@@
-172,7
+172,7
@@
if ($freq =~ /^69/ || $localonly) {
} else {
# send orf to the users
$ipaddr ||= $main::mycall; # emergency backstop
} else {
# send orf to the users
$ipaddr ||= $main::mycall; # emergency backstop
- my $spot = DXProt::pc61($spotter, $freq, $spotted,
$line
, $ipaddr);
+ my $spot = DXProt::pc61($spotter, $freq, $spotted,
unpad($line)
, $ipaddr);
$self->dx_spot(undef, undef, @spot);
if ($self->isslugged) {
$self->dx_spot(undef, undef, @spot);
if ($self->isslugged) {