projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow synonyms for localhost
[spider.git]
/
cmd
/
dx.pl
diff --git
a/cmd/dx.pl
b/cmd/dx.pl
index ea76aab58bb3e2e309e003223eb121bd9a41dc1e..d1e278837d49fe018083121bf7cf44b77050424b 100644
(file)
--- a/
cmd/dx.pl
+++ b/
cmd/dx.pl
@@
-24,7
+24,8
@@
return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript;
return (1, $self->msg('e28')) unless $self->isregistered;
return (1, $self->msg('e28')) unless $self->isregistered;
-my $addr = $self->hostname || '127.0.0.1';
+my $addr = DXCommandmode::alias_localhost($self->hostname || '127.0.0.1');
+
Log('cmd', "$self->{call}|$addr|dx|$line");
my @bad;
Log('cmd', "$self->{call}|$addr|dx|$line");
my @bad;
@@
-45,7
+46,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;
}
@@
-95,7
+96,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
+173,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) {