X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fmain-postlicyd.c;h=677307095e965bb2cea8a06509d2b23d8f8af4b2;hb=ae0c2eb5d2ea501fd9e458fc138696c268a14569;hp=9ff1bc504b72d1a636afe6dd7150df2db90f8da1;hpb=f47b916bf7581b0070431eb70f43710e4c79fc98;p=apps%2Fpfixtools.git

diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c
index 9ff1bc5..6773070 100644
--- a/postlicyd/main-postlicyd.c
+++ b/postlicyd/main-postlicyd.c
@@ -41,10 +41,11 @@
 #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"
 #define DEFAULT_PORT            10000
 #define RUNAS_USER              "nobody"
 #define RUNAS_GROUP             "nogroup"
@@ -53,7 +54,18 @@ DECLARE_MAIN
 
 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)
@@ -65,7 +77,8 @@ __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);
@@ -78,21 +91,34 @@ static void policy_answer(server_t *pcy, const char *fmt, ...)
 
 static bool policy_process(server_t *pcy, const config_t *config)
 {
-    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) {
         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(config->filters, config->entry_points[query->state]);
+    }
     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\"",
@@ -103,7 +129,7 @@ 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,
@@ -117,10 +143,11 @@ static bool policy_process(server_t *pcy, const config_t *config)
 
 static int policy_run(server_t *pcy, void* vconfig)
 {
-    ssize_t search_offs = MAX(0, (ssize_t)(pcy->ibuf.len - 1));
+    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;
+    query_context_t *context = pcy->data;
+    query_t  *query  = &context->query;
     const config_t *config = vconfig;
 
     if (nb < 0) {
@@ -145,6 +172,15 @@ static int policy_run(server_t *pcy, void* vconfig)
     return policy_process(pcy, config) ? 0 : -1;
 }
 
+static bool policy_event(server_t *event, void *config)
+{
+    if (!policy_process(event, config)) {
+        server_release(event);
+        return true;
+    }
+    return true;
+}
+
 int start_listener(int port)
 {
     return start_server(port, NULL, NULL);
@@ -199,11 +235,17 @@ int main(int argc, char *argv[])
         }
     }
 
+    if (!daemonize) {
+        log_syslog = false;
+    }
+
     if (argc - optind != 1) {
         usage();
         return EXIT_FAILURE;
     }
 
+    info("starting %s v%s...", DAEMON_NAME, DAEMON_VERSION);
+
     if (pidfile_open(pidfile) < 0) {
         crit("unable to write pidfile %s", pidfile);
         return EXIT_FAILURE;
@@ -232,7 +274,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,
-                           policy_run, config_refresh, config);
+        return server_loop(query_starter, query_stopper,
+                           policy_run, policy_event, config_refresh, config);
     }
 }