From 1fb05e3db1891142410bc58c320dfe281749fffe Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 19 Feb 1997 04:43:53 +0000 Subject: update from main archive 970218 1997-02-19 03:28 Miles Bader * argp/argp-help.c: Add support for user provided filter of help messages. * argp/argp-parse.c: Likewise. * argp/argp.h: Likewise. * argp/argp-namefrob.h: Define __argp_input. * argp/argp-test.c: Add example for filter. 1997-02-19 02:58 Ulrich Drepper * argp.h: New file. * locale/programs/locale.c: Switch to use argp. * errno.h: Make it possible to get definition of error_t even after having errno.h already. * elf/dl-hash.h: New file. ELF hashing function. Extracted from dl-lookup.c. * elf/dl-lookup.c (_dl_elf_hash): Remove definition. * elf/dl-load.c: Rename _dl_does_name_match_p to _dl_name_match_p. * elf/dl-version.c: Likewise. * elf/dl-lookup.c: Implement new versioning lookup scheme. * elf/dl-version.c (_dl_check_map_versions): Initialize new field in l_versions member. * elf/dlvsym.c: Correct call of _dl_lookup_versioned_symbol_skip and _dl_lookup_versioned_symbol. * elf/link.h: Rename hash_name_pair to struct r_found_version. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/mips/dl-machine.h: Likewise. * intl/l10nflist.c: (_nl_make_l10nflist): Fix bug in computation of length of abs_filename. * locale/Makefile (CPPFLAGS): Define LOCALE_ALIAS_PATH. * locale/programs/ld-monetary.c (monetary_add): Allow value 0 in mon_grouping information. This means no more grouping. * locale/programs/ld-numeric.c (numeric_add): Write value \377 when seein value 0 in grouping information. * locale/programs/linereader.c (lr_close): Don't free fname since it might be used in error messages. * locale/programs/locale.c: Check whether output of `locale -a' really is locale directory. Also print locale aliases. * misc/search.h (__action_fn_t): Parameters VALUE and LEVEL cannot be const. 1997-02-19 02:16 Ulrich Drepper * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Correct #defin to #define. Reported by Rick Flower . 1997-02-19 01:37 Erik Troan * shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields. 1997-02-19 01:02 Ulrich Drepper * sysdeps/unix/mman/syscalls.list: msync takes 3 arguments. Reported by Andreas Jaeger . * sysdeps/stub/msync.c (msync): Add missing third parameter. 1997-02-19 00:29 Ulrich Drepper * sysdeps/unix/bsd/sigsuspend.c: Call __sigpause with needed additional argument. 1997-02-18 22:13 Ulrich Drepper * inet/net/ethernet.h: New file. * sysdeps/unix/sysv/linux/netinet/if_ether.c: Add BSD compatibility. * sysdeps/unix/sysv/linux/net/if_slip.h: New file. Contributed by a sun . * sysdeps/unix/sysv/linux/net/if_arp.h: Include . * sunrpc/rpc/rpc_msg.h: Include . Reported by a sun . 1997-02-16 14:25 Andreas Schwab * Makerules ((common-objpfx)distinfo-$(subdir)): Depend on sysdep makefiles which may change the distinfo variables. 1997-02-16 14:03 Andreas Schwab * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=misc]: Add sys/quota.h. (sysdep_headers) [$(subdir)=inet]: Add netinet/udp.h. 1997-02-17 13:12 aleph1@dfw.net * sunrpc/clnt_simp.c (callrpc): Prevent buffer overflow by using strncpy. 1997-02-18 03:28 Ulrich Drepper * stdio-common/bug10.c (main): Correct parameter. 1997-02-17 02:51 Ulrich Drepper * malloc/obstack.h: Add `extern "C"' protection. * posix/regex.h: Likewise. * io/ftw.h: Likewise. * misc/libgen.h: Likewise. * login/utmp.h: Likewise. * sysdeps/unix/sysv/linux/sys/reboot.h: Likewise. * sysdeps/unix/sysv/linux/netinet/in.h: Likewise. * sunrpc/rpc/pmap_rmt.h: Likewise. * sunrpc/rpc/auth_des.h: Likewise. * elf/link.h: Likewise. Reported by HJ Lu. 1997-02-17 01:45 a sun Linux specific network headers. * sysdeps/unix/sysv/linux/netinet/if_fddi.h: New file. * sysdeps/unix/sysv/linux/netinet/if_tr.h: New file. * sysdeps/unix/sysv/linux/netinet/ip_icmp.h: New file. * sysdeps/unix/sysv/linux/netinet/ip_fw.h: New file. * sysdeps/unix/sysv/linux/netinet/igmp.h: New file. * sysdeps/unix/sysv/linux/netinet/icmp.h: New file. * sysdeps/unix/sysv/linux/netinet/ip.h: New file. * sysdeps/unix/sysv/linux/netinet/tcp.h: New file. * sysdeps/unix/sysv/linux/netipx/ipx.h: New file. * sysdeps/unix/sysv/linux/netatalk/atalk.h: New file. * sysdeps/unix/sysv/linux/Dist: Add new network headers. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=misc] (sysdep_headers): Add sys/quota.h. [$(subdir)=inet] (sysdep_headers): Add new network header. * sysdeps/unix/sysv/linux/netinet/udp.h: Add Linux specific changes. * inet/netinet/ip.h: Move to sysdeps/generic. * inet/netinet/tcp.h: Likewise. * sysdeps/generic/netinet/ip.h: Moved to here from inet/netinet. * sysdeps/generic/netinet/tcp.h: Likewise. 1997-02-17 01:18 Ulrich Drepper * misc/sys/syslog.h (prioritynames): Correct definition to use braces where necessary. (facilitynames): Likewise. Patch by Ronald F. Guilmette . Comment and beautify declarations. 1997-02-16 19:54 1997 Philip Blundell * inet/Makefile (routines): Add in6_addr, getnameinfo. * inet/getnameinfo.c: New file. Implementation of getnameinfo() by Craig Metz. * inet/in6_addr.c: New file. IPv6 addressing constants. * posix/Makefile (routines): Add gai_strerror. * resolv/netdb.h: Add more constants for IPv6 basic API. * sysdeps/posix/gai_strerror.c: New file. * sysdeps/stub/gai_strerror.c New file. * sysdeps/unix/sysv/linux/netinet/in.h: Add definitions for IPv6 basic API. * sysdeps/posix/getaddrinfo.c: Update from latest version by Craig Metz and use reentrant getXXbyYY functions. 1997-02-15 14:32 Andreas Jaeger * argp/argp.h: Declare argp_program_version as const char. * argp/argp-test.c: Likewise * stdlib/testrand.c (main): Declare main prototype. * stdlib/testdiv.c (main): Likewise. * string/testcopy.c (main): Likewise. * string/test-ffs.c (main): Likewise. * time/test_time.c (main): Likewise. * locale/duplocale.c (__duplocale): Return result. 1997-02-16 03:54 Ulrich Drepper * sysdeps/unix/sysv/linux/netinet/in.h: Declare bindresvport. Reported by fabsoft@fabserver1.zarm.uni-bremen.de. * nss/nss.h: Remove declaration of __nss_shlib_revision. * nss/nsswitch.c: Don't use NSS_SHLIB_VERSION macro. 1997-02-16 03:48 Thorsten Kukuk * nis/nss_nis/nis-ethers.c (_nss_nis_getethernam_r): Rename to _nss_nis_gethostton_r. (_nss_nis_getetherbyaddr_r): Rename to _nss_nis_getntohost_r. 1997-02-15 22:37 Andy Berkheimer * resolv/gethnamaddr.c (gethostbyname2): Test for ':' in name before trying to resolv name as numeric IPv6 address. * nss/digits_dots.c: Likewise. Sat Feb 15 04:51:08 1997 Ulrich Drepper * locale/setlocale.c (setlocale): Don't try to be clever about unused locales. When the existence of the locale files isn't tested the result of setlocale might be different. 1997-02-15 03:34 Ulrich Drepper * locale/setlocale.c (setlocale): Don't increment usage_count of new locale if it already has the value MAX_USAGE_COUNT (it might be the C locale data which is read-only). --- sysdeps/posix/gai_strerror.c | 52 ++++++++ sysdeps/posix/getaddrinfo.c | 289 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 285 insertions(+), 56 deletions(-) create mode 100644 sysdeps/posix/gai_strerror.c (limited to 'sysdeps/posix') diff --git a/sysdeps/posix/gai_strerror.c b/sysdeps/posix/gai_strerror.c new file mode 100644 index 0000000000..b89a1f6889 --- /dev/null +++ b/sysdeps/posix/gai_strerror.c @@ -0,0 +1,52 @@ +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Philip Blundell , 1997. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include + +static struct + { + int code; + const char *msg; + } +values[] = + { + { EAI_ADDRFAMILY, N_("Address family for hostname not supported") }, + { EAI_AGAIN, N_("Temporary failure in name resolution") }, + { EAI_BADFLAGS, N_("Bad value for ai_flags") }, + { EAI_FAIL, N_("Non-recoverable failure in name resolution") }, + { EAI_FAMILY, N_("ai_family not supported") }, + { EAI_MEMORY, N_("Memory allocation failure") }, + { EAI_NODATA, N_("No address associated with hostname") }, + { EAI_NONAME, N_("Name or service not known") }, + { EAI_SERVICE, N_("Servname not supported for ai_socktype") }, + { EAI_SOCKTYPE, N_("ai_socktype not supported") }, + { EAI_SYSTEM, N_("System error") } + }; + +char * +gai_strerror (int code) +{ + int i; + for (i = 0; i < sizeof (values) / sizeof (values[0]); ++i) + if (values[i].code == code) + return (char *) values[i].msg; + + return (char *) _("Unknown error"); +} diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 90af24fb61..042e0a5ef8 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -42,21 +42,43 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* This software is Copyright 1996 by Craig Metz, All Rights Reserved. */ +/* getaddrinfo() v1.13 */ + +/* To do what POSIX says, even when it's broken: */ +/* #define BROKEN_LIKE_POSIX 1 */ +#define LOCAL 1 +#define INET6 1 +#define HOSTTABLE 0 +#define RESOLVER 1 + #include -#include #include +#include +#include +#if LOCAL +#include +#include +#include +#include +#endif /* LOCAL */ #include -#ifdef INET6 -#include -#endif /* INET6 */ #include -#include -#include +#include + +#ifndef AF_LOCAL +#define AF_LOCAL AF_UNIX +#endif /* AF_LOCAL */ +#ifndef PF_LOCAL +#define PF_LOCAL PF_UNIX +#endif /* PF_LOCAL */ +#ifndef UNIX_PATH_MAX +#define UNIX_PATH_MAX 108 +#endif /* UNIX_PATH_MAX */ #define GAIH_OKIFUNSPEC 0x0100 #define GAIH_EAI ~(GAIH_OKIFUNSPEC) -#ifdef HOSTTABLE +#if HOSTTABLE struct hostent *_hostname2addr_hosts(const char *name, int); struct hostent *_addr2hostname_hosts(const char *name, int, int); #endif /* HOSTTABLE */ @@ -66,7 +88,7 @@ static struct addrinfo nullreq = struct gaih_service { char *name; - unsigned long num; + int num; }; struct gaih_servtuple { @@ -86,18 +108,69 @@ struct gaih_addrtuple { char addr[16]; }; -static struct gaih_addrtuple nulladdr; - struct gaih_typeproto { int socktype; int protocol; - const char *name; + char *name; }; +#if LOCAL +static int gaih_local(const char *name, const struct gaih_service *service, + const struct addrinfo *req, struct addrinfo **pai) +{ + struct utsname utsname; + + if (name || (req->ai_flags & AI_CANONNAME)) + if (uname(&utsname)) + return -EAI_SYSTEM; + if (name) { + if (strcmp(name, "localhost") && strcmp(name, "local") && strcmp(name, "unix") && strcmp(name, utsname.nodename)) + return (GAIH_OKIFUNSPEC | -EAI_NONAME); + }; + + if (!(*pai = malloc(sizeof(struct addrinfo) + sizeof(struct sockaddr_un) + ((req->ai_flags & AI_CANONNAME) ? (strlen(utsname.nodename) + 1): 0)))) + return -EAI_MEMORY; + + (*pai)->ai_next = NULL; + (*pai)->ai_flags = req->ai_flags; + (*pai)->ai_family = AF_LOCAL; + (*pai)->ai_socktype = req->ai_socktype ? req->ai_socktype : SOCK_STREAM; + (*pai)->ai_protocol = req->ai_protocol; + (*pai)->ai_addrlen = sizeof(struct sockaddr_un); + (*pai)->ai_addr = (void *)(*pai) + sizeof(struct addrinfo); +#if SALEN + ((struct sockaddr_un *)(*pai)->ai_addr)->sun_len = sizeof(struct sockaddr_un); +#endif /* SALEN */ + ((struct sockaddr_un *)(*pai)->ai_addr)->sun_family = AF_LOCAL; + memset(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, 0, UNIX_PATH_MAX); + if (service) { + char *c; + if (c = strchr(service->name, '/')) { + if (strlen(service->name) >= sizeof(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path)) + return (GAIH_OKIFUNSPEC | -EAI_SERVICE); + strcpy(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, service->name); + } else { + if (strlen(P_tmpdir "/") + 1 + strlen(service->name) >= sizeof(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path)) + return (GAIH_OKIFUNSPEC | -EAI_SERVICE); + strcpy(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, P_tmpdir "/"); + strcat(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, service->name); + }; + } else { + if (!tmpnam(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path)) + return -EAI_SYSTEM; + }; + if (req->ai_flags & AI_CANONNAME) + strcpy((*pai)->ai_canonname = (char *)(*pai) + sizeof(struct addrinfo) + sizeof(struct sockaddr_un), utsname.nodename); + else + (*pai)->ai_canonname = NULL; + return 0; +}; +#endif /* LOCAL */ + static struct gaih_typeproto gaih_inet_typeproto[] = { { 0, 0, NULL }, - { SOCK_STREAM, IPPROTO_TCP, "tcp" }, - { SOCK_DGRAM, IPPROTO_UDP, "udp" }, + { SOCK_STREAM, IPPROTO_TCP, (char *)"tcp" }, + { SOCK_DGRAM, IPPROTO_UDP, (char *)"udp" }, { 0, 0, NULL } }; @@ -124,12 +197,12 @@ static int gaih_inet(const char *name, const struct gaih_service *service, { struct gaih_typeproto *tp = gaih_inet_typeproto; struct gaih_servtuple *st = &nullserv; - struct gaih_addrtuple *at = &nulladdr; + struct gaih_addrtuple *at = NULL; int i; if (req->ai_protocol || req->ai_socktype) { for (tp++; tp->name && - ((req->ai_socktype != tp->socktype) || !req->ai_socktype) && + ((req->ai_socktype != tp->socktype) || !req->ai_socktype) && ((req->ai_protocol != tp->protocol) || !req->ai_protocol); tp++); if (!tp->name) if (req->ai_socktype) @@ -139,7 +212,7 @@ static int gaih_inet(const char *name, const struct gaih_service *service, } if (service) { - if (service->name) { + if (service->num < 0) { if (tp->name) { if (i = gaih_inet_serv(service->name, tp, &st)) return i; @@ -182,18 +255,18 @@ static int gaih_inet(const char *name, const struct gaih_service *service, if (inet_pton(AF_INET, name, at->addr) > 0) at->family = AF_INET; -#ifdef INET6 +#if INET6 if (!at->family && (!req->ai_family || (req->ai_family == AF_INET6))) if (inet_pton(AF_INET6, name, at->addr) > 0) at->family = AF_INET6; #endif /* INET6 */ -#ifdef HOSTTABLE +#if HOSTTABLE if (!at->family) { struct hostent *h; struct gaih_addrtuple **pat = &at; -#ifdef INET6 +#if INET6 if (!req->ai_family || (req->ai_family == AF_INET6)) if (h = _hostname2addr_hosts(name, AF_INET6)) { for (i = 0; h->h_addr_list[i]; i++) { @@ -229,14 +302,35 @@ static int gaih_inet(const char *name, const struct gaih_service *service, } #endif /* HOSTTABLE */ -#ifdef RESOLVER +#if RESOLVER if (!at->family) { struct hostent *h; struct gaih_addrtuple **pat = &at; -#ifdef INET6 - if (!req->ai_family || (req->ai_family == AF_INET6)) - if (h = gethostbyname2(name, AF_INET6)) { +#if INET6 + if (!req->ai_family || (req->ai_family == AF_INET6)) { + int herrno; + int tmpbuflen = 1024; + struct hostent th; + char *tmpbuf = __alloca(tmpbuflen); + while (__gethostbyname2_r(name, AF_INET6, &th, tmpbuf, tmpbuflen, + &h, &herrno)) { + if (herrno == NETDB_INTERNAL) { + if (errno == ERANGE) { + /* Need more buffer */ + tmpbuflen *= 2; + tmpbuf = __alloca(tmpbuflen); + } else { + /* Bail out */ + __set_h_errno(herrno); + i = -EAI_SYSTEM; + goto ret; + } + } else { + break; + } + } + if (h) { for (i = 0; h->h_addr_list[i]; i++) { if (!*pat) { if (!(*pat = malloc(sizeof(struct gaih_addrtuple)))) { @@ -250,10 +344,32 @@ static int gaih_inet(const char *name, const struct gaih_service *service, pat = &((*pat)->next); } } + } #endif /* INET6 */ - if (!req->ai_family || (req->ai_family == AF_INET)) - if (h = gethostbyname2(name, AF_INET)) { + if (!req->ai_family || (req->ai_family == AF_INET)) { + int herrno; + struct hostent th; + int tmpbuflen = 1024; + char *tmpbuf = __alloca(tmpbuflen); + while (__gethostbyname2_r(name, AF_INET, &th, tmpbuf, tmpbuflen, + &h, &herrno)) { + if (herrno == NETDB_INTERNAL) { + if (errno == ERANGE) { + /* Need more buffer */ + tmpbuflen *= 2; + tmpbuf = __alloca(tmpbuflen); + } else { + /* Bail out */ + __set_h_errno(herrno); + i = -EAI_SYSTEM; + goto ret; + } + } else { + break; + } + } + if (h) { for (i = 0; h->h_addr_list[i]; i++) { if (!*pat) { if (!(*pat = malloc(sizeof(struct gaih_addrtuple)))) { @@ -267,20 +383,39 @@ static int gaih_inet(const char *name, const struct gaih_service *service, pat = &((*pat)->next); } } + } } #endif /* RESOLVER */ if (!at->family) return (GAIH_OKIFUNSPEC | -EAI_NONAME); } else { - memset(&nulladdr, 0, sizeof(nulladdr)); -#ifdef INET6 - if (!req->ai_family || (req->ai_family == AF_INET6)) - nulladdr.family = AF_INET6; - else + if (!(at = malloc(sizeof(struct gaih_addrtuple)))) { + i = -EAI_MEMORY; + goto ret; + }; + + memset(at, 0, sizeof(struct gaih_addrtuple)); + +#if INET6 + if (!(at->next = malloc(sizeof(struct gaih_addrtuple)))) { + i = -EAI_MEMORY; + goto ret; + }; + + at->family = AF_INET6; + + memset(at->next, 0, sizeof(struct gaih_addrtuple)); + at->next->family = AF_INET; +#else /* INET6 */ + at->family = AF_INET; #endif /* INET6 */ - nulladdr.family = AF_INET; - } + }; + + if (!pai) { + i = 0; + goto ret; + }; { const char *c = NULL; @@ -288,7 +423,7 @@ static int gaih_inet(const char *name, const struct gaih_service *service, struct gaih_addrtuple *at2 = at; int j; #ifndef MAXHOSTNAMELEN -# define MAXHOSTNAMELEN 128 +#define MAXHOSTNAMELEN 128 #endif /* MAXHOSTNAMELEN */ char buffer[MAXHOSTNAMELEN]; @@ -296,24 +431,44 @@ static int gaih_inet(const char *name, const struct gaih_service *service, if (req->ai_flags & AI_CANONNAME) { struct hostent *h = NULL; -#ifdef RESOLVER - h = gethostbyaddr(at2->addr, -#ifdef INET6 - (at2->family == AF_INET6) ? sizeof(struct in6_addr) : +#if RESOLVER + int herrno; + struct hostent th; + int tmpbuflen = 1024; + char *tmpbuf = __alloca(tmpbuflen); + while (__gethostbyaddr_r(at2->addr, +#if INET6 + (at2->family == AF_INET6) ? sizeof(struct in6_addr) : #endif /* INET6 */ - sizeof(struct in_addr), at2->family); + sizeof(struct in_addr), at2->family, + &th, tmpbuf, tmpbuflen, &h, &herrno)) { + if (herrno == NETDB_INTERNAL) { + if (errno == ERANGE) { + /* Need more buffer */ + tmpbuflen *= 2; + tmpbuf = __alloca(tmpbuflen); + } else { + /* Bail out */ + __set_h_errno(herrno); + i = -EAI_SYSTEM; + goto ret; + } + } else { + break; + } + } #endif /* RESOLVER */ -#ifdef HOSTTABLE +#if HOSTTABLE if (!h) h = _addr2hostname_hosts(at2->addr, -#ifdef INET6 - (at2->family == AF_INET6) ? sizeof(struct in6_addr) : +#if INET6 + (at2->family == AF_INET6) ? sizeof(struct in6_addr) : #endif /* INET6 */ sizeof(struct in_addr), at2->family); #endif /* HOSTTABLE */ if (!h) - c = inet_ntop(at2->family, at2->addr, buffer, sizeof(buffer)); + c = inet_ntop(at2->family, at2->addr, buffer, sizeof(buffer)); else c = h->h_name; @@ -326,7 +481,7 @@ static int gaih_inet(const char *name, const struct gaih_service *service, } else j = 0; -#ifdef INET6 +#if INET6 if (at2->family == AF_INET6) i = sizeof(struct sockaddr_in6); else @@ -351,7 +506,7 @@ static int gaih_inet(const char *name, const struct gaih_service *service, ((struct sockaddr_in *)(*pai)->ai_addr)->sin_family = at2->family; ((struct sockaddr_in *)(*pai)->ai_addr)->sin_port = st2->port; -#ifdef INET6 +#if INET6 if (at2->family == AF_INET6) { ((struct sockaddr_in6 *)(*pai)->ai_addr)->sin6_flowinfo = 0; memcpy(&((struct sockaddr_in6 *)(*pai)->ai_addr)->sin6_addr, at2->addr, sizeof(struct in6_addr)); @@ -361,7 +516,7 @@ static int gaih_inet(const char *name, const struct gaih_service *service, memcpy(&((struct sockaddr_in *)(*pai)->ai_addr)->sin_addr, at2->addr, sizeof(struct in_addr)); memset(((struct sockaddr_in *)(*pai)->ai_addr)->sin_zero, 0, sizeof(((struct sockaddr_in *)(*pai)->ai_addr)->sin_zero)); } - + if (c) { (*pai)->ai_canonname = (void *)(*pai) + sizeof(struct addrinfo) + i; strcpy((*pai)->ai_canonname, c); @@ -388,7 +543,7 @@ ret: st = st2; } } - if (at != &nulladdr) { + if (at) { struct gaih_addrtuple *at2 = at; while(at) { at2 = at->next; @@ -406,24 +561,34 @@ struct gaih { }; static struct gaih gaih[] = { -#ifdef INET6 +#if INET6 { PF_INET6, gaih_inet }, #endif /* INET6 */ { PF_INET, gaih_inet }, +#if LOCAL + { PF_LOCAL, gaih_local }, +#endif /* LOCAL */ { PF_UNSPEC, NULL } }; int getaddrinfo(const char *name, const char *service, const struct addrinfo *req, struct addrinfo **pai) { - int i = 0; - int j = 0; - struct addrinfo *p = NULL, **end = &p; + int i = 0, j = 0; + struct addrinfo *p = NULL, **end; struct gaih *g = gaih, *pg = NULL; struct gaih_service gaih_service, *pservice; + if (name && (name[0] == '*') && !name[1]) + name = NULL; + + if (service && (service[0] == '*') && !service[1]) + service = NULL; + +#if BROKEN_LIKE_POSIX if (!name && !service) return EAI_NONAME; +#endif /* BROKEN_LIKE_POSIX */ if (!req) req = &nullreq; @@ -437,26 +602,35 @@ int getaddrinfo(const char *name, const char *service, if (service && *service) { char *c; gaih_service.num = strtoul(gaih_service.name = (void *)service, &c, 10); - if (!*c) { - if (!req->ai_socktype) - return EAI_SERVICE; - gaih_service.name = NULL; + if (*c) { + gaih_service.num = -1; } +#if BROKEN_LIKE_POSIX + else + if (!req->ai_socktype) + return EAI_SERVICE; +#endif /* BROKEN_LIKE_POSIX */ pservice = &gaih_service; } else pservice = NULL; + if (pai) + end = &p; + else + end = NULL; + while(g->gaih) { if ((req->ai_family == g->family) || !req->ai_family) { j++; if (!((pg && (pg->gaih == g->gaih)))) { pg = g; - if ((i = g->gaih(name, pservice, req, end))) { + if (i = g->gaih(name, pservice, req, end)) { if (!req->ai_family && (i & GAIH_OKIFUNSPEC)) continue; goto gaih_err; } - while(*end) end = &((*end)->ai_next); + if (end) + while(*end) end = &((*end)->ai_next); } } g++; @@ -470,6 +644,9 @@ int getaddrinfo(const char *name, const char *service, return 0; } + if (!pai && !i) + return 0; + gaih_err: if (p) freeaddrinfo(p); -- cgit 1.4.1