[EMAIL PROTECTED] (Eric Blake) writes:
> gcc -DHAVE_CONFIG_H -I. -I../../lib -I.. -g -O2 -c ../../lib/getaddrinfo.c
> ../../lib/getaddrinfo.c: In function `getaddrinfo':
> ../../lib/getaddrinfo.c:112: error: invalid application of `sizeof' to
> incomplete type `sockaddr_in'
Thanks for reporting that. Aside from the missing <netinet/in.h>
that you mentioned, I noticed a few other glitches.
I installed the following fix into coreutils; does it fix things for
you? If so, it should be propagated into gnulib.
2005-09-22 Paul Eggert <[EMAIL PROTECTED]>
* lib/getaddrinfo.c [HAVE_NETINET_IN_H]: Include <netinet/in.h>.
Problem reported by Eric Blake.
(getaddrinfo): Initialize se so that it's not garbage.
Redo internal storage allocation so that it doesn't make unportable
assumptions about alignment.
Fix a memory leak.
* m4/getaddrinfo.m4 (gl_PREREQ_GETADDRINFO): Check for netinet/in.h.
Index: lib/getaddrinfo.c
===================================================================
RCS file: /fetish/cu/lib/getaddrinfo.c,v
retrieving revision 1.1
diff -p -u -r1.1 getaddrinfo.c
--- lib/getaddrinfo.c 22 Sep 2005 06:22:44 -0000 1.1
+++ lib/getaddrinfo.c 23 Sep 2005 05:06:24 -0000
@@ -22,6 +22,10 @@
#include "getaddrinfo.h"
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+
/* Get calloc. */
#include <stdlib.h>
@@ -62,9 +66,22 @@ getaddrinfo (const char *restrict nodena
struct addrinfo **restrict res)
{
struct addrinfo *tmp;
- struct servent *se;
+ struct servent *se = NULL;
struct hostent *he;
- size_t sinlen;
+ void *storage;
+ size_t size;
+#if HAVE_IPV6
+ struct v6_pair {
+ struct addrinfo addrinfo;
+ struct sockaddr_in6 sockaddr_in6;
+ };
+#endif
+#if HAVE_IPV4
+ struct v4_pair {
+ struct addrinfo addrinfo;
+ struct sockaddr_in sockaddr_in;
+ };
+#endif
if (hints && (hints->ai_flags & ~AI_CANONNAME))
/* FIXME: Support more flags. */
@@ -103,13 +120,13 @@ getaddrinfo (const char *restrict nodena
{
#if HAVE_IPV6
case PF_INET6:
- sinlen = sizeof (struct sockaddr_in6);
+ size = sizeof (struct v6_pair);
break;
#endif
#if HAVE_IPV4
case PF_INET:
- sinlen = sizeof (struct sockaddr_in);
+ size = sizeof (struct v4_pair);
break;
#endif
@@ -117,8 +134,8 @@ getaddrinfo (const char *restrict nodena
return EAI_NODATA;
}
- tmp = calloc (1, sizeof (*tmp) + sinlen);
- if (!tmp)
+ storage = calloc (1, size);
+ if (!storage)
return EAI_MEMORY;
switch (he->h_addrtype)
@@ -126,18 +143,23 @@ getaddrinfo (const char *restrict nodena
#if HAVE_IPV6
case PF_INET6:
{
- struct sockaddr_in6 *sinp = (char *) tmp + sizeof (*tmp);
+ struct v6_pair *p = storage;
+ struct sockaddr_in6 *sinp = &p->sockaddr_in6;
+ tmp = &p->addrinfo;
if (se)
sinp->sin6_port = se->s_port;
if (he->h_length != sizeof (sinp->sin6_addr))
- return EAI_SYSTEM; /* FIXME: Better return code? Set errno? */
+ {
+ free (storage);
+ return EAI_SYSTEM; /* FIXME: Better return code? Set errno? */
+ }
- memcpy (&sinp->sin6_addr, he->h_addr_list[0], he->h_length);
+ memcpy (&sinp->sin6_addr, he->h_addr_list[0], sizeof sinp->sin6_addr);
tmp->ai_addr = (struct sockaddr *) sinp;
- tmp->ai_addrlen = sinlen;
+ tmp->ai_addrlen = sizeof *sinp;
}
break;
#endif
@@ -145,24 +167,29 @@ getaddrinfo (const char *restrict nodena
#if HAVE_IPV4
case PF_INET:
{
- struct sockaddr_in *sinp = (char *) tmp + sizeof (*tmp);
+ struct v4_pair *p = storage;
+ struct sockaddr_in *sinp = &p->sockaddr_in;
+ tmp = &p->addrinfo;
if (se)
sinp->sin_port = se->s_port;
if (he->h_length != sizeof (sinp->sin_addr))
- return EAI_SYSTEM; /* FIXME: Better return code? Set errno? */
+ {
+ free (storage);
+ return EAI_SYSTEM; /* FIXME: Better return code? Set errno? */
+ }
- memcpy (&sinp->sin_addr, he->h_addr_list[0], he->h_length);
+ memcpy (&sinp->sin_addr, he->h_addr_list[0], sizeof sinp->sin_addr);
tmp->ai_addr = (struct sockaddr *) sinp;
- tmp->ai_addrlen = sinlen;
+ tmp->ai_addrlen = sizeof *sinp;
}
break;
#endif
default:
- free (tmp);
+ free (storage);
return EAI_NODATA;
}
@@ -177,7 +204,7 @@ getaddrinfo (const char *restrict nodena
tmp->ai_canonname = strdup (cn);
if (!tmp->ai_canonname)
{
- free (tmp);
+ free (storage);
return EAI_MEMORY;
}
}
Index: m4/getaddrinfo.m4
===================================================================
RCS file: /fetish/cu/m4/getaddrinfo.m4,v
retrieving revision 1.1
diff -p -u -r1.1 getaddrinfo.m4
--- m4/getaddrinfo.m4 22 Sep 2005 06:22:44 -0000 1.1
+++ m4/getaddrinfo.m4 23 Sep 2005 05:06:24 -0000
@@ -1,5 +1,5 @@
-# getaddrinfo.m4 serial 3
-dnl Copyright (C) 2004 Free Software Foundation, Inc.
+# getaddrinfo.m4 serial 4
+dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -16,4 +16,5 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
AC_REQUIRE([gl_C_RESTRICT])
AC_REQUIRE([gl_SOCKET_FAMILIES])
AC_REQUIRE([AC_C_INLINE])
+ AC_CHECK_HEADERS_ONCE([netinet/in.h])
])
_______________________________________________
bug-gnulib mailing list
bug-gnulib@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-gnulib
