X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Flinks.pl;h=f35545577dce2dd9f78eff231af216ed1428eb3c;hb=refs%2Fheads%2Fnewusers;hp=35142ce6f3df2f69c29e57952ad26ac59b1d510c;hpb=d2b28488d70d97c2e467cd7c57077024b7241b45;p=spider.git diff --git a/cmd/links.pl b/cmd/links.pl index 35142ce6..f3554557 100644 --- a/cmd/links.pl +++ b/cmd/links.pl @@ -15,8 +15,8 @@ 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(); @@ -27,8 +27,9 @@ foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) { 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 $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,7 +47,6 @@ 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; @@ -61,7 +61,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)