added $@ and $! to see if we can store this stuff

diff --git a/Changes b/Changes
index e04313598538149d6fcdaec894790ab73bdbb0d4..446a850093c063d52653e81a47468187dc302167 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,8 @@
 19Nov99=======================================================================
 1. Added new version of sh/sun and also sh/moon from Steve K9AN
 2. Added rtt to who.
+3. added Aliase for show/tnc_sta to who.
+4. added Alias for show/uptime to sh/cl 
 18Nov99=======================================================================
 1. Added ping obs counter together with Time::HiRes timers. This will dis-
 connect nodes that fail to respond to 3 ping requests (on the 4th attempt). 

diff --git a/cmd/Aliases b/cmd/Aliases
index 6f9d545d19d0f12c382d8dc392e2bd1de154b2c6..17f0c9474f3ed1608bda67c9c9e19f7744fe309f 100644 (file)
--- a/cmd/Aliases
+++ b/cmd/Aliases
@@ -83,6 +83,7 @@ package CmdAlias;
        ],
        's' => [
          '^s/p$', 'send', 'send',
+         '^sb$', 'send noprivate', 'send',
          '^set/nobe', 'unset/beep', 'unset/beep',
          '^set/nohe', 'unset/here', 'unset/here',
          '^set/noan', 'unset/announce', 'unset/announce',
@@ -91,6 +92,8 @@ package CmdAlias;
          '^set/noww', 'unset/wwv', 'unset/wwv',
          '^set/nowx', 'unset/wx', 'unset/wx',
          '^sh$', 'show', 'show',
+      '^sh\w*/up', 'show/cluster', 'show/cluster',
+         '^sh\w*/tnc', 'who', 'who',
          '^sh\w*/bu', 'show/files bulletins', 'show/files',
          '^sh\w*/c/n', 'show/configuration nodes', 'show/configuration',
          '^sh\w*/c$', 'show/configuration', 'show/configuration',
@@ -98,10 +101,10 @@ package CmdAlias;
          '^sh\w*/dx/(\d+)-(\d+)', 'show/dx $1-$2', 'show/dx',
          '^sh\w*/dx/(\d+)', 'show/dx $1', 'show/dx',
          '^sh\w*/dx/d(\d+)', 'show/dx from $1', 'show/dx',
-         '^sp$', 'send', 'send',
-         '^sb$', 'send noprivate', 'send',     
          '^sh\w*/w\w*/(\d+)-(\d+)', 'show/wwv $1-$2', 'show/wwv',
          '^sh\w*/w\w*/(\d+)', 'show/wwv $1', 'show/wwv',
+         '^sp$', 'send', 'send',
+       
     ],
        't' => [
          '^ta$', 'talk', 'talk',

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 632602313238c659c416fdafb1a5cb8163833efa..80ef17ef3336f6fb9fb9bb8407a8649ae7b79696 100644 (file)
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -27,6 +27,8 @@ $fp = DXLog::new('debug', 'dat', 'd');
 sub _store
 {
        my $t = time; 
+       $fp->writeunix($t, "$t^$@") if $@; 
+       $fp->writeunix($t, "$t^$!") if $!; 
        for (@_) {
                $fp->writeunix($t, "$t^$_"); 
                print STDERR $_;

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index b8d563979b762f12e7e0ebf7db3ed37560a956aa..ff746b5e116667eb1bcd3954eaae913da5182155 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -816,7 +816,7 @@ sub finish
        my $ref = DXCluster->get_exact($call);
        
        $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
-
+       
        # unbusy and stop and outgoing mail
        my $mref = DXMsg::get_busy($call);
        $mref->stop_msg($call) if $mref;

diff --git a/perl/cluster.pl b/perl/cluster.pl
index b67b9ff88e98b4c150a29d77dd61897ded2d0370..dd12a9dfe22dc564058cadadb463bde7994f281a 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -104,7 +104,9 @@ sub rec
        my $dxchan = DXChannel->get_by_cnum($conn); # get the dxconnnect object for this message
        
        if (defined $err && $err) {
-               disconnect($dxchan) if defined $dxchan;
+               if ($dxchan) {
+                       disconnect($dxchan);
+               }
                return;
        }
        
@@ -266,6 +268,7 @@ sub process_inqueue
                $dxchan->normal($line);
                disconnect($dxchan) if ($dxchan->{state} eq 'bye');
        } elsif ($sort eq 'Z') {
+               $dxchan->conn(undef);
                disconnect($dxchan);
        } elsif ($sort eq 'D') {
                ;                       # ignored (an echo)