X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fmain-postlicyd.c;h=48233e010c6fc8697d807f7e5fefc12e0af40793;hb=6deab7a7086ccb592daa0c41e12759ec0b9c7aa0;hp=751ff5a3783a31b592dbbf9cc4492084b19913a1;hpb=d25cf39d7cb4d2df2d7e2fa307c1c8f14bb018cc;p=apps%2Fpfixtools.git diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c index 751ff5a..48233e0 100644 --- a/postlicyd/main-postlicyd.c +++ b/postlicyd/main-postlicyd.c @@ -41,8 +41,8 @@ #include "epoll.h" #include "policy_tokens.h" #include "server.h" -#include "query.h" #include "config.h" +#include "postlicyd.h" #define DAEMON_NAME "postlicyd" #define DAEMON_VERSION "0.2" @@ -52,21 +52,36 @@ DECLARE_MAIN +static config_t *config = NULL; + + static void *query_starter(server_t* server) { - return query_new(); + query_context_t *context = p_new(query_context_t, 1); + filter_context_prepare(&context->context, context); + return context; +} + +static void query_stopper(void *data) +{ + query_context_t **context = data; + if (*context) { + filter_context_wipe(&(*context)->context); + p_delete(context); + } } -static bool config_refresh(void *config) +static bool config_refresh(void *mconfig) { - return config_reload(config); + return config_reload(mconfig); } __attribute__((format(printf,2,0))) static void policy_answer(server_t *pcy, const char *fmt, ...) { va_list args; - const query_t* query = pcy->data; + query_context_t *context = pcy->data; + const query_t* query = &context->query; buffer_addstr(&pcy->obuf, "action="); va_start(args, fmt); @@ -77,23 +92,37 @@ static void policy_answer(server_t *pcy, const char *fmt, ...) epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy); } -static bool policy_process(server_t *pcy, const config_t *config) +static bool policy_process(server_t *pcy, const config_t *mconfig) { - const query_t* query = pcy->data; + query_context_t *context = pcy->data; + const query_t* query = &context->query; const filter_t *filter; - if (config->entry_points[query->state] == -1) { + if (mconfig->entry_points[query->state] == -1) { warn("no filter defined for current protocol_state (%d)", query->state); return false; } - filter = array_ptr(config->filters, config->entry_points[query->state]); + if (context->context.current_filter != NULL) { + filter = context->context.current_filter; + } else { + filter = array_ptr(mconfig->filters, mconfig->entry_points[query->state]); + } + context->context.current_filter = NULL; while (true) { - const filter_hook_t *hook = filter_run(filter, query); + const filter_hook_t *hook = filter_run(filter, query, &context->context); if (hook == NULL) { warn("request client=%s, from=<%s>, to=<%s>: aborted", query->client_name, query->sender == NULL ? "undefined" : query->sender, query->recipient == NULL ? "undefined" : query->recipient); return false; + } else if (hook->async) { + debug("request client=%s, from=<%s>, to=<%s>: " + "asynchronous filter from filter %s", + query->client_name, + query->sender == NULL ? "undefined" : query->sender, + query->recipient == NULL ? "undefined" : query->recipient, + filter->name); + return true; } else if (hook->postfix) { info("request client=%s, from=<%s>, to=<%s>: " "awswer %s from filter %s: \"%s\"", @@ -104,14 +133,14 @@ static bool policy_process(server_t *pcy, const config_t *config) policy_answer(pcy, "%s", hook->value); return true; } else { - notice("request client=%s, from=<%s>, to=<%s>: " + debug("request client=%s, from=<%s>, to=<%s>: " "awswer %s from filter %s: next filter %s", query->client_name, query->sender == NULL ? "undefined" : query->sender, query->recipient == NULL ? "undefined" : query->recipient, htokens[hook->type], filter->name, - (array_ptr(config->filters, hook->filter_id))->name); - filter = array_ptr(config->filters, hook->filter_id); + (array_ptr(mconfig->filters, hook->filter_id))->name); + filter = array_ptr(mconfig->filters, hook->filter_id); } } } @@ -121,8 +150,10 @@ static int policy_run(server_t *pcy, void* vconfig) int search_offs = MAX(0, (int)(pcy->ibuf.len - 1)); int nb = buffer_read(&pcy->ibuf, pcy->fd, -1); const char *eoq; - query_t *query = pcy->data; - const config_t *config = vconfig; + query_context_t *context = pcy->data; + query_t *query = &context->query; + context->server = pcy; + const config_t *mconfig = vconfig; if (nb < 0) { if (errno == EAGAIN || errno == EINTR) @@ -143,8 +174,37 @@ static int policy_run(server_t *pcy, void* vconfig) return -1; query->eoq = eoq + strlen("\n\n"); epoll_modify(pcy->fd, 0, pcy); - return policy_process(pcy, config) ? 0 : -1; + return policy_process(pcy, mconfig) ? 0 : -1; +} + +static void policy_async_handler(filter_context_t *context, + const filter_hook_t *hook) +{ + const filter_t *filter = context->current_filter; + query_context_t *qctx = context->data; + query_t *query = &qctx->query; + server_t *server = qctx->server; + + debug("request client=%s, from=<%s>, to=<%s>: " + "awswer %s from filter %s: next filter %s", + query->client_name, + query->sender == NULL ? "undefined" : query->sender, + query->recipient == NULL ? "undefined" : query->recipient, + htokens[hook->type], filter->name, + (array_ptr(config->filters, hook->filter_id))->name); + context->current_filter = array_ptr(config->filters, hook->filter_id); + + if (!policy_process(server, config)) { + server_release(server); + } +} + +static int postlicyd_init(void) +{ + filter_async_handler_register(policy_async_handler); + return 0; } +module_init(postlicyd_init); int start_listener(int port) { @@ -221,7 +281,7 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } - config_t *config = config_read(argv[optind]); + config = config_read(argv[optind]); if (config == NULL) { return EXIT_FAILURE; } @@ -239,7 +299,7 @@ int main(int argc, char *argv[]) if (start_listener(config->port) < 0) { return EXIT_FAILURE; } else { - return server_loop(query_starter, (delete_client_t)query_delete, + return server_loop(query_starter, query_stopper, policy_run, config_refresh, config); } }