~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian/changelog: wip 0.4.x
[secnet]
/
util.c
diff --git
a/util.c
b/util.c
index
c459f13
..
1d05822
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;
@@
-582,19
+591,22
@@
const char *iaddr_to_string(const union iaddr *ia)
return bufs[b];
}
return bufs[b];
}
-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: