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

diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c
index b71bebf..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,38 @@ 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,
@@ -117,7 +131,7 @@ static const filter_t *next_filter(server_t *pcy, const filter_t *filter,
              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);
+        policy_answer(pcy, hook->value);
         *ok = true;
         return NULL;
     } else {
@@ -185,7 +199,7 @@ 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;
 }