From: Andreas Schneider <asn@samba.org>
Date: Tue, 27 May 2014 18:43:51 +0000 (+0200)
Subject: swrap: Setup myname in swrap_socket() for getsockname().
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=bdbbf3853c644da05e1fd74c523380a846394cec;p=slow%2Fsocket_wrapper.git

swrap: Setup myname in swrap_socket() for getsockname().

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
---

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index b8b1ca3..45a71b0 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -2223,8 +2223,40 @@ static int swrap_socket(int family, int type, int protocol)
 	si->type = real_type;
 	si->protocol = protocol;
 
+	/*
+	 * Setup myname so getsockname() can succeed to find out the socket
+	 * type.
+	 */
+	switch(si->family) {
+	case AF_INET: {
+		struct sockaddr_in sin = {
+			.sin_family = AF_INET,
+		};
+
+		si->myname_len = sizeof(struct sockaddr_in);
+		si->myname = sockaddr_dup(&sin, si->myname_len);
+		break;
+	}
+	case AF_INET6: {
+		struct sockaddr_in6 sin6 = {
+			.sin6_family = AF_INET6,
+		};
+
+		si->myname_len = sizeof(struct sockaddr_in6);
+		si->myname = sockaddr_dup(&sin6, si->myname_len);
+		break;
+	}
+	default:
+		free(si);
+		errno = EINVAL;
+		return -1;
+	}
+
 	fi = (struct socket_info_fd *)calloc(1, sizeof(struct socket_info_fd));
 	if (fi == NULL) {
+		if (si->myname != NULL) {
+			free (si->myname);
+		}
 		free(si);
 		errno = ENOMEM;
 		return -1;
@@ -2503,6 +2535,7 @@ static int swrap_auto_bind(int fd, struct socket_info *si, int family)
 		in.sin_addr.s_addr = htonl(127<<24 | 
 					   socket_wrapper_default_iface());
 
+		free(si->myname);
 		si->myname_len = sizeof(in);
 		si->myname = sockaddr_dup(&in, si->myname_len);
 		break;
@@ -2532,6 +2565,7 @@ static int swrap_auto_bind(int fd, struct socket_info *si, int family)
 		in6.sin6_family = AF_INET6;
 		in6.sin6_addr = *swrap_ipv6();
 		in6.sin6_addr.s6_addr[15] = socket_wrapper_default_iface();
+		free(si->myname);
 		si->myname_len = sizeof(in6);
 		si->myname = sockaddr_dup(&in6, si->myname_len);
 		break;
@@ -2685,6 +2719,7 @@ static int swrap_bind(int s, const struct sockaddr *myaddr, socklen_t addrlen)
 		return libc_bind(s, myaddr, addrlen);
 	}
 
+	free(si->myname);
 	si->myname_len = addrlen;
 	si->myname = sockaddr_dup(myaddr, addrlen);