X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=f2bb29768169b02b953887dcc6395a42d7b7175d;hb=8f652755dc254692ad2eb35147385a8bddca71a6;hp=d4bfba36e5543a116fb095de2cb2af1c7cb879ca;hpb=ab1e2dae047ba2c778551638a0a90201b14658b2;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index d4bfba36..f2bb2976 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -82,10 +82,10 @@ BEGIN {
 	if ($^O eq 'MSWin32') { 
 		eval '*EINPROGRESS = sub { 10036 };' unless defined *EINPROGRESS;
 		eval '*EWOULDBLOCK = *EAGAIN = sub { 10035 };' unless defined *EWOULDBLOCK;
-		eval '*F_GETFL     = sub {     0 };';
-		eval '*F_SETFL     = sub {     0 };';
-		eval '*IPPROTO_TCP     = sub {     6 };';
-		eval '*TCP_NODELAY     = sub {     1 };';
+		eval '*F_GETFL     = sub {     0 };' unless defined *F_GETFL;
+		eval '*F_SETFL     = sub {     0 };' unless defined *F_SETFL;
+		eval 'sub IPPROTO_TCP  {     6 };';
+		eval 'sub TCP_NODELAY  {     1 };';
 		$blocking_supported = 0;   # it appears that this DOESN'T work :-(
 	} 
 }
@@ -193,6 +193,21 @@ sub pid_gone
 	}
 }
 
+sub ax25
+{
+	my $conn = shift;
+	return $conn->{csort} eq 'ax25';
+}
+
+sub 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};
+}
+
 #-----------------------------------------------------------------
 # Send side routines
 sub connect {
@@ -225,7 +240,8 @@ sub connect {
 	return undef unless $r || _err_will_block($!);
 	
 	$conn->{sock} = $sock;
-    
+	$conn->{peerhost} = $sock->peerhost;	# for consistency
+
     if ($conn->{rproc}) {
         my $callback = sub {$conn->_rcv};
         set_event_handler ($sock, read => $callback);