From: Florent Bruneau Date: Sun, 12 Oct 2008 21:26:50 +0000 (+0200) Subject: Fixes and wait for the end of request before refreshing conf. X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=a07ba1c6e9bc996a8a5f5bd641870259d7f35b99;p=apps%2Fpfixtools.git Fixes and wait for the end of request before refreshing conf. Signed-off-by: Florent Bruneau --- diff --git a/common/server.c b/common/server.c index d529896..b47da2f 100644 --- a/common/server.c +++ b/common/server.c @@ -34,7 +34,6 @@ */ #include "server.h" -#include "epoll.h" #include "common.h" static PA(server_t) listeners = ARRAY_INIT; @@ -66,7 +65,7 @@ static void server_wipe(server_t *server) } } -static void server_delete(server_t **server) +void server_delete(server_t **server) { if (*server) { buffer_wipe(&(*server)->ibuf); diff --git a/common/server.h b/common/server.h index e31b4ef..2757eae 100644 --- a/common/server.h +++ b/common/server.h @@ -65,6 +65,7 @@ ARRAY(server_t); int start_server(int port, start_listener_t starter, delete_client_t deleter); server_t *server_register(int fd, run_client_t runner, void *data); +void server_delete(server_t **server); void server_release(server_t *server); static inline void server_none(server_t *server) diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c index 5975167..9fc0368 100644 --- a/postlicyd/main-postlicyd.c +++ b/postlicyd/main-postlicyd.c @@ -51,8 +51,9 @@ DECLARE_MAIN -static config_t *config = NULL; - +static config_t *config = NULL; +static bool refresh = false; +static PA(server_t) busy = ARRAY_INIT; static void *query_starter(server_t* server) { @@ -72,11 +73,17 @@ static void query_stopper(void *data) static bool config_refresh(void *mconfig) { + refresh = true; if (filter_running > 0) { - sleep(1); return true; } - return config_reload(mconfig); + bool ret = config_reload(mconfig); + foreach (server_t **server, busy) { + server_ro(*server); + }} + array_len(busy) = 0; + refresh = false; + return ret; } static void policy_answer(server_t *pcy, const char *message) @@ -173,6 +180,11 @@ static bool policy_process(server_t *pcy, const config_t *mconfig) static int policy_run(server_t *pcy, void* vconfig) { + if (refresh) { + array_add(busy, pcy); + return 0; + } + int search_offs = MAX(0, (int)(pcy->ibuf.len - 1)); int nb = buffer_read(&pcy->ibuf, pcy->fd, -1); const char *eoq; @@ -219,6 +231,9 @@ static void policy_async_handler(filter_context_t *context, if (!ok) { server_release(server); } + if (refresh && filter_running == 0) { + config_refresh(config); + } } static int postlicyd_init(void) @@ -226,7 +241,13 @@ static int postlicyd_init(void) filter_async_handler_register(policy_async_handler); return 0; } + +static void postlicyd_shutdown(void) +{ + array_deep_wipe(busy, server_delete); +} module_init(postlicyd_init); +module_exit(postlicyd_shutdown); int start_listener(int port) {