From 1f0fa9318a11ebb622fc9d7fc6d004aaba32fa7c Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Mon, 26 Nov 2001 00:41:11 +0000
Subject: [PATCH] Remove highly suspicious redefinition of sockaddr structure
 -- there seems no point using anything but the platform's native definition,
 and if we can't get that from the system headers we're hosed anyhow.

---
 configure.in |  4 ++--
 socket.c     | 38 ++++++++++++++++++++------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/configure.in b/configure.in
index 16b188a1..421c2dfc 100644
--- a/configure.in
+++ b/configure.in
@@ -92,8 +92,8 @@ fi
 
 
 
-AC_DEFINE(ss_family, __ss_family, [KAME hack])
-AC_DEFINE(ss_len, __ss_len, [KAME hack])
+dnl AC_DEFINE(ss_family, __ss_family, [KAME hack])
+dnl AC_DEFINE(ss_len, __ss_len, [KAME hack])
 
 CFLAGS="$CFLAGS"
 AC_ARG_ENABLE(ipv6,
diff --git a/socket.c b/socket.c
index 108150a0..0595dc22 100644
--- a/socket.c
+++ b/socket.c
@@ -327,7 +327,7 @@ void start_accept_loop(int port, int (*fn)(int ))
 	while (1) {
 		fd_set fds;
 		int fd;
-		struct sockaddr_storage addr;
+		struct sockaddr addr;
 		int in_addrlen = sizeof(addr);
 
 		/* close log file before the potentially very long select so
@@ -505,12 +505,12 @@ void become_daemon(void)
 	}
 }
 
-/*******************************************************************
- return the IP addr of the client as a string 
- ******************************************************************/
+/**
+ * Return the IP addr of the client as a string 
+ **/
 char *client_addr(int fd)
 {
-	struct sockaddr_storage ss;
+	struct sockaddr ss;
 	int     length = sizeof(ss);
 	static char addr_buf[100];
 	static int initialised;
@@ -519,22 +519,22 @@ char *client_addr(int fd)
 
 	initialised = 1;
 
-	if (getpeername(fd, (struct sockaddr *)&ss, &length)) {
+	if (getpeername(fd, &ss, &length)) {
 		exit_cleanup(RERR_SOCKETIO);
 	}
 
-	getnameinfo((struct sockaddr *)&ss, length,
+	getnameinfo(&ss, length,
 		addr_buf, sizeof(addr_buf), NULL, 0, NI_NUMERICHOST);
 	return addr_buf;
 }
 
 
-/*******************************************************************
- return the DNS name of the client 
- ******************************************************************/
+/**
+ * Return the DNS name of the client 
+ **/
 char *client_name(int fd)
 {
-	struct sockaddr_storage ss;
+	struct sockaddr ss;
 	int     length = sizeof(ss);
 	static char name_buf[100];
 	static char port_buf[100];
@@ -598,7 +598,7 @@ char *client_name(int fd)
 
 	/* XXX sin6_flowinfo and other fields */
 	for (res = res0; res; res = res->ai_next) {
-		if (res->ai_family != ss.ss_family)
+		if (res->ai_family != ss.sa_family)
 			continue;
 		if (res->ai_addrlen != length)
 			continue;
@@ -619,12 +619,14 @@ char *client_name(int fd)
 }
 
 /**
-   Convert a string to an IP address. The string can be a name or
-   dotted decimal number.
-
-   Returns a pointer to a static in_addr struct -- if you call this
-   more than once then you should copy it.
-*/
+ * Convert a string to an IP address. The string can be a name or
+ * dotted decimal number.
+ *
+ * Returns a pointer to a static in_addr struct -- if you call this
+ * more than once then you should copy it.
+ *
+ * TODO: Use getaddrinfo() instead, or make this function call getnameinfo
+ **/
 struct in_addr *ip_address(const char *str)
 {
 	static struct in_addr ret;
-- 
2.34.1