X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Flinks.pl;h=ab3f27a2438d0592b51a6b65427f8f6f002eedd3;hb=963a74a359bda8ac6c348977f70d85e8e879697a;hp=35142ce6f3df2f69c29e57952ad26ac59b1d510c;hpb=d2b28488d70d97c2e467cd7c57077024b7241b45;p=spider.git

diff --git a/cmd/links.pl b/cmd/links.pl
index 35142ce6..ab3f27a2 100644
--- a/cmd/links.pl
+++ b/cmd/links.pl
@@ -15,20 +15,22 @@ my $dxchan;
 my @out;
 my $nowt = time;
 
-push @out, "                                      Ave  Obs  Ping  Next      Filters";
-push @out, "  Callsign Type Started               RTT Count Int.  Ping Iso? In  Out PC92? Address";
+push @out, "                                                  Ave  Obs  Ping  Next      Filters";
+push @out, "  Callsign Type Started                 Uptime    RTT Count Int.  Ping Iso? In  Out PC92? Address";
 
-foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) {
-	my $call = $dxchan->call();
+foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all ) {
 	next if $dxchan == $main::me;
+	next unless $dxchan->is_node || $dxchan->is_rbn;
+	my $call = $dxchan->call();
 	my $t = cldatetime($dxchan->startt);
 	my $sort;
 	my $name = $dxchan->user->name || " ";
 	my $obscount = $dxchan->nopings;
 	my $pingint = $dxchan->pingint;
 	my $lastt = $dxchan->lastping ? ($dxchan->pingint - ($nowt - $dxchan->lastping)) : $pingint;
-	my $ping = $dxchan->is_node && $dxchan != $main::me ? sprintf("%8.2f",$dxchan->pingave) : "";
-	my $iso = $dxchan->isolate ? 'Y' :' ';
+	my $ping = $dxchan->is_node && $dxchan != $main::me ? sprintf("%7.2f",$dxchan->pingave) : "";
+	my $iso = $dxchan->isolate ? 'Y' : ' ';
+	my $uptime = difft($dxchan->startt, 1);
 	my ($fin, $fout, $pc92) = (' ', ' ', ' ');
 	if ($dxchan->do_pc9x) {
 		$pc92 = 'Y';
@@ -46,12 +48,12 @@ foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) {
 		$ping = "        ";
 	}
 
-	$sort = 'ANEA' if $dxchan->is_aranea;
 	$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;
+	$sort = "RBN " if $dxchan->is_rbn;
 	my $ipaddr;
 
 	my $addr = $dxchan->hostname;
@@ -61,7 +63,7 @@ foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) {
 	}
 	$ipaddr = 'ax25' if $dxchan->conn->ax25;
 
-	push @out, sprintf "%10s $sort $t$ping   $obscount  %5d %5d  $iso    $fin   $fout   $pc92    $ipaddr", $call, $pingint, $lastt;
+	push @out, sprintf "%10s $sort $t%13s$ping   $obscount  %5d %5d  $iso    $fin   $fout   $pc92    $ipaddr", $call, $uptime ,$pingint, $lastt;
 }
 
 return (1, @out)