X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fwho.pl;h=6ec7dba36a9b97a7f2776156f0b0fc30cf3f378d;hb=418c14238b85aa37a057588ad51848d785b52a5f;hp=34e2d0a4369b354a2f80865373d49978c84615ba;hpb=5acd1be649672f6e5bd2b4a6772b51cd935ebda9;p=spider.git diff --git a/cmd/who.pl b/cmd/who.pl index 34e2d0a4..6ec7dba3 100644 --- a/cmd/who.pl +++ b/cmd/who.pl @@ -11,14 +11,26 @@ my $self = shift; my $dxchan; my @out; -push @out, " Callsign Type Started Name"; +push @out, " Callsign Type Started Name Ave RTT Link"; 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 $name = $dxchan->user->name; - push @out, sprintf "%10s $sort $t $name", $call; + 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_node && $dxchan != $main::me ? sprintf("%5.2f", $dxchan->pingave) : " "; + my $conn = $dxchan->conn; + my $ip = ''; + $ip = $conn->{peerhost} if $conn && $conn->{peerhost}; + push @out, sprintf "%10s $type $sort $t %-10.10s $ping $ip", $call, $name; } return (1, @out)