mega-merge of major parts of mojo

[spider.git] / cmd / who.pl

diff --git a/cmd/who.pl b/cmd/who.pl
index b068c586aa38a381d930c04253d665966763c687..4371b08d3ed3e28afbf162129eaabc11e2afb65b 100644 (file)
--- a/cmd/who.pl
+++ b/cmd/who.pl
@@ -19,19 +19,23 @@ foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all ) {
        my $type = $dxchan->is_node ? "NODE" : "USER";\r
        my $sort = "    ";\r
        if ($dxchan->is_node) {\r
-               $sort = 'ANEA' if $dxchan->is_aranea;\r
                $sort = "DXSP" if $dxchan->is_spider;\r
                $sort = "CLX " if $dxchan->is_clx;\r
                $sort = "DXNT" if $dxchan->is_dxnet;\r
                $sort = "AR-C" if $dxchan->is_arcluster;\r
                $sort = "AK1A" if $dxchan->is_ak1a;\r
+       } else {\r
+               $sort = "LOCL" if $dxchan->conn->isa('IntMsg');\r
+               $sort = "WEB " if $dxchan->is_web;\r
+               $sort = "EXT " if $dxchan->conn->isa('ExtMsg');\r
+               $type = "RBN " if $dxchan->is_rbn;              # Yes, this is NOT a typo\r
        }\r
        my $name = $dxchan->user->name || " ";\r
        my $ping = $dxchan->is_node && $dxchan != $main::me ? sprintf("%5.2f", $dxchan->pingave) : "     ";\r
        my $conn = $dxchan->conn;\r
        my $ip = '';\r
        if ($conn) {\r
-               $ip = $conn->{peerhost} if exists $conn->{peerhost};\r
+               $ip = $dxchan->hostname;\r
                $ip = "AGW Port ($conn->{agwport})" if exists $conn->{agwport};\r
        }\r
        push @out, sprintf "%10s $type $sort $t %-10.10s $ping $ip", $call, $name;\r