X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetaddrinfo.c;h=7ea696778256f19a34c7ea2d36ac569db6eaee53;hb=fef71c83bc8291522ae54810ae9b4238ca13cf1a;hp=145eac519bfc77de7193a9acfe9959b448d05f89;hpb=f34b5ec45f70109f4d3d321ea17f996ff4b1c14d;p=gnulib.git diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c index 145eac519..7ea696778 100644 --- a/lib/getaddrinfo.c +++ b/lib/getaddrinfo.c @@ -1,5 +1,5 @@ /* Get address information (partial implementation). - Copyright (C) 1997, 2001, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1997, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. Contributed by Simon Josefsson . This program is free software; you can redistribute it and/or modify @@ -14,28 +14,31 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#if HAVE_CONFIG_H +#ifdef HAVE_CONFIG_H # include #endif +#include "getaddrinfo.h" + +#if HAVE_NETINET_IN_H +# include +#endif + /* Get calloc. */ #include /* Get memcpy. */ #include -/* Get struct hostent. */ -#include - #include #include "gettext.h" #define _(String) gettext (String) #define N_(String) String -#include "getaddrinfo.h" +#include "strdup.h" static inline bool validate_family (int family) @@ -63,25 +66,34 @@ getaddrinfo (const char *restrict nodename, 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) + if (hints && (hints->ai_flags & ~AI_CANONNAME)) /* FIXME: Support more flags. */ return EAI_BADFLAGS; if (hints && !validate_family (hints->ai_family)) return EAI_FAMILY; - if (hints && hints->ai_socktype) - /* FIXME: Support more socket types. */ - return EAI_SOCKTYPE; - if (hints && - hints->ai_protocol != SOCK_STREAM && hints->ai_protocol != SOCK_DGRAM) - /* FIXME: Support other protocols. */ - return EAI_SERVICE; /* FIXME: Better return code? */ + hints->ai_socktype != SOCK_STREAM && hints->ai_socktype != SOCK_DGRAM) + /* FIXME: Support other socktype. */ + return EAI_SOCKTYPE; /* FIXME: Better return code? */ if (!nodename) /* FIXME: Support server bind mode. */ @@ -90,7 +102,7 @@ getaddrinfo (const char *restrict nodename, if (servname) { const char *proto = - (hints && hints->ai_protocol == SOCK_DGRAM) ? "udp" : "tcp"; + (hints && hints->ai_socktype == SOCK_DGRAM) ? "udp" : "tcp"; /* FIXME: Use getservbyname_r if available. */ se = getservbyname (servname, proto); @@ -108,13 +120,13 @@ getaddrinfo (const char *restrict nodename, { #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 @@ -122,8 +134,8 @@ getaddrinfo (const char *restrict nodename, return EAI_NODATA; } - tmp = calloc (1, sizeof (*tmp) + sinlen); - if (!tmp) + storage = calloc (1, size); + if (!storage) return EAI_MEMORY; switch (he->h_addrtype) @@ -131,18 +143,23 @@ getaddrinfo (const char *restrict nodename, #if HAVE_IPV6 case PF_INET6: { - struct sockaddr_in6 *sinp = (void *) 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 @@ -150,27 +167,50 @@ getaddrinfo (const char *restrict nodename, #if HAVE_IPV4 case PF_INET: { - struct sockaddr_in *sinp = (void *) 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; } + if (hints && hints->ai_flags & AI_CANONNAME) + { + const char *cn; + if (he->h_name) + cn = he->h_name; + else + cn = nodename; + + tmp->ai_canonname = strdup (cn); + if (!tmp->ai_canonname) + { + free (storage); + return EAI_MEMORY; + } + } + + tmp->ai_protocol = (hints) ? hints->ai_protocol : 0; + tmp->ai_socktype = (hints) ? hints->ai_socktype : 0; tmp->ai_addr->sa_family = he->h_addrtype; /* FIXME: If more than one address, create linked list of addrinfo's. */ @@ -190,6 +230,8 @@ freeaddrinfo (struct addrinfo *ai) cur = ai; ai = ai->ai_next; + + if (cur->ai_canonname) free (cur->ai_canonname); free (cur); } }