projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openvt,getty,vfork_daemon_rexec,mount: tighten up fd cleanup code
[oweals/busybox.git]
/
libbb
/
inet_common.c
diff --git
a/libbb/inet_common.c
b/libbb/inet_common.c
index 75a03fda45ca6dbd3d4e968d8f9ec2420ae82aa4..9cdcb11deae95d14e2a26387b8afbfd1fbc0f7e1 100644
(file)
--- a/
libbb/inet_common.c
+++ b/
libbb/inet_common.c
@@
-12,8
+12,6
@@
#include "libbb.h"
#include "inet_common.h"
#include "libbb.h"
#include "inet_common.h"
-const char bb_INET_default[] = "default";
-
int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
{
struct hostent *hp;
int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
{
struct hostent *hp;
@@
-24,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. */
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;
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)) {
}
/* Look to see if it's a dotted quad. */
if (inet_aton(name, &s_in->sin_addr)) {
@@
-102,7
+100,7
@@
int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
s_in->sin_family);
#endif
errno = EAFNOSUPPORT;
s_in->sin_family);
#endif
errno = EAFNOSUPPORT;
- return
(-1)
;
+ return
-1
;
}
ad = (unsigned long) s_in->sin_addr.s_addr;
#ifdef DEBUG
}
ad = (unsigned long) s_in->sin_addr.s_addr;
#ifdef DEBUG
@@
-111,15
+109,15
@@
int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
if (ad == INADDR_ANY) {
if ((numeric & 0x0FFF) == 0) {
if (numeric & 0x8000)
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);
else
safe_strncpy(name, "*", len);
- return
(0)
;
+ return
0
;
}
}
if (numeric & 0x0FFF) {
safe_strncpy(name, inet_ntoa(s_in->sin_addr), len);
}
}
if (numeric & 0x0FFF) {
safe_strncpy(name, inet_ntoa(s_in->sin_addr), len);
- return
(0)
;
+ return
0
;
}
if ((ad & (~netmask)) != 0 || (numeric & 0x4000))
}
if ((ad & (~netmask)) != 0 || (numeric & 0x4000))
@@
-132,7
+130,7
@@
int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
bb_error_msg("rresolve: found %s %08lx in cache",
(host ? "host" : "net"), ad);
#endif
bb_error_msg("rresolve: found %s %08lx in cache",
(host ? "host" : "net"), ad);
#endif
- return
(0)
;
+ return
0
;
}
pn = pn->next;
}
}
pn = pn->next;
}
@@
-160,14
+158,14
@@
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);
}
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;
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
}
#ifdef CONFIG_FEATURE_IPV6
@@
-179,7
+177,8
@@
int INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
memset(&req, '\0', sizeof req);
req.ai_family = AF_INET6;
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) {
bb_error_msg("getaddrinfo: %s: %d", name, s);
return -1;
}
bb_error_msg("getaddrinfo: %s: %d", name, s);
return -1;
}
@@
-187,7
+186,7
@@
int INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
freeaddrinfo(ai);
freeaddrinfo(ai);
- return
(0)
;
+ return
0
;
}
#ifndef IN6_IS_ADDR_UNSPECIFIED
}
#ifndef IN6_IS_ADDR_UNSPECIFIED
@@
-205,23
+204,24
@@
int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6,
/* Grmpf. -FvK */
if (sin6->sin6_family != AF_INET6) {
#ifdef DEBUG
/* Grmpf. -FvK */
if (sin6->sin6_family != AF_INET6) {
#ifdef DEBUG
- bb_error_msg(
_("rresolve: unsupport address family %d !\n")
,
+ bb_error_msg(
"rresolve: unsupport address family %d!"
,
sin6->sin6_family);
#endif
errno = EAFNOSUPPORT;
sin6->sin6_family);
#endif
errno = EAFNOSUPPORT;
- return
(-1)
;
+ return
-1
;
}
if (numeric & 0x7FFF) {
inet_ntop(AF_INET6, &sin6->sin6_addr, name, len);
}
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) {
}
if (IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
if (numeric & 0x8000) {
- strcpy(name,
"default"
);
+ strcpy(name,
bb_str_default
);
} else {
} 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);
}
s = getnameinfo((struct sockaddr *) sin6, sizeof(struct sockaddr_in6), name, len, NULL, 0, 0);
@@
-229,7
+229,7
@@
int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6,
bb_error_msg("getnameinfo failed");
return -1;
}
bb_error_msg("getnameinfo failed");
return -1;
}
- return
(0)
;
+ return
0
;
}
#endif /* CONFIG_FEATURE_IPV6 */
}
#endif /* CONFIG_FEATURE_IPV6 */