add more fixes for peerhosts

[spider.git] / perl / Msg.pm

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 531bff7336fb969f19cf581f9d7b5f41f24c4a7d..f2bb29768169b02b953887dcc6395a42d7b7175d 100644 (file)
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -193,14 +193,19 @@ sub pid_gone
        }
 }
 
+sub ax25
+{
+       my $conn = shift;
+       return $conn->{csort} eq 'ax25';
+}
+
 sub peerhost
 {
-       my $self = shift;
-       my $ip;
-       unless ($self->{peerhost}) {
-               $self->{peerhost} = $self->{sock}->peerhost;
-       }
-       return $self->{peerhost};
+       my $conn = shift;
+       $conn->{peerhost} ||= 'ax25' if $conn->ax25;
+       $conn->{peerhost} ||= $conn->{sock}->peerhost if $conn->{sock} && $conn->{sock}->isa('IO::Socket::INET');
+       $conn->{peerhost} ||= 'UNKNOWN';
+       return $conn->{peerhost};
 }
 
 #-----------------------------------------------------------------