===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/canohost.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/ssh/canohost.c	1999/11/24 19:53:44	1.8
+++ src/usr.bin/ssh/canohost.c	1999/12/09 00:00:52	1.9
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: canohost.c,v 1.8 1999/11/24 19:53:44 markus Exp $");
+RCSID("$Id: canohost.c,v 1.9 1999/12/09 00:00:52 markus Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
@@ -143,6 +143,28 @@
 static char *canonical_host_name = NULL;
 static char *canonical_host_ip = NULL;
 
+/* Returns 1 if remote host is connected via socket, 0 if not. */
+
+int
+peer_connection_is_on_socket()
+{
+	struct sockaddr_in from;
+	int fromlen;
+	int in = packet_get_connection_in();
+	int out = packet_get_connection_out();
+
+	/* filedescriptors in and out are the same, so it's a socket */
+	if (in == out)
+		return 1;
+	fromlen = sizeof(from);
+	memset(&from, 0, sizeof(from));
+	if (getpeername(in, (struct sockaddr *) & from, &fromlen) < 0)
+		return 0;
+	if (from.sin_family != AF_INET && from.sin_family != AF_INET6)
+		return 0;
+	return 1;
+}
+
 /*
  * Return the canonical name of the host in the other side of the current
  * connection.  The host name is cached, so it is efficient to call this
@@ -157,7 +179,7 @@
 		return canonical_host_name;
 
 	/* Get the real hostname if socket; otherwise return UNKNOWN. */
-	if (packet_get_connection_in() == packet_get_connection_out())
+	if (peer_connection_is_on_socket())
 		canonical_host_name = get_remote_hostname(packet_get_connection_in());
 	else
 		canonical_host_name = xstrdup("UNKNOWN");
@@ -181,7 +203,7 @@
 		return canonical_host_ip;
 
 	/* If not a socket, return UNKNOWN. */
-	if (packet_get_connection_in() != packet_get_connection_out()) {
+	if (!peer_connection_is_on_socket()) {
 		canonical_host_ip = xstrdup("UNKNOWN");
 		return canonical_host_ip;
 	}
@@ -232,7 +254,7 @@
 	 * If the connection is not a socket, return 65535.  This is
 	 * intentionally chosen to be an unprivileged port number.
 	 */
-	if (packet_get_connection_in() != packet_get_connection_out())
+	if (!peer_connection_is_on_socket())
 		return 65535;
 
 	/* Get client socket. */