~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Portability fix: Build where sizeof is not compatible with int
[secnet]
/
util.c
diff --git
a/util.c
b/util.c
index
0215f25
..
6742dad
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-204,7
+204,8
@@
static const char *phases[NR_PHASES]={
"PHASE_GETRESOURCES",
"PHASE_DROPPRIV",
"PHASE_RUN",
"PHASE_GETRESOURCES",
"PHASE_DROPPRIV",
"PHASE_RUN",
- "PHASE_SHUTDOWN"
+ "PHASE_SHUTDOWN",
+ "PHASE_CHILDPERSIST"
};
void enter_phase(uint32_t new_phase)
};
void enter_phase(uint32_t new_phase)
@@
-227,11
+228,19
@@
void phase_hooks_init(void)
LIST_INIT(&hooks[i]);
}
LIST_INIT(&hooks[i]);
}
+void clear_phase_hooks(uint32_t phase)
+{
+ struct phase_hook *h, *htmp;
+ LIST_FOREACH_SAFE(h, &hooks[phase], entry, htmp)
+ free(h);
+ LIST_INIT(&hooks[phase]);
+}
+
bool_t add_hook(uint32_t phase, hook_fn *fn, void *state)
{
struct phase_hook *h;
bool_t add_hook(uint32_t phase, hook_fn *fn, void *state)
{
struct phase_hook *h;
-
h=safe_malloc(sizeof(*h),"add_hook"
);
+
NEW(h
);
h->fn=fn;
h->state=state;
LIST_INSERT_HEAD(&hooks[phase],h,entry);
h->fn=fn;
h->state=state;
LIST_INSERT_HEAD(&hooks[phase],h,entry);
@@
-389,7
+398,7
@@
static list_t *buffer_apply(closure_t *self, struct cloc loc, dict_t *context,
bool_t lockdown=False;
uint32_t len=DEFAULT_BUFFER_SIZE;
bool_t lockdown=False;
uint32_t len=DEFAULT_BUFFER_SIZE;
-
st=safe_malloc(sizeof(*st),"buffer_apply"
);
+
NEW(st
);
st->cl.description="buffer";
st->cl.type=CL_BUFFER;
st->cl.apply=NULL;
st->cl.description="buffer";
st->cl.type=CL_BUFFER;
st->cl.apply=NULL;
@@
-517,6
+526,7
@@
void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia,
ia->sin.sin_family=AF_INET;
ia->sin.sin_addr.s_addr=string_item_to_ipaddr(item,desc);
ia->sin.sin_family=AF_INET;
ia->sin.sin_addr.s_addr=string_item_to_ipaddr(item,desc);
+ ia->sin.sin_port=htons(port);
#else /* CONFIG_IPV6 => we have adns_text2addr */
#else /* CONFIG_IPV6 => we have adns_text2addr */
@@
-533,33
+543,27
@@
void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia,
#endif /* CONFIG_IPV6 */
}
#endif /* CONFIG_IPV6 */
}
-#define IADDR_NBUFS_SHIFT 3
-#define IADDR_NBUFS (1 << IADDR_NBUFS_SHIFT)
+#define IADDR_NBUFS 8
const char *iaddr_to_string(const union iaddr *ia)
{
const char *iaddr_to_string(const union iaddr *ia)
{
- static int b;
-
- b++;
- b &= IADDR_NBUFS-1;
-
#ifndef CONFIG_IPV6
#ifndef CONFIG_IPV6
-
static char bufs[IADDR_NBUFS][100]
;
+
SBUF_DEFINE(IADDR_NBUFS, 100)
;
assert(ia->sa.sa_family == AF_INET);
assert(ia->sa.sa_family == AF_INET);
- snprintf(
bufs[b], sizeof(bufs[b]
), "[%s]:%d",
+ snprintf(
SBUF, sizeof(SBUF
), "[%s]:%d",
inet_ntoa(ia->sin.sin_addr),
ntohs(ia->sin.sin_port));
#else /* CONFIG_IPV6 => we have adns_addr2text */
inet_ntoa(ia->sin.sin_addr),
ntohs(ia->sin.sin_port));
#else /* CONFIG_IPV6 => we have adns_addr2text */
-
static char bufs[IADDR_NBUFS][1+ADNS_ADDR2TEXT_BUFLEN+20]
;
+
SBUF_DEFINE(IADDR_NBUFS, 1+ADNS_ADDR2TEXT_BUFLEN+20)
;
int port;
int port;
- char *addrbuf =
bufs[b]
;
+ char *addrbuf =
SBUF
;
*addrbuf++ = '[';
int addrbuflen = ADNS_ADDR2TEXT_BUFLEN;
*addrbuf++ = '[';
int addrbuflen = ADNS_ADDR2TEXT_BUFLEN;
@@
-567,7
+571,7
@@
const char *iaddr_to_string(const union iaddr *ia)
if (r) {
const char fmt[]= "scoped IPv6 addr, error: %.*s";
sprintf(addrbuf, fmt,
if (r) {
const char fmt[]= "scoped IPv6 addr, error: %.*s";
sprintf(addrbuf, fmt,
-
ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt
) /* underestimate */,
+
(int)(ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt)
) /* underestimate */,
strerror(r));
}
strerror(r));
}
@@
-575,26
+579,29
@@
const char *iaddr_to_string(const union iaddr *ia)
int addrl = strlen(addrbuf);
portbuf += addrl;
int addrl = strlen(addrbuf);
portbuf += addrl;
- snprintf(portbuf, sizeof(
bufs[b]
)-addrl, "]:%d", port);
+ snprintf(portbuf, sizeof(
SBUF
)-addrl, "]:%d", port);
#endif /* CONFIG_IPV6 */
#endif /* CONFIG_IPV6 */
- return
bufs[b]
;
+ return
SBUF
;
}
}
-bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib)
+bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib,
+ bool_t ignoreport)
{
if (ia->sa.sa_family != ib->sa.sa_family)
return 0;
switch (ia->sa.sa_family) {
case AF_INET:
return ia->sin.sin_addr.s_addr == ib->sin.sin_addr.s_addr
{
if (ia->sa.sa_family != ib->sa.sa_family)
return 0;
switch (ia->sa.sa_family) {
case AF_INET:
return ia->sin.sin_addr.s_addr == ib->sin.sin_addr.s_addr
- && ia->sin.sin_port == ib->sin.sin_port;
+ && (ignoreport ||
+ ia->sin.sin_port == ib->sin.sin_port);
#ifdef CONFIG_IPV6
case AF_INET6:
return !memcmp(&ia->sin6.sin6_addr, &ib->sin6.sin6_addr, 16)
#ifdef CONFIG_IPV6
case AF_INET6:
return !memcmp(&ia->sin6.sin6_addr, &ib->sin6.sin6_addr, 16)
- && ia->sin6.sin6_scope_id == ib->sin6.sin6_scope_id
- && ia->sin6.sin6_port == ib->sin6.sin6_port
+ && ia->sin6.sin6_scope_id == ib->sin6.sin6_scope_id
+ && (ignoreport ||
+ ia->sin6.sin6_port == ib->sin6.sin6_port)
/* we ignore the flowinfo field */;
#endif /* CONFIG_IPV6 */
default:
/* we ignore the flowinfo field */;
#endif /* CONFIG_IPV6 */
default:
@@
-613,6
+620,17
@@
int iaddr_socklen(const union iaddr *ia)
}
}
}
}
+const char *pollbadbit(int revents)
+{
+#define BADBIT(b) \
+ if ((revents & b)) return #b
+ BADBIT(POLLERR);
+ BADBIT(POLLHUP);
+ /* POLLNVAL is handled by the event loop - see afterpoll_fn comment */
+#undef BADBIT
+ return 0;
+}
+
enum async_linebuf_result
async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
const char **emsg_out)
enum async_linebuf_result
async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
const char **emsg_out)
@@
-620,12
+638,9
@@
async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
int revents=pfd->revents;
#define BAD(m) do{ *emsg_out=(m); return async_linebuf_broken; }while(0)
int revents=pfd->revents;
#define BAD(m) do{ *emsg_out=(m); return async_linebuf_broken; }while(0)
-#define BADBIT(b) \
- if (!(revents & b)) ; else BAD(#b)
- BADBIT(POLLERR);
- BADBIT(POLLHUP);
- /* POLLNVAL is handled by the event loop - see afterpoll_fn comment */
-#undef BADBIT
+
+ const char *badbit=pollbadbit(revents);
+ if (badbit) BAD(badbit);
if (!(revents & POLLIN))
return async_linebuf_nothing;
if (!(revents & POLLIN))
return async_linebuf_nothing;