X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fmain-postlicyd.c;h=5f46e76e2377171cd1d242f6e3976fcccdb1c4f1;hb=d62db0ebbc77f2a21da071ac033684411329d717;hp=e75965f0a703c2c630f6e905c52f13ca643a4514;hpb=9fc48ba2176a71585c13cd346968bdba499e80de;p=apps%2Fpfixtools.git

diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c
index e75965f..5f46e76 100644
--- a/postlicyd/main-postlicyd.c
+++ b/postlicyd/main-postlicyd.c
@@ -56,6 +56,11 @@ static void *query_starter(server_t* server)
     return query_new();
 }
 
+static bool config_refresh(void *config)
+{
+    return config_reload(config);
+}
+
 static int postfix_parsejob(query_t *query, char *p)
 {
 #define PARSE_CHECK(expr, error, ...)                                        \
@@ -167,24 +172,23 @@ static void policy_answer(server_t *pcy, const char *fmt, ...)
     epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy);
 }
 
-static void policy_process(server_t *pcy, config_t *config)
+static bool policy_process(server_t *pcy, const config_t *config)
 {
     const query_t* query = pcy->data;
-    filter_t *filter;
+    const filter_t *filter;
     if (config->entry_points[query->state] == -1) {
         syslog(LOG_WARNING, "no filter defined for current protocol_state (%d)", query->state);
-        policy_answer(pcy, "DUNNO");
-        return;
+        return false;
     }
     filter = array_ptr(config->filters, config->entry_points[query->state]);
     while (true) {
-        filter_hook_t *hook = filter_run(filter, query);
+        const filter_hook_t *hook = filter_run(filter, query);
         if (hook == NULL) {
-            policy_answer(pcy, "DUNNO");
-            return;
+            syslog(LOG_WARNING, "request aborted");
+            return false;
         } else if (hook->postfix) {
             policy_answer(pcy, "%s", hook->value);
-            return;
+            return true;
         } else {
             filter = array_ptr(config->filters, hook->filter_id);
         }
@@ -193,11 +197,11 @@ static void policy_process(server_t *pcy, config_t *config)
 
 static int policy_run(server_t *pcy, void* vconfig)
 {
-    ssize_t search_offs = MAX(0, pcy->ibuf.len - 1);
+    ssize_t search_offs = MAX(0, (ssize_t)(pcy->ibuf.len - 1));
     int nb = buffer_read(&pcy->ibuf, pcy->fd, -1);
     const char *eoq;
     query_t  *query  = pcy->data;
-    config_t *config = vconfig;
+    const config_t *config = vconfig;
 
     if (nb < 0) {
         if (errno == EAGAIN || errno == EINTR)
@@ -218,8 +222,7 @@ static int policy_run(server_t *pcy, void* vconfig)
         return -1;
     query->eoq = eoq + strlen("\n\n");
     epoll_modify(pcy->fd, 0, pcy);
-    policy_process(pcy, config);
-    return 0;
+    return policy_process(pcy, config) ? 0 : -1;
 }
 
 int start_listener(int port)
@@ -248,6 +251,7 @@ int main(int argc, char *argv[])
     const char *pidfile = NULL;
     bool daemonize = true;
     int port = DEFAULT_PORT;
+    bool port_from_cli = false;
 
     for (int c = 0; (c = getopt(argc, argv, "hf" "l:p:")) >= 0; ) {
         switch (c) {
@@ -259,6 +263,7 @@ int main(int argc, char *argv[])
             break;
           case 'l':
             port = atoi(optarg);
+            port_from_cli = true;
             break;
           case 'f':
             daemonize = false;
@@ -278,15 +283,19 @@ int main(int argc, char *argv[])
     if (config == NULL) {
         return EXIT_FAILURE;
     }
+    if (port_from_cli || config->port == 0) {
+        config->port = port;
+    }
 
     if (common_setup(pidfile, false, RUNAS_USER, RUNAS_GROUP,
                      daemonize) != EXIT_SUCCESS
-        || start_listener(port) < 0) {
+        || start_listener(config->port) < 0) {
+        config_delete(&config);
         return EXIT_FAILURE;
     }
     {
         int res = server_loop(query_starter, (delete_client_t)query_delete,
-                              policy_run, config);
+                              policy_run, config_refresh, config);
         config_delete(&config);
         return res;
     }