- markus@cvs.openbsd.org 2001/04/12 19:15:26

     [auth-rhosts.c auth.h auth2.c buffer.c canohost.c canohost.h
      compat.c compat.h hostfile.c pathnames.h readconf.c readconf.h
      servconf.c servconf.h ssh.c sshconnect.c sshconnect.h sshconnect1.c
      sshconnect2.c sshd_config]
     implement HostbasedAuthentication (= RhostRSAAuthentication for ssh v2)
     similar to RhostRSAAuthentication unless you enable (the experimental)
     HostbasedUsesNameFromPacketOnly option.  please test. :)

1 files changed, 43 insertions, 14 deletions

diff --git a/canohost.c b/canohost.c
index 927508f58..823545d4c 100644
--- a/canohost.c
+++ b/canohost.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.24 2001/04/05 15:48:19 stevesk Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.25 2001/04/12 19:15:24 markus Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
@@ -202,30 +202,59 @@ get_canonical_hostname(int reverse_mapping_check)
  * Returns the remote IP-address of socket as a string.  The returned
  * string must be freed.
  */
-
 char *
-get_peer_ipaddr(int socket)
+get_socket_address(int socket, int remote, int flags)
 {
-        struct sockaddr_storage from;
-        socklen_t fromlen;
+        struct sockaddr_storage addr;
+        socklen_t addrlen;
         char ntop[NI_MAXHOST];
 
         /* Get IP address of client. */
-        fromlen = sizeof(from);
-        memset(&from, 0, sizeof(from));
-        if (getpeername(socket, (struct sockaddr *) & from, &fromlen) < 0) {
-                debug("get_peer_ipaddr: getpeername failed: %.100s", strerror(errno));
-                return NULL;
+        addrlen = sizeof(addr);
+        memset(&addr, 0, sizeof(addr));
+
+        if (remote) {
+                if (getpeername(socket, (struct sockaddr *)&addr, &addrlen)
+                    < 0) {
+                        debug("get_socket_ipaddr: getpeername failed: %.100s",
+                            strerror(errno));
+                        return NULL;
+                }
+        } else {
+                if (getsockname(socket, (struct sockaddr *)&addr, &addrlen)
+                    < 0) {
+                        debug("get_socket_ipaddr: getsockname failed: %.100s",
+                            strerror(errno));
+                        return NULL;
+                }
         }
-        /* Get the IP address in ascii. */
-        if (getnameinfo((struct sockaddr *)&from, fromlen, ntop, sizeof(ntop),
-             NULL, 0, NI_NUMERICHOST) != 0) {
-                error("get_peer_ipaddr: getnameinfo NI_NUMERICHOST failed");
+        /* Get the address in ascii. */
+        if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop),
+             NULL, 0, flags) != 0) {
+                error("get_socket_ipaddr: getnameinfo %d failed", flags);
                 return NULL;
         }
         return xstrdup(ntop);
 }
 
+char *
+get_peer_ipaddr(int socket)
+{
+        return get_socket_address(socket, 1, NI_NUMERICHOST);
+}
+
+char *
+get_local_ipaddr(int socket)
+{
+        return get_socket_address(socket, 0, NI_NUMERICHOST);
+}
+
+char *
+get_local_name(int socket)
+{
+        return get_socket_address(socket, 0, NI_NAMEREQD);
+}
+
 /*
  * Returns the IP-address of the remote host as a string.  The returned
  * string must not be freed.