X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Finet_common.c;h=9cdcb11deae95d14e2a26387b8afbfd1fbc0f7e1;hb=9af7c9d6b62ceb07a9ba24cee0cf4a08c689235e;hp=16dd1db7c259d26e13f2610a544e2b3b4ebffd79;hpb=30db423e11da340eadb4a55baa2037fc3b8c34e6;p=oweals%2Fbusybox.git diff --git a/libbb/inet_common.c b/libbb/inet_common.c index 16dd1db7c..9cdcb11de 100644 --- a/libbb/inet_common.c +++ b/libbb/inet_common.c @@ -1,27 +1,16 @@ +/* vi: set sw=4 ts=4: */ /* * stolen from net-tools-1.59 and stripped down for busybox by - * Erik Andersen + * Erik Andersen * * Heavily modified by Manuel Novoa III Mar 12, 2001 * - * Version: $Id: inet_common.c,v 1.5 2002/11/28 09:52:23 bug1 Exp $ + * Version: $Id: inet_common.c,v 1.8 2004/03/10 07:42:38 mjn3 Exp $ * */ -#include "inet_common.h" -#include -#include -#include -#include -#include #include "libbb.h" - -#ifdef DEBUG -# include -#endif - - -const char bb_INET_default[] = "default"; +#include "inet_common.h" int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst) { @@ -33,9 +22,9 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst) s_in->sin_port = 0; /* Default is special, meaning 0.0.0.0. */ - if (!strcmp(name, bb_INET_default)) { + if (!strcmp(name, bb_str_default)) { 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)) { @@ -44,7 +33,7 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst) /* If we expect this to be a hostname, try hostname database first */ #ifdef DEBUG if (hostfirst) { - error_msg("gethostbyname (%s)", name); + bb_error_msg("gethostbyname (%s)", name); } #endif if (hostfirst && (hp = gethostbyname(name)) != (struct hostent *) NULL) { @@ -54,7 +43,7 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst) } /* Try the NETWORKS database to see if this is a known network. */ #ifdef DEBUG - error_msg("getnetbyname (%s)", name); + bb_error_msg("getnetbyname (%s)", name); #endif if ((np = getnetbyname(name)) != (struct netent *) NULL) { s_in->sin_addr.s_addr = htonl(np->n_net); @@ -62,7 +51,6 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst) } if (hostfirst) { /* Don't try again */ - errno = h_errno; return -1; } #ifdef DEBUG @@ -71,10 +59,9 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst) #endif #ifdef DEBUG - error_msg("gethostbyname (%s)", name); + bb_error_msg("gethostbyname (%s)", name); #endif if ((hp = gethostbyname(name)) == (struct hostent *) NULL) { - errno = h_errno; return -1; } memcpy((char *) &s_in->sin_addr, (char *) hp->h_addr_list[0], @@ -109,44 +96,41 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in, /* Grmpf. -FvK */ if (s_in->sin_family != AF_INET) { #ifdef DEBUG - error_msg("rresolve: unsupport address family %d !", + bb_error_msg("rresolve: unsupport address family %d !", s_in->sin_family); #endif errno = EAFNOSUPPORT; - return (-1); + return -1; } ad = (unsigned long) s_in->sin_addr.s_addr; #ifdef DEBUG - error_msg("rresolve: %08lx, mask %08x, num %08x", ad, netmask, numeric); + bb_error_msg("rresolve: %08lx, mask %08x, num %08x", ad, netmask, numeric); #endif if (ad == INADDR_ANY) { if ((numeric & 0x0FFF) == 0) { if (numeric & 0x8000) - safe_strncpy(name, bb_INET_default, len); + safe_strncpy(name, bb_str_default, len); else safe_strncpy(name, "*", len); - return (0); + return 0; } } if (numeric & 0x0FFF) { safe_strncpy(name, inet_ntoa(s_in->sin_addr), len); - return (0); + return 0; } 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); #ifdef DEBUG - error_msg("rresolve: found %s %08lx in cache", + bb_error_msg("rresolve: found %s %08lx in cache", (host ? "host" : "net"), ad); #endif - return (0); + return 0; } pn = pn->next; } @@ -156,7 +140,7 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in, ent = NULL; if (host) { #ifdef DEBUG - error_msg("gethostbyaddr (%08lx)", ad); + bb_error_msg("gethostbyaddr (%08lx)", ad); #endif ent = gethostbyaddr((char *) &ad, 4, AF_INET); if (ent != NULL) { @@ -164,7 +148,7 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in, } } else { #ifdef DEBUG - error_msg("getnetbyaddr (%08lx)", host_ad); + bb_error_msg("getnetbyaddr (%08lx)", host_ad); #endif np = getnetbyaddr(host_ad, AF_INET); if (np != NULL) { @@ -174,40 +158,41 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in, if ((ent == NULL) && (np == NULL)) { safe_strncpy(name, inet_ntoa(s_in->sin_addr), len); } - pn = (struct addr *) xmalloc(sizeof(struct addr)); + pn = xmalloc(sizeof(struct addr)); pn->addr = *s_in; pn->next = INET_nn; pn->host = host; pn->name = xstrdup(name); INET_nn = pn; - return (0); + return 0; } #ifdef CONFIG_FEATURE_IPV6 -int INET6_resolve(char *name, struct sockaddr_in6 *sin6) +int INET6_resolve(const char *name, struct sockaddr_in6 *sin6) { struct addrinfo req, *ai; int s; memset(&req, '\0', sizeof req); req.ai_family = AF_INET6; - if ((s = getaddrinfo(name, NULL, &req, &ai))) { - error_msg("getaddrinfo: %s: %d", name, s); + s = getaddrinfo(name, NULL, &req, &ai); + if (s) { + bb_error_msg("getaddrinfo: %s: %d", name, s); return -1; } memcpy(sin6, ai->ai_addr, sizeof(struct sockaddr_in6)); 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 @@ -219,31 +204,32 @@ int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, /* Grmpf. -FvK */ if (sin6->sin6_family != AF_INET6) { #ifdef DEBUG - error_msg(_("rresolve: unsupport address family %d !\n"), + bb_error_msg("rresolve: unsupport address family %d!", sin6->sin6_family); #endif errno = EAFNOSUPPORT; - return (-1); + return -1; } if (numeric & 0x7FFF) { inet_ntop(AF_INET6, &sin6->sin6_addr, name, len); - return (0); + return 0; } if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) { if (numeric & 0x8000) { - strcpy(name, "default"); + strcpy(name, bb_str_default); } else { - strcpy(name, "*"); + name[0] = '*'; + name[1] = '\0'; } - return (0); + return 0; } s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6), name, len, NULL, 0, 0); if (s) { - error_msg("getnameinfo failed"); + bb_error_msg("getnameinfo failed"); return -1; } - return (0); + return 0; } #endif /* CONFIG_FEATURE_IPV6 */