projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add an RBN line to progress
[spider.git]
/
cmd
/
links.pl
diff --git
a/cmd/links.pl
b/cmd/links.pl
index a66ee19469cd70404adabb9698b9207a97fc0c1a..f35545577dce2dd9f78eff231af216ed1428eb3c 100644
(file)
--- a/
cmd/links.pl
+++ b/
cmd/links.pl
@@
-15,8
+15,8
@@
my $dxchan;
my @out;
my $nowt = time;
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_nodes ) {
my $call = $dxchan->call();
@@
-25,10
+25,11
@@
foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) {
my $sort;
my $name = $dxchan->user->name || " ";
my $obscount = $dxchan->nopings;
my $sort;
my $name = $dxchan->user->name || " ";
my $obscount = $dxchan->nopings;
- my $lastt = $dxchan->pingint - ($nowt - $dxchan->lastping);
my $pingint = $dxchan->pingint;
my $pingint = $dxchan->pingint;
- my $ping = $dxchan->is_node && $dxchan != $main::me ? sprintf("%8.2f",$dxchan->pingave) : "";
+ 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 $iso = $dxchan->isolate ? 'Y' :' ';
+ my $uptime = difft($dxchan->startt, 1);
my ($fin, $fout, $pc92) = (' ', ' ', ' ');
if ($dxchan->do_pc9x) {
$pc92 = 'Y';
my ($fin, $fout, $pc92) = (' ', ' ', ' ');
if ($dxchan->do_pc9x) {
$pc92 = 'Y';
@@
-45,7
+46,7
@@
foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) {
$lastt = 0;
$ping = " ";
}
$lastt = 0;
$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 = "DXSP" if $dxchan->is_spider;
$sort = "CLX " if $dxchan->is_clx;
$sort = "DXNT" if $dxchan->is_dxnet;
@@
-53,13
+54,14
@@
foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) {
$sort = "AK1A" if $dxchan->is_ak1a;
my $ipaddr;
$sort = "AK1A" if $dxchan->is_ak1a;
my $ipaddr;
- if ($dxchan->conn->peerhost) {
- my $addr = $dxchan->conn->peerhost;
-
$ipaddr = $addr if is_ipaddr($addr);
+ my $addr = $dxchan->hostname;
+ if ($addr) {
+ $ipaddr = $addr if is_ipaddr($addr);
$ipaddr = 'local' if $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
$ipaddr = 'local' if $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
- }
+ }
+ $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)
}
return (1, @out)