remove any leading ::ffff: on ipv4 addresses

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 78c5526b4ce4fd67f73d4d168a6f0c6bdb00b316..d7e34e61e7c927dd23840b50a75dfe8cd0676718 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1119,7 +1119,6 @@ sub process_rcmd
 {
        my ($self, $tonode, $fromnode, $user, $cmd) = @_;
 
-       Log('rcmd', 'in', ($ref->{priv}||0), $fromnode, $cmd);
        if ($tonode eq $main::mycall) {
                my $ref = DXUser::get_current($fromnode);
                unless ($ref && UNIVERSAL::isa($ref, 'DXUser')) {
@@ -1127,6 +1126,7 @@ sub process_rcmd
                        $self->send_rcmd_reply($main::mycall, $fromnode, $user, "sorry...!");
                        return;
                }
+               Log('rcmd', 'in', ($ref->{priv}||0), $fromnode, $cmd, $user);
                my $cref = Route::Node::get($fromnode);
                unless ($cref && UNIVERSAL::isa($cref, 'Route')) {
                        dbg("DXProt process_rcmd: Route $fromnode isn't a reference (tell G1TLH)"); 
@@ -1174,7 +1174,7 @@ sub send_rcmd_reply
        while (@_) {
                my $line = shift;
                $line =~ s/\s*$//;
-               Log('rcmd', 'out', $fromnode, $line);
+               Log('rcmd', 'out', $fromnode, $line, $user);
                if ($self->is_clx) {
                        $self->send(pc85($main::mycall, $fromnode, $user, "$main::mycall:$line"));
                } else {
@@ -1231,6 +1231,7 @@ sub spawn_cmd
                                 }
 
                                 my @res = $cmdref->(@$args);
+#                               diffms("by $call 1", $line, $t0, scalar @res) if isdbg('chan');
                                 return @res;
                         },
 #                       $args,
@@ -1260,7 +1261,7 @@ sub spawn_cmd
                                                 $self->send(@res);
                                         }
                                 }
-                                DXCommandmode::_diffms($call, $line, $t0);
+                                diffms("rcmd from $user on $call", $line, $t0, scalar @res) if isdbg('chan');
                         });
        
        return @out;