prevent PC92 A/C changing our $my(alias|call)

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index f1f72d4d5a7ada3eed523966fea020d4ccf5cca0..7cf460cc0d7d9a9b3319d0945b815fe8d3c49f56 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -23,6 +23,10 @@ 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';
+Log('cmd', "$self->{call}|$addr|dx|$line");
+
 my @bad;
 if (@bad = BadWords::check($line)) {   
        $self->badcount(($self->badcount||0) + @bad);
@@ -41,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+//;
-       @f = split /\s+/, $line, 3;
+       @f = split /\s+/, $line, 3; 
        return (1, $self->msg('dx2')) unless @f >= 2;
 }
 
@@ -52,7 +56,7 @@ if ($f[0] eq 'ip') {
        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;
@@ -69,13 +73,13 @@ if (is_freq($f[1]) && $f[0] =~ m{^[\w\d]+(?:/[\w\d]+){0,2}$}) {
 } 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 =~ unpad($line);
 $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";