my $localonly;
my $oline = $line;
-#$DB::single=1;
+$DB::single=1;
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';
+Log('cmd', "$self->{call}|$addr|dx|$line");
+
my @bad;
if (@bad = BadWords::check($line)) {
$self->badcount(($self->badcount||0) + @bad);
if (is_ipaddr($f[1])) {
$ipaddr = $f[1];
} else {
- return (1, $self->msg('dx3', $f[1]));
+ return (1, $self->msg('dx4', $f[1]));
}
$line =~ s/^\s*$f[0]\s+$f[1]\s+//;
@f = split /\s+/, $line, 3;
} else {
return (1, $self->msg('dx3'));
}
-$line =~ s/^\s*$f[0]\s+$f[1]\s+//;
+$line =~ s/^\s*$f[0]//;
+$line =~ s/^\s*$f[1]//;
+$line =~ s/^\s*//;
$line =~ s/\t+/ /g; # do this here because it needs to be stopped ASAP!
$line ||= ' ';
-my $addr = $self->hostname;
if ($self->conn && $self->conn->peerhost) {
-# $ipaddr = $addr unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
$ipaddr ||= $addr; # force a PC61
} elsif ($self->inscript) {
$ipaddr = "script";
# 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;
} 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, $line, $ipaddr);
$self->dx_spot(undef, undef, @spot);
if ($self->isslugged) {
-
-