From: Dirk Koopman <djk@tobit.co.uk>
Date: Sun, 21 Jul 2013 22:17:46 +0000 (+0100)
Subject: add ip address to links command
X-Git-Tag: 1.57~18
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=503168fd0f513720c544c62a593b8d9cb2bb778d;p=spider.git

add ip address to links command
---

diff --git a/Changes b/Changes
index 2e2993db..b49607e2 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@
 2. Add latest CTY2307 prefix changes.
 3. Other changes including (some) more prefix files, 4mm band data and 
    DXSql/Pg.pm
+4. Add ip address in links.pl
 31May12=======================================================================
 1. Added CTY2210 prefix changes
 29May12=======================================================================
diff --git a/cmd/links.pl b/cmd/links.pl
index 419de189..a66ee194 100644
--- a/cmd/links.pl
+++ b/cmd/links.pl
@@ -16,7 +16,7 @@ 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?";
+push @out, "  Callsign Type Started               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();
@@ -51,7 +51,15 @@ 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;
-	push @out, sprintf "%10s $sort $t$ping   $obscount  %5d %5d  $iso    $fin   $fout   $pc92", $call, $pingint, $lastt;
+	my $ipaddr;
+
+	if ($dxchan->conn->peerhost) {
+		my $addr = $dxchan->conn->peerhost;
+		$ipaddr = $addr if is_ipaddr($addr);
+		$ipaddr = 'local' if $addr =~ /^127\./ || $addr =~ /^::[0-9a-f]+$/;
+	}			
+
+	push @out, sprintf "%10s $sort $t$ping   $obscount  %5d %5d  $iso    $fin   $fout   $pc92    $ipaddr", $call, $pingint, $lastt;
 }
 
 return (1, @out)