fix dx and import_cmd problems

diff --git a/Changes b/Changes
index 91ddd8ab894f87fdca26d9c52f1037d9d7771150..cbe6ff9388c75510d14aac9427d8dcd493d840f5 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,8 @@
+12Jan14=======================================================================
+1. Fix minor issue with dx command when used in a script, as found by
+   Christian Furst.
+2. Fix (rather serious) error in import_cmd that did not reset callsigns
+   correctly in $main::me.
 30Dec13=======================================================================
 1. Add CTY2312 prefix changes
 19Nov13=======================================================================

diff --git a/cmd/dx.pl b/cmd/dx.pl
index d8dd56cbbd7ee76bf0507242d3eea7d9d8ee1ead..18687a6843b5780758010684d68d8c9d3e8efaad 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -122,9 +122,11 @@ return (1, @out) unless $valid;
 
 my $ipaddr;
 
-if ($self->conn->peerhost) {
+if ($self->conn && $self->conn->peerhost) {
        my $addr = $self->conn->peerhost;
        $ipaddr = $addr unless !is_ipaddr($addr) || $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
+} elsif ($self->inscript) {
+       $ipaddr = "script";
 }
 
 # Store it here (but only if it isn't baddx)

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index ad9baad05832ed2d087ee479f1d9a84a52acb519..35c92341d17cbc896a0a64d6941e9a3d156dea77 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -1194,7 +1194,7 @@ sub import_cmd
                                                $dxchan->{priv} = $u->priv;
                                                $dxchan->{user} = $u;
                                                @out = $s->run($dxchan, 1);
-                                               $dxchan->{call} = $call;
+                                               $dxchan->{call} = $old;
                                                $dxchan->{priv} = $priv;
                                                $dxchan->{user} = $user;
                                        } else {

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 59deac9d13ead66155e7957b011bcbcfa246b733..3c2311404065fbcbbf026e17dc5c86da4acbd5e2 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -955,7 +955,7 @@ sub broadcast_pc92_update
 
        my $nref = Route::Node::get($call);
        unless ($nref) {
-               dbg("ERROR: broadcast_pc92_update - Route::Node $call disappeared");
+               cluck("ERROR: broadcast_pc92_update - Route::Node $call disappeared");
                return;
        }
        my $l = $nref->last_PC92C(gen_my_pc92_config($nref));
@@ -973,7 +973,7 @@ sub broadcast_pc92_keepalive
 
        my $nref = Route::Node::get($call);
        unless ($nref) {
-               dbg("ERROR: broadcast_pc92_keepalive - Route::Node $call disappeared");
+               cluck("ERROR: broadcast_pc92_keepalive - Route::Node $call disappeared");
                return;
        }
        my $l = pc92k($nref);

diff --git a/perl/Version.pm b/perl/Version.pm
index d0b06da1430bfcc644697647c5d0a31f02fac280..c531ab5fc51f07796c4e22ab4f841c7d67733c69 100644 (file)
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,7 +11,7 @@ use vars qw($version $subversion $build $gitversion);
 
 $version = '1.55';
 $subversion = '0';
-$build = '138';
-$gitversion = '9e086e9';
+$build = '140';
+$gitversion = '94c061b';
 
 1;