X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=libbb%2Finet_common.c;h=5b4a4a10b7b41c7cdc8aae43d37219a93bda8f24;hb=5f7c82b32f548b5a1d6a4186630e8ef496a9d5e6;hp=321322d1ff256e809f01687a8a75a0e6d4545815;hpb=7d0c51919ce4d0be00fd8ae92d6f16b86aad9fd2;p=oweals%2Fbusybox.git diff --git a/libbb/inet_common.c b/libbb/inet_common.c index 321322d1f..5b4a4a10b 100644 --- a/libbb/inet_common.c +++ b/libbb/inet_common.c @@ -1,249 +1,205 @@ +/* vi: set sw=4 ts=4: */ /* * stolen from net-tools-1.59 and stripped down for busybox by * Erik Andersen * * Heavily modified by Manuel Novoa III Mar 12, 2001 * - * Version: $Id: inet_common.c,v 1.8 2004/03/10 07:42:38 mjn3 Exp $ - * + * Licensed under GPLv2, see file LICENSE in this source tree. */ -#include "inet_common.h" -#include -#include -#include -#include -#include #include "libbb.h" +#include "inet_common.h" -#ifdef DEBUG -# include -#endif - - -const char bb_INET_default[] = "default"; - -int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst) +int FAST_FUNC INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst) { struct hostent *hp; +#if ENABLE_FEATURE_ETC_NETWORKS struct netent *np; +#endif /* Grmpf. -FvK */ s_in->sin_family = AF_INET; s_in->sin_port = 0; /* Default is special, meaning 0.0.0.0. */ - if (!strcmp(name, bb_INET_default)) { + if (strcmp(name, "default") == 0) { s_in->sin_addr.s_addr = INADDR_ANY; - return (1); + return 1; } /* Look to see if it's a dotted quad. */ if (inet_aton(name, &s_in->sin_addr)) { return 0; } /* If we expect this to be a hostname, try hostname database first */ -#ifdef DEBUG if (hostfirst) { - bb_error_msg("gethostbyname (%s)", name); - } +#ifdef DEBUG + bb_error_msg("gethostbyname(%s)", name); #endif - if (hostfirst && (hp = gethostbyname(name)) != (struct hostent *) NULL) { - memcpy((char *) &s_in->sin_addr, (char *) hp->h_addr_list[0], - sizeof(struct in_addr)); - return 0; + hp = gethostbyname(name); + if (hp) { + memcpy(&s_in->sin_addr, hp->h_addr_list[0], + sizeof(struct in_addr)); + return 0; + } } +#if ENABLE_FEATURE_ETC_NETWORKS /* Try the NETWORKS database to see if this is a known network. */ #ifdef DEBUG - bb_error_msg("getnetbyname (%s)", name); + bb_error_msg("getnetbyname(%s)", name); #endif - if ((np = getnetbyname(name)) != (struct netent *) NULL) { + np = getnetbyname(name); + if (np) { s_in->sin_addr.s_addr = htonl(np->n_net); return 1; } +#endif if (hostfirst) { /* Don't try again */ - errno = h_errno; return -1; } #ifdef DEBUG res_init(); _res.options |= RES_DEBUG; + bb_error_msg("gethostbyname(%s)", name); #endif - -#ifdef DEBUG - bb_error_msg("gethostbyname (%s)", name); -#endif - if ((hp = gethostbyname(name)) == (struct hostent *) NULL) { - errno = h_errno; + hp = gethostbyname(name); + if (!hp) { return -1; } - memcpy((char *) &s_in->sin_addr, (char *) hp->h_addr_list[0], - sizeof(struct in_addr)); - + memcpy(&s_in->sin_addr, hp->h_addr_list[0], sizeof(struct in_addr)); return 0; } -/* cache */ -struct addr { - struct sockaddr_in addr; - char *name; - int host; - struct addr *next; -}; - -static struct addr *INET_nn = NULL; /* addr-to-name cache */ -/* numeric: & 0x8000: default instead of *, +/* numeric: & 0x8000: "default" instead of "*", * & 0x4000: host instead of net, * & 0x0fff: don't resolve */ -int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in, - int numeric, unsigned int netmask) +char* FAST_FUNC INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t netmask) { - struct hostent *ent; - struct netent *np; + /* addr-to-name cache */ + struct addr { + struct addr *next; + uint32_t nip; + smallint is_host; + char name[1]; + }; + static struct addr *cache = NULL; + struct addr *pn; - unsigned long ad, host_ad; - int host = 0; + char *name; + uint32_t nip; + smallint is_host; - /* Grmpf. -FvK */ if (s_in->sin_family != AF_INET) { #ifdef DEBUG - bb_error_msg("rresolve: unsupport address family %d !", - s_in->sin_family); + bb_error_msg("rresolve: unsupported address family %d!", + s_in->sin_family); #endif errno = EAFNOSUPPORT; - return (-1); + return NULL; } - ad = (unsigned long) s_in->sin_addr.s_addr; + nip = s_in->sin_addr.s_addr; #ifdef DEBUG - bb_error_msg("rresolve: %08lx, mask %08x, num %08x", ad, netmask, numeric); + bb_error_msg("rresolve: %08x mask:%08x num:%08x", (unsigned)nip, netmask, numeric); #endif - if (ad == INADDR_ANY) { - if ((numeric & 0x0FFF) == 0) { - if (numeric & 0x8000) - safe_strncpy(name, bb_INET_default, len); - else - safe_strncpy(name, "*", len); - return (0); - } - } - if (numeric & 0x0FFF) { - safe_strncpy(name, inet_ntoa(s_in->sin_addr), len); - return (0); + if (numeric & 0x0FFF) + return xmalloc_sockaddr2dotted_noport((void*)s_in); + if (nip == INADDR_ANY) { + if (numeric & 0x8000) + return xstrdup("default"); + return xstrdup("*"); } - if ((ad & (~netmask)) != 0 || (numeric & 0x4000)) - host = 1; -#if 0 - INET_nn = NULL; -#endif - pn = INET_nn; - while (pn != NULL) { - if (pn->addr.sin_addr.s_addr == ad && pn->host == host) { - safe_strncpy(name, pn->name, len); + is_host = ((nip & (~netmask)) != 0 || (numeric & 0x4000)); + + pn = cache; + while (pn) { + if (pn->nip == nip && pn->is_host == is_host) { #ifdef DEBUG - bb_error_msg("rresolve: found %s %08lx in cache", - (host ? "host" : "net"), ad); + bb_error_msg("rresolve: found %s %08x in cache", + (is_host ? "host" : "net"), (unsigned)nip); #endif - return (0); + return xstrdup(pn->name); } pn = pn->next; } - host_ad = ntohl(ad); - np = NULL; - ent = NULL; - if (host) { + name = NULL; + if (is_host) { #ifdef DEBUG - bb_error_msg("gethostbyaddr (%08lx)", ad); + bb_error_msg("sockaddr2host_noport(%08x)", (unsigned)nip); #endif - ent = gethostbyaddr((char *) &ad, 4, AF_INET); - if (ent != NULL) { - safe_strncpy(name, ent->h_name, len); - } - } else { + name = xmalloc_sockaddr2host_noport((void*)s_in); + } else if (ENABLE_FEATURE_ETC_NETWORKS) { + struct netent *np; #ifdef DEBUG - bb_error_msg("getnetbyaddr (%08lx)", host_ad); + bb_error_msg("getnetbyaddr(%08x)", (unsigned)ntohl(nip)); #endif - np = getnetbyaddr(host_ad, AF_INET); - if (np != NULL) { - safe_strncpy(name, np->n_name, len); - } - } - if ((ent == NULL) && (np == NULL)) { - safe_strncpy(name, inet_ntoa(s_in->sin_addr), len); + np = getnetbyaddr(ntohl(nip), AF_INET); + if (np) + name = xstrdup(np->n_name); } - pn = (struct addr *) xmalloc(sizeof(struct addr)); - pn->addr = *s_in; - pn->next = INET_nn; - pn->host = host; - pn->name = bb_xstrdup(name); - INET_nn = pn; - - return (0); + if (!name) + name = xmalloc_sockaddr2dotted_noport((void*)s_in); + + pn = xmalloc(sizeof(*pn) + strlen(name)); /* no '+ 1', it's already accounted for */ + pn->next = cache; + pn->nip = nip; + pn->is_host = is_host; + strcpy(pn->name, name); + cache = pn; + + return name; } -#ifdef CONFIG_FEATURE_IPV6 +#if ENABLE_FEATURE_IPV6 -int INET6_resolve(const char *name, struct sockaddr_in6 *sin6) +int FAST_FUNC INET6_resolve(const char *name, struct sockaddr_in6 *sin6) { - struct addrinfo req, *ai; + struct addrinfo req, *ai = NULL; int s; - memset(&req, '\0', sizeof req); + memset(&req, 0, sizeof(req)); req.ai_family = AF_INET6; - if ((s = getaddrinfo(name, NULL, &req, &ai))) { + s = getaddrinfo(name, NULL, &req, &ai); + if (s != 0) { bb_error_msg("getaddrinfo: %s: %d", name, s); return -1; } - memcpy(sin6, ai->ai_addr, sizeof(struct sockaddr_in6)); - + memcpy(sin6, ai->ai_addr, sizeof(*sin6)); freeaddrinfo(ai); - - return (0); + return 0; } #ifndef IN6_IS_ADDR_UNSPECIFIED # define IN6_IS_ADDR_UNSPECIFIED(a) \ - (((__u32 *) (a))[0] == 0 && ((__u32 *) (a))[1] == 0 && \ - ((__u32 *) (a))[2] == 0 && ((__u32 *) (a))[3] == 0) + (((uint32_t *) (a))[0] == 0 && ((uint32_t *) (a))[1] == 0 && \ + ((uint32_t *) (a))[2] == 0 && ((uint32_t *) (a))[3] == 0) #endif -int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, - int numeric) +char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric) { - int s; - - /* Grmpf. -FvK */ if (sin6->sin6_family != AF_INET6) { #ifdef DEBUG - bb_error_msg(_("rresolve: unsupport address family %d !\n"), - sin6->sin6_family); + bb_error_msg("rresolve: unsupported address family %d!", + sin6->sin6_family); #endif errno = EAFNOSUPPORT; - return (-1); + return NULL; } if (numeric & 0x7FFF) { - inet_ntop(AF_INET6, &sin6->sin6_addr, name, len); - return (0); + return xmalloc_sockaddr2dotted_noport((void*)sin6); } if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { - if (numeric & 0x8000) { - strcpy(name, "default"); - } else { - strcpy(name, "*"); - } - return (0); + if (numeric & 0x8000) + return xstrdup("default"); + return xstrdup("*"); } - s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6), name, len, NULL, 0, 0); - if (s) { - bb_error_msg("getnameinfo failed"); - return -1; - } - return (0); + return xmalloc_sockaddr2host_noport((void*)sin6); } -#endif /* CONFIG_FEATURE_IPV6 */ +#endif /* CONFIG_FEATURE_IPV6 */