fix // in talk

s/bestdxchan/dxchan/ in rspfcheck

diff --git a/Changes b/Changes
index 6dafb764567af4d0bb5aa763cc3e9639eddff51e..02e85d5aa91a8d2ee20252525f81079000c47f73 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+30Jul04=======================================================================
+1. make sure that // is not converted to / in command lines.
 28Jul04=======================================================================
 1. backported 'Investigate' from NP branch so that only pingable nodes
 are 'believed'.

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 829c6b55585bf0022e6f96c28a17be6d368d5798..d0c995d9756c3bd582e3ed2c9db8766f6b38d5a0 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -524,7 +524,7 @@ sub rspfcheck
 {
        my ($self, $flag, $node, $user) = @_;
        my $nref = Route::Node::get($node);
-       my $dxchan = $nref->bestdxchan if $nref;
+       my $dxchan = $nref->dxchan if $nref;
        if ($nref && $dxchan) {
            if ($dxchan == $self) {
                        return 1 unless $user;
@@ -533,7 +533,7 @@ sub rspfcheck
                        return 1 if @users == 0 || grep $user eq $_, @users;
                        dbg("RSPF: $user not on $node") if isdbg('chanerr');
                } else {
-                       dbg("RSPF: Shortest path for $node is " . $nref->bestdxchan->{call}) if isdbg('chanerr');
+                       dbg("RSPF: Shortest path for $node is " . $nref->dxchan->{call}) if isdbg('chanerr');
                }
        } else {
                return 1 if $flag;

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index aa6f743d39d3657546cee962364193c26b4ac044..ac141b363cd0942462f6f0634fc17a5852117869 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -418,15 +418,14 @@ sub run_cmd
 
        return () if length $cmdline == 0;
                
-       # strip out //
-       $cmdline =~ s|//|/|og;
-               
        # split the command line up into parts, the first part is the command
        my ($cmd, $args) = split /\s+/, $cmdline, 2;
        $args = "" unless defined $args;
                
        if ($cmd) {
-                       
+               # strip out // on command only
+               $cmd =~ s|//|/|g;
+                                       
                my ($path, $fcmd);
                        
                dbg("cmd: $cmd") if isdbg('command');