Merge commit 'pan/master' into not-linux

[apps/pfixtools.git] / postlicyd / main-postlicyd.c

diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c
index 70389bf..9baf34a 100644 (file)
--- a/postlicyd/main-postlicyd.c
+++ b/postlicyd/main-postlicyd.c
@@ -38,22 +38,22 @@
 
 #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"
 
 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)
 {
@@ -73,12 +73,17 @@ static void query_stopper(void *data)
 
 static bool config_refresh(void *mconfig)
 {
+    refresh = true;
     if (filter_running > 0) {
-        sighup = true;
-        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)
@@ -105,11 +110,22 @@ static void policy_answer(server_t *pcy, const char *message)
     }
     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) {
+        query_context_t *context = pcy->data;
+        if (hook->counter >= 0 && hook->counter < MAX_COUNTERS && hook->cost > 0) {
+            context->context.counters[hook->counter] += hook->cost;
+            debug("request client=%s, from=<%s>, to=<%s>: added %d to counter %d (now %u)",
+                  query->client_name,
+                  query->sender == NULL ? "undefined" : query->sender,
+                  query->recipient == NULL ? "undefined" : query->recipient,
+                  hook->cost, hook->counter, context->context.counters[hook->counter]);
+        }
+    }
     if (hook == NULL) {
         warn("request client=%s, from=<%s>, to=<%s>: aborted",
              query->client_name,
@@ -175,7 +191,8 @@ static bool policy_process(server_t *pcy, const config_t *mconfig)
 
 static int policy_run(server_t *pcy, void* vconfig)
 {
-    if (sighup) {
+    if (refresh) {
+        array_add(busy, pcy);
         return 0;
     }
 
@@ -205,7 +222,11 @@ 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);
+    if (query->instance == NULL || strcmp(context->context.instance, query->instance) != 0) {
+        filter_context_clean(&context->context);
+        m_strcat(context->context.instance, 64, query->instance);
+    }
+    server_none(pcy);
     return policy_process(pcy, mconfig) ? 0 : -1;
 }
 
@@ -225,6 +246,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)
@@ -232,7 +256,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)
 {