X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Flinks.pl;h=ed4082ff72a4e61af5df563a58c3181cb5a64752;hb=841b61045ab2b8fa959eed04909c17e092b7a16c;hp=f35545577dce2dd9f78eff231af216ed1428eb3c;hpb=59bc57a3789ea433e1edb6e41c47ecf0aba95705;p=spider.git diff --git a/cmd/links.pl b/cmd/links.pl index f3554557..ed4082ff 100644 --- a/cmd/links.pl +++ b/cmd/links.pl @@ -18,17 +18,18 @@ my $nowt = time; 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("%7.2f",$dxchan->pingave) : ""; - my $iso = $dxchan->isolate ? 'Y' :' '; + my $ping = sprintf("%7.2f", $dxchan->pingave || 0); + my $iso = $dxchan->isolate ? 'Y' : ' '; my $uptime = difft($dxchan->startt, 1); my ($fin, $fout, $pc92) = (' ', ' ', ' '); if ($dxchan->do_pc9x) { @@ -42,9 +43,10 @@ foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) { $fout = $dxchan->routefilter =~ /node_default/ ? 'D' : 'Y'; } } - unless ($pingint) { + unless ($pingint && $ping) { $lastt = 0; - $ping = " "; + $ping = ' '; + $obscount = ' '; } $sort = "DXSP" if $dxchan->is_spider; @@ -52,6 +54,7 @@ foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) { $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;