From: djk <djk>
Date: Sat, 20 Nov 1999 15:29:19 +0000 (+0000)
Subject: added $@ and $! to see if we can store this stuff
X-Git-Tag: R_1_35~12
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=f3b23f65ec3e143910ec6a6c36cfe1ab37f0338c;p=spider.git

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

diff --git a/Changes b/Changes
index e0431359..446a8500 100644
--- 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 6f9d545d..17f0c947 100644
--- 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 63260231..80ef17ef 100644
--- 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 b8d56397..ff746b5e 100644
--- 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 b67b9ff8..dd12a9df 100755
--- 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)