X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FMsg.pm;fp=perl%2FMsg.pm;h=c81273e29b329a5070b2bd53e34e7371564e3c68;hb=f91073b99369ea05c42364f9462695be7a67016d;hp=9a6f8d1f06894cd25d749afc9d2bac8019fd132d;hpb=ca5baf12f22e041cb14af595254af4ae88d82ae0;p=spider.git

diff --git a/perl/Msg.pm b/perl/Msg.pm
index 9a6f8d1f..c81273e2 100644
--- a/perl/Msg.pm
+++ b/perl/Msg.pm
@@ -137,6 +137,24 @@ sub peerhost
 	return $conn->{peerhost};
 }
 
+sub sockhost
+{
+	my $conn = shift;
+	unless ($conn->{sockhost}) {
+		$conn->{sockhost} ||= 'ax25' if $conn->ax25;
+		$conn->{sockhost} ||= $conn->{sock}->handle->sockhost if $conn->{sock};
+		$conn->{sockhost} ||= 'UNKNOWN';
+	}
+	$conn->{sockhost} =~ s/^::ffff://;
+	if (! defined $main::localhost_alias_ipv4 && $conn->{sockhost} =~ /\./ && $conn->{sockhost} !~ /^127\./) {
+		$main::localhost_alias_ipv4 = $conn->{sockhost};
+		dbg("Msg: localhost_alias_ipv4 = '$main::localhost_alias_ipv4'");
+	} elsif (! defined $main::localhost_alias_ipv6 && $conn->{sockhost} =~ /:/ && $conn->{sockhost} !~ /^::1$/) {
+		$main::localhost_alias_ipv6 = $conn->{sockhost};
+		dbg("Msg: localhost_alias_ipv6 = '$main::localhost_alias_ipv6'");
+	}
+	return $conn->{sockhost};
+}
 #-----------------------------------------------------------------
 # Send side routines
 
@@ -152,7 +170,8 @@ sub _on_connect
 	$sock->timeout(0);
 	$sock->start;
 	$conn->{peerhost} = eval { $handle->peerhost; };
-	dbg((ref $conn) . " connected $conn->{cnum} to $conn->{peerhost}:$conn->{peerport}") if isdbg('conn') || isdbg ('connect');
+	$conn->{sockhost} = eval { $handle->sockhost; };
+	dbg((ref $conn) . " connected $conn->{cnum}:$conn->{sockhost} to $conn->{peerhost}:$conn->{peerport}") if isdbg('conn') || isdbg ('connect');
 	if ($conn->{on_connect}) {
 		&{$conn->{on_connect}}($conn, $handle);
 	}
@@ -449,7 +468,7 @@ sub _rcv {                     # Complement to _send
 	my $msg = shift;
     my $sock = $conn->{sock};
     return unless defined($sock);
-	return if $conn->{disconnecting};
+	return if $conn->{disonnecting};
 
 	$total_in += length $msg;
 	$conn->{datain} += length $msg;
@@ -493,9 +512,9 @@ sub new_client {
 	$sock->timeout(0);
 	$sock->start;
 	$conn->{peerhost} = $handle->peerhost || 'unknown';
-	$conn->{peerhost} =~ s|^::ffff:||; # chop off leading pseudo IPV6 stuff on dual stack listeners
 	$conn->{peerport} = $handle->peerport || 0;
-	dbg((ref $conn) . " accept $conn->{cnum} from $conn->{peerhost}:$conn->{peerport}") if isdbg('conn') || isdbg('connect');
+	$conn->{sockhost} = $handle->sockhost || '';
+	dbg((ref $conn) . " accept $conn->{cnum}:$conn->{sockhost} from $conn->{peerhost}:$conn->{peerport}") if isdbg('conn') || isdbg('connect');
 	my ($rproc, $eproc) = &{$server_conn->{rproc}} ($conn, $conn->{peerhost}, $conn->{peerport});
 	$conn->{sort} = 'Incoming';
 	if ($eproc) {