Fix getaddrinfo emulation for systems with struct sockaddr.sa_len.

2008-10-13  Paolo Bonzini  <bonzini@gnu.org>

	fix getaddrinfo emulation for systems with struct sockaddr.sa_len
	* m4/getaddrinfo.m4 (gl_PREREQ_GETADDRINFO): Detect
	struct sockaddr.sa_len.
	* lib/getaddrinfo.c (getaddrinfo): Set it if appropriate.

diff --git a/ChangeLog b/ChangeLog
index 3aa6dabbcc65706d9791b0de67c0d4c67f28b057..f3fa73431b3cf79bb096ac13ff9d4a335abc050d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-13  Paolo Bonzini  <bonzini@gnu.org>
+
+       fix getaddrinfo emulation for systems with struct sockaddr.sa_len
+       * m4/getaddrinfo.m4 (gl_PREREQ_GETADDRINFO): Detect
+       struct sockaddr.sa_len.
+       * lib/getaddrinfo.c (getaddrinfo): Set it if appropriate.
+
 2008-10-13  Simon Josefsson  <simon@josefsson.org>
 
        * build-aux/pmccabe2html: Add css and css_url parameters.

diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index 06501f2380f75376350f90cb87710c8348a770f5..e4ed8213c0391f17d4639160362f9b696637390c 100644 (file)
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -301,6 +301,22 @@ getaddrinfo (const char *restrict nodename,
   tmp->ai_addr->sa_family = he->h_addrtype;
   tmp->ai_family = he->h_addrtype;
 
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+  switch (he->h_addrtype)
+    {
+#if HAVE_IPV4
+    case AF_INET:
+      tmp->ai_addr->sa_len = sizeof (struct sockaddr_in);
+      break;
+#endif
+#if HAVE_IPV6
+    case AF_INET6:
+      tmp->ai_addr->sa_len = sizeof (struct sockaddr_in6);
+      break;
+#endif
+    }
+#endif
+
   /* FIXME: If more than one address, create linked list of addrinfo's. */
 
   *res = tmp;

diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index 5d36c195053839d83b298f8220b5210289ed5f68..52135ba947a950c156abef6f09238dab1dbf1135 100644 (file)
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -99,6 +99,11 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
   AC_REQUIRE([gl_HEADER_SYS_SOCKET])
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  dnl Including sys/socket.h is wrong for Windows, but Windows does not
+  dnl have sa_len so the result is correct anyway.
+  AC_CHECK_MEMBERS([struct sockaddr.sa_len], , , [#include <sys/socket.h>])
+
   AC_CHECK_HEADERS_ONCE(netinet/in.h netdb.h)
   AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror, getnameinfo],,,[
   /* sys/types.h is not needed according to POSIX, but the