X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;h=5aebab650caac475f3b05600ff2a2e7e3d46f35b;hb=d17f05b19fac36a0a8a2f828912a1a7ebefae79f;hp=a485718cd155bda80b42eab44cd140f1a66ff00b;hpb=09cf2338daaf67c2844b5d0894b78636c9ab6102;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index a485718c..5aebab65 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -14,7 +14,6 @@ use strict;
 
 use DXUtil;
 
-use IO::Select;
 use DXDebug;
 use Timer;
 
@@ -84,8 +83,8 @@ BEGIN {
 		eval '*EWOULDBLOCK = *EAGAIN = sub { 10035 };' unless defined *EWOULDBLOCK;
 		eval '*F_GETFL     = sub {     0 };' unless defined *F_GETFL;
 		eval '*F_SETFL     = sub {     0 };' unless defined *F_SETFL;
-		eval '*IPPROTO_TCP     = sub {     6 };' unless defined *IPPROTO_TCP;
-		eval '*TCP_NODELAY     = sub {     1 };' unless defined *TCP_NODELAY;
+		eval 'sub IPPROTO_TCP  {     6 };';
+		eval 'sub TCP_NODELAY  {     1 };';
 		$blocking_supported = 0;   # it appears that this DOESN'T work :-(
 	} 
 }
@@ -193,6 +192,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 {
@@ -207,25 +221,31 @@ sub connect {
 	$conn->{peerport} = $to_port;
 	$conn->{sort} = 'Outgoing';
 	
-    # Create a new internet socket
-    my $sock = $io_socket->new();
-    return undef unless $sock;
-	
-	my $proto = getprotobyname('tcp');
-	$sock->socket(AF_INET, SOCK_STREAM, $proto) or return undef;
-	
-	blocking($sock, 0);
-	$conn->{blocking} = 0;
+	my $sock;
+	if ($blocking_supported) {
+		$sock = $io_socket->new(PeerAddr => $to_host, PeerPort => $to_port, Proto => 'tcp', Blocking =>0) or return undef;
+	} else {
+		# Create a new internet socket
+		$sock = $io_socket->new();
+		return undef unless $sock;
 
-	# does the host resolve?
-	my $ip = gethostbyname($to_host);
-	return undef unless $ip;
-	
-	my $r = connect($sock, pack_sockaddr_in($to_port, $ip));
-	return undef unless $r || _err_will_block($!);
+		my $proto = getprotobyname('tcp');
+		$sock->socket(AF_INET, SOCK_STREAM, $proto) or return undef;
+
+		blocking($sock, 0);
+		$conn->{blocking} = 0;
+
+		# does the host resolve?
+		my $ip = gethostbyname($to_host);
+		return undef unless $ip;
+
+		my $r = connect($sock, pack_sockaddr_in($to_port, $ip));
+		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);
@@ -310,7 +330,7 @@ sub disconnect
 
 	if (defined($sock)) {
 		set_event_handler ($sock, read => undef, write => undef, error => undef);
-		shutdown($sock, 3);
+		shutdown($sock, 2);
 		close($sock);
 	}