Added node type to links and who

diff --git a/Changes b/Changes
index 795bc107d17dc022cde6b2fccfa2fad51bfcb2e1..32d3844b245333f40c3a2385042f5612c3acd170 100644 (file)
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@
 2. Added G0RDI's 'links' command.
 3. added update_sysop.pl which cleans out all previous versions of the sysops
 information from the user database and recreates it with that in DXVars.pm
+4. Added node type to links and who
 14Jun00=======================================================================
 1. fixed sh/node crash
 2. fixed RTT in who.pl

diff --git a/cmd/links.pl b/cmd/links.pl
index 456ea72f2355b10e4865418aaeca193f7497ace5..017d61199d0912ed2db23b054550abb8635a6ec0 100644 (file)
--- a/cmd/links.pl
+++ b/cmd/links.pl
@@ -7,22 +7,27 @@
 #
 # 16-Jun-2000
 # $Id: links.pl
-
+#
 
 my $self = shift;
 my $dxchan;
 my @out;
 
-push @out, "  Callsign   Started                 Ave RTT";
+push @out, "  Callsign Type Started            Ave RTT";
 
 foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_ak1a ) {
        my $call = $dxchan->call();
        my $t = cldatetime($dxchan->startt);
+       my $sort;
        my $name = $dxchan->user->name || " ";
        my $ping = $dxchan->is_node && $dxchan != $DXProt::me ? sprintf("%8.2f",
                                                                                                                                        $dxchan->pingave) : "";
-       push @out, sprintf "%10s $t %-6.6s $ping", $call;
-
+       $sort = "DXSP" if $dxchan->is_spider;
+       $sort = "CLX " if $dxchan->is_clx;
+       $sort = "DXNT" if $dxchan->is_dxnet;
+       $sort = "AR-C" if $dxchan->is_arcluster;
+       $sort = "AK1A" if $dxchan->is_ak1a;
+       push @out, sprintf "%10s $sort $t $ping", $call;
 }
 
 return (1, @out)

diff --git a/cmd/who.pl b/cmd/who.pl
index c5d665d0554411ad2fbc4e28f35b066aa3abd5d1..8bd69e80a5e5599f1da118f595ce5f71e9f00c15 100644 (file)
--- a/cmd/who.pl
+++ b/cmd/who.pl
@@ -11,15 +11,23 @@ my $self = shift;
 my $dxchan;
 my @out;
 
-push @out, "  Callsign Type Started           Name                Ave RTT";
+push @out, "  Callsign Type      Started           Name                Ave RTT";
 
 foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all ) {
     my $call = $dxchan->call();
        my $t = cldatetime($dxchan->startt);
-       my $sort = $dxchan->is_node ? "NODE" : "USER";
+       my $type = $dxchan->is_node ? "NODE" : "USER";
+       my $sort = "    ";
+       if ($dxchan->is_node) {
+               $sort = "DXSP" if $dxchan->is_spider;
+               $sort = "CLX " if $dxchan->is_clx;
+               $sort = "DXNT" if $dxchan->is_dxnet;
+               $sort = "AR-C" if $dxchan->is_arcluster;
+               $sort = "AK1A" if $dxchan->is_ak1a;
+       }
        my $name = $dxchan->user->name || " ";
        my $ping = $dxchan->is_node && $dxchan != $DXProt::me ? sprintf("%8.2f", $dxchan->pingave) : "";
-       push @out, sprintf "%10s $sort $t %-18.18s $ping", $call, $name;
+       push @out, sprintf "%10s $type $sort $t %-18.18s $ping", $call, $name;
 }
 
 return (1, @out)