remove $id$ strings from BPQ changes

[spider.git] / cmd / show / connect.pl

diff --git a/cmd/show/connect.pl b/cmd/show/connect.pl
index 708113769fbb74008d17b6c8c493efd4909233ef..89aef0c94d272f6529bd7cbba2dc69f8a874df2f 100644 (file)
--- a/cmd/show/connect.pl
+++ b/cmd/show/connect.pl
@@ -3,7 +3,7 @@
 #
 # Copyright (c) 2001 Dirk Koopman G1TLH
 #
-# $Id$
+#
 #
 
 my $self = shift;
@@ -11,22 +11,31 @@ return (1, $self->msg('e5')) if $self->priv < 1;
 my @out;
 my $count;
 
-push @out, "Cnum Call      Address/Port              State  Type   Dir.";
+push @out, "Cnum Call      Address/Port              State  Type   Dir.     Module";
 
 foreach my $call (sort keys %Msg::conns) {
        my $r = $Msg::conns{$call};
-       my $addr = "$r->{peerhost}/$r->{peerport}";
        my $c = $call;
-       if ($c =~ /^Server\s+(\S+)$/) {
+       my $addr;
+       
+       if ($c =~ /^Server\s+(\S+)/) {
                $addr = $1;
                $c = "Server";
+       } else {
+               $addr = "AGW Port ($r->{agwport})" if exists $r->{agwport};
+               $addr = "BPQ Stream ($r->{bpqstream})" if exists $r->{bpqstream};
+
+               $addr ||= "$r->{peerhost}/$r->{peerport}";
+               $addr ||= "Unknown";
        }
-       push @out,      sprintf(" %3d %-9s %-27.27s %3s %7s %8s", 
+       my $csort = $r->{csort} || '';
+       my $sort = $r->{sort} || '';
+       push @out,      sprintf(" %3d %-9s %-27.27s %3s %7s %8s %-8s", 
                                                $r->{cnum}, $c, 
                                                $addr, $r->{state}, 
-                                               $r->{csort}, $r->{sort});
+                                               $csort, $sort, ref $r);
 
        $count++;
 }
-push @out, "$count Connections";
+push @out, "$count Connections ($Msg::noconns Allocated)";
 return (1, @out);