X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fmain-postlicyd.c;h=59751676a371c46b16a36ae475995ff9c1c637d6;hb=0ad0ac6446aa4490800addafd8219f0f2a968c4d;hp=48233e010c6fc8697d807f7e5fefc12e0af40793;hpb=6deab7a7086ccb592daa0c41e12759ec0b9c7aa0;p=apps%2Fpfixtools.git

diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c
index 48233e0..5975167 100644
--- a/postlicyd/main-postlicyd.c
+++ b/postlicyd/main-postlicyd.c
@@ -38,14 +38,13 @@
 
 #include "buffer.h"
 #include "common.h"
-#include "epoll.h"
 #include "policy_tokens.h"
 #include "server.h"
 #include "config.h"
 #include "postlicyd.h"
 
 #define DAEMON_NAME             "postlicyd"
-#define DAEMON_VERSION          "0.2"
+#define DAEMON_VERSION          "0.3"
 #define DEFAULT_PORT            10000
 #define RUNAS_USER              "nobody"
 #define RUNAS_GROUP             "nogroup"
@@ -73,23 +72,78 @@ static void query_stopper(void *data)
 
 static bool config_refresh(void *mconfig)
 {
+    if (filter_running > 0) {
+        sleep(1);
+        return true;
+    }
     return config_reload(mconfig);
 }
 
-__attribute__((format(printf,2,0)))
-static void policy_answer(server_t *pcy, const char *fmt, ...)
+static void policy_answer(server_t *pcy, const char *message)
 {
-    va_list args;
     query_context_t *context = pcy->data;
     const query_t* query = &context->query;
 
     buffer_addstr(&pcy->obuf, "action=");
-    va_start(args, fmt);
-    buffer_addvf(&pcy->obuf, fmt, args);
-    va_end(args);
+    buffer_ensure(&pcy->obuf, m_strlen(message) + 64);
+
+    ssize_t size = array_size(pcy->obuf) - array_len(pcy->obuf);
+    ssize_t format_size = query_format(array_ptr(pcy->obuf, array_len(pcy->obuf)),
+                                       size, message, query);
+    if (format_size == -1) {
+        buffer_addstr(&pcy->obuf, message);
+    } else if (format_size > size) {
+        buffer_ensure(&pcy->obuf, format_size + 1);
+        query_format(array_ptr(pcy->obuf, array_len(pcy->obuf)),
+                     array_size(pcy->obuf) - array_len(pcy->obuf),
+                     message, query);
+        array_len(pcy->obuf) += format_size;
+    } else {
+        array_len(pcy->obuf) += format_size;
+    }
     buffer_addstr(&pcy->obuf, "\n\n");
     buffer_consume(&pcy->ibuf, query->eoq - pcy->ibuf.data);
-    epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy);
+    server_rw(pcy);
+}
+
+static const filter_t *next_filter(server_t *pcy, const filter_t *filter,
+                                   const query_t *query, const filter_hook_t *hook, bool *ok) {
+    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);
+        *ok = false;
+        return NULL;
+    } 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);
+        *ok = true;
+        return NULL;
+    } else if (hook->postfix) {
+        info("request client=%s, from=<%s>, to=<%s>: "
+             "awswer %s from filter %s: \"%s\"",
+             query->client_name,
+             query->sender == NULL ? "undefined" : query->sender,
+             query->recipient == NULL ? "undefined" : query->recipient,
+             htokens[hook->type], filter->name, hook->value);
+        policy_answer(pcy, hook->value);
+        *ok = true;
+        return NULL;
+    } else {
+        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);
+        return array_ptr(config->filters, hook->filter_id);
+    }
 }
 
 static bool policy_process(server_t *pcy, const config_t *mconfig)
@@ -108,39 +162,11 @@ static bool policy_process(server_t *pcy, const config_t *mconfig)
     }
     context->context.current_filter = NULL;
     while (true) {
+        bool  ok = false;
         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\"",
-                 query->client_name,
-                 query->sender == NULL ? "undefined" : query->sender,
-                 query->recipient == NULL ? "undefined" : query->recipient,
-                 htokens[hook->type], filter->name, hook->value);
-            policy_answer(pcy, "%s", hook->value);
-            return true;
-        } else {
-            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(mconfig->filters, hook->filter_id))->name);
-            filter = array_ptr(mconfig->filters, hook->filter_id);
+        filter = next_filter(pcy, filter, query, hook, &ok);
+        if (filter == NULL) {
+            return ok;
         }
     }
 }
@@ -173,28 +199,24 @@ static int policy_run(server_t *pcy, void* vconfig)
     if (!query_parse(pcy->data, pcy->ibuf.data))
         return -1;
     query->eoq = eoq + strlen("\n\n");
-    epoll_modify(pcy->fd, 0, pcy);
+    server_none(pcy);
     return policy_process(pcy, mconfig) ? 0 : -1;
 }
 
 static void policy_async_handler(filter_context_t *context,
                                  const filter_hook_t *hook)
 {
+    bool ok = false;
     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)) {
+    context->current_filter = next_filter(server, filter, query, hook, &ok);
+    if (context->current_filter != NULL) {
+        ok = policy_process(server, config);
+    }
+    if (!ok) {
         server_release(server);
     }
 }