Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

Style, minor cleanups

Browse Source
This commit is contained in:
Glenn L McGrath 2002-11-28 09:52:23 +00:00
parent efdd0aed23
commit 30db423e11
1 changed files with 164 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libbb/inet_common.c
View File

@ -4,7 +4,7 @@
*
* Heavily modified by Manuel Novoa III Mar 12, 2001
*
* Version: $Id: inet_common.c,v 1.4 2002/11/26 02:35:15 bug1 Exp $
* Version: $Id: inet_common.c,v 1.5 2002/11/28 09:52:23 bug1 Exp $
*
*/
@ -43,17 +43,18 @@ 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) fprintf (stderr, "gethostbyname (%s)\n", name);
if (hostfirst) {
error_msg("gethostbyname (%s)", name);
}
#endif
if (hostfirst &&
(hp = gethostbyname(name)) != (struct hostent *) NULL) {
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;
}
/* Try the NETWORKS database to see if this is a known network. */
#ifdef DEBUG
fprintf (stderr, "getnetbyname (%s)\n", name);
error_msg("getnetbyname (%s)", name);
#endif
if ((np = getnetbyname(name)) != (struct netent *) NULL) {
s_in->sin_addr.s_addr = htonl(np->n_net);
@ -70,7 +71,7 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
#endif
#ifdef DEBUG
fprintf (stderr, "gethostbyname (%s)\n", name);
error_msg("gethostbyname (%s)", name);
#endif
if ((hp = gethostbyname(name)) == (struct hostent *) NULL) {
errno = h_errno;
@ -108,14 +109,15 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
/* Grmpf. -FvK */
if (s_in->sin_family != AF_INET) {
#ifdef DEBUG
fprintf(stderr, "rresolve: unsupport address family %d !\n", s_in->sin_family);
error_msg("rresolve: unsupport address family %d !",
s_in->sin_family);
#endif
errno = EAFNOSUPPORT;
return (-1);
}
ad = (unsigned long) s_in->sin_addr.s_addr;
#ifdef DEBUG
fprintf (stderr, "rresolve: %08lx, mask %08x, num %08x \n", ad, netmask, numeric);
error_msg("rresolve: %08lx, mask %08x, num %08x", ad, netmask, numeric);
#endif
if (ad == INADDR_ANY) {
if ((numeric & 0x0FFF) == 0) {
@ -141,7 +143,8 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
if (pn->addr.sin_addr.s_addr == ad && pn->host == host) {
safe_strncpy(name, pn->name, len);
#ifdef DEBUG
fprintf (stderr, "rresolve: found %s %08lx in cache\n", (host? "host": "net"), ad);
error_msg("rresolve: found %s %08lx in cache",
(host ? "host" : "net"), ad);
#endif
return (0);
}
@ -153,21 +156,24 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
ent = NULL;
if (host) {
#ifdef DEBUG
fprintf (stderr, "gethostbyaddr (%08lx)\n", ad);
error_msg("gethostbyaddr (%08lx)", ad);
#endif
ent = gethostbyaddr((char *) &ad, 4, AF_INET);
if (ent != NULL)
if (ent != NULL) {
safe_strncpy(name, ent->h_name, len);
}
} else {
#ifdef DEBUG
fprintf (stderr, "getnetbyaddr (%08lx)\n", host_ad);
error_msg("getnetbyaddr (%08lx)", host_ad);
#endif
np = getnetbyaddr(host_ad, AF_INET);
if (np != NULL)
if (np != NULL) {
safe_strncpy(name, np->n_name, len);
}
if ((ent == NULL) && (np == NULL))
}
if ((ent == NULL) && (np == NULL)) {
safe_strncpy(name, inet_ntoa(s_in->sin_addr), len);
}
pn = (struct addr *) xmalloc(sizeof(struct addr));
pn->addr = *s_in;
pn->next = INET_nn;
@ -188,7 +194,7 @@ int INET6_resolve(char *name, struct sockaddr_in6 *sin6)
memset(&req, '\0', sizeof req);
req.ai_family = AF_INET6;
if ((s = getaddrinfo(name, NULL, &req, &ai))) {
fprintf(stderr, "getaddrinfo: %s: %d\n", name, s);
error_msg("getaddrinfo: %s: %d", name, s);
return -1;
}
memcpy(sin6, ai->ai_addr, sizeof(struct sockaddr_in6));
@ -205,14 +211,15 @@ int INET6_resolve(char *name, struct sockaddr_in6 *sin6)
#endif
int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, int numeric)
int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6,
int numeric)
{
int s;
/* Grmpf. -FvK */
if (sin6->sin6_family != AF_INET6) {
#ifdef DEBUG
fprintf(stderr, _("rresolve: unsupport address family %d !\n"),
error_msg(_("rresolve: unsupport address family %d !\n"),
sin6->sin6_family);
#endif
errno = EAFNOSUPPORT;
@ -223,16 +230,17 @@ int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, int numeri
return (0);
}
if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
if (numeric & 0x8000)
if (numeric & 0x8000) {
strcpy(name, "default");
else
} else {
strcpy(name, "*");
}
return (0);
}
if ((s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6),
name, len , NULL, 0, 0))) {
fputs("getnameinfo failed\n", stderr);
s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6), name, len, NULL, 0, 0);
if (s) {
error_msg("getnameinfo failed");
return -1;
}
return (0);