X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fwho.pl;h=8bd69e80a5e5599f1da118f595ce5f71e9f00c15;hb=9e6f8da122e48430e5b56b27cf7d06c688cb2e13;hp=beea0071703f1d5be284d080d9407c4da1b46bfd;hpb=7fa741009758c923fab8d80c4a4c5722b4f6146f;p=spider.git

diff --git a/cmd/who.pl b/cmd/who.pl
index beea0071..8bd69e80 100644
--- a/cmd/who.pl
+++ b/cmd/who.pl
@@ -11,16 +11,23 @@ my $self = shift;
 my $dxchan;
 my @out;
 
-push @out, "  Callsign Type Started           Name";
+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->user->lastin);
-	my $sort = $dxchan->is_ak1a() ? "NODE" : "USER";
+	my $t = cldatetime($dxchan->startt);
+	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_ak1a ? sprintf("(rtt %.2f secs)", $dxchan->pingave) : "";
-	$ping = "" if $dxchan->call eq $main::mycall;
-	push @out, sprintf "%10s $sort $t $name $ping", $call;
+	my $ping = $dxchan->is_node && $dxchan != $DXProt::me ? sprintf("%8.2f", $dxchan->pingave) : "";
+	push @out, sprintf "%10s $type $sort $t %-18.18s $ping", $call, $name;
 }
 
 return (1, @out)