X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Flinks.pl;h=e53917b4f0e282f6a5541b5cd2f34ba0360e162b;hb=cfa6a715412c7c4972ec85034bd2d945751317cb;hp=a66ee19469cd70404adabb9698b9207a97fc0c1a;hpb=503168fd0f513720c544c62a593b8d9cb2bb778d;p=spider.git

diff --git a/cmd/links.pl b/cmd/links.pl
index a66ee194..e53917b4 100644
--- a/cmd/links.pl
+++ b/cmd/links.pl
@@ -25,8 +25,8 @@ foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) {
 	my $sort;
 	my $name = $dxchan->user->name || " ";
 	my $obscount = $dxchan->nopings;
-	my $lastt = $dxchan->pingint - ($nowt - $dxchan->lastping);
 	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 ($fin, $fout, $pc92) = (' ', ' ', ' ');
@@ -45,7 +45,7 @@ foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) {
 		$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;
@@ -53,11 +53,12 @@ foreach $dxchan ( sort {$a->call cmp $b->call} DXChannel::get_all_nodes ) {
 	$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 = 'ax25' if $dxchan->conn->ax25;
 
 	push @out, sprintf "%10s $sort $t$ping   $obscount  %5d %5d  $iso    $fin   $fout   $pc92    $ipaddr", $call, $pingint, $lastt;
 }