X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main-postlicyd.c;h=97afe21d1daa54e0fc98391ee1a61ff14f66c935;hb=10b49f7af56977b8c27a26438b3cfb07ca63ae90;hp=6e48f58b25adf8918f6d213fededf7f65742c4ba;hpb=75e665838fab6bd7f579d8f2802b60435af1c783;p=apps%2Fpfixtools.git

diff --git a/main-postlicyd.c b/main-postlicyd.c
index 6e48f58..97afe21 100644
--- a/main-postlicyd.c
+++ b/main-postlicyd.c
@@ -37,8 +37,9 @@
 
 #include "buffer.h"
 #include "common.h"
-#include "threads.h"
+#include "epoll.h"
 #include "tokens.h"
+#include "server.h"
 
 #define DAEMON_NAME             "postlicyd"
 #define DEFAULT_PORT            10000
@@ -87,8 +88,23 @@ typedef struct query_t {
     const char *encryption_cipher;
     const char *encryption_keysize;
     const char *etrn_domain;
+
+    const char *eoq;
 } query_t;
 
+static void* query_new()
+{
+    return p_new(query_t, 1);
+}
+
+static void query_delete(void *arg)
+{
+    query_t **query = arg;
+    if (*query) {
+        p_delete(query);
+    }
+}
+
 static int postfix_parsejob(query_t *query, char *p)
 {
 #define PARSE_CHECK(expr, error, ...)                                        \
@@ -183,60 +199,64 @@ static int postfix_parsejob(query_t *query, char *p)
 #undef PARSE_CHECK
 }
 
-static void *policy_run(int fd, void *data)
+__attribute__((format(printf,2,0)))
+static void policy_answer(server_t *pcy, const char *fmt, ...)
 {
-    buffer_t buf;
-
-    buffer_init(&buf);
-    for (;;) {
-        ssize_t search_offs = MAX(0, buf.len - 1);
-        int nb = buffer_read(&buf, fd, -1);
-        const char *eoq;
-        query_t q;
-
-        if (nb < 0) {
-            if (errno == EAGAIN || errno == EINTR)
-                continue;
-            UNIXERR("read");
-            break;
-        }
-        if (nb == 0) {
-            if (buf.len)
-                syslog(LOG_ERR, "unexpected end of data");
-            break;
-        }
-
-        eoq = strstr(buf.data + search_offs, "\n\n");
-        if (!eoq)
-            continue;
+    va_list args;
+    va_start(args, fmt);
+    buffer_addvf(&pcy->obuf, fmt, args);
+    va_end(args);
+    buffer_addstr(&pcy->obuf, "\n\n");
+    buffer_consume(&pcy->ibuf, ((query_t*)(pcy->data))->eoq - pcy->ibuf.data);
+    epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy);
+}
 
-        if (postfix_parsejob(&q, buf.data) < 0)
-            break;
+static void policy_process(server_t *pcy)
+{
+    policy_answer(pcy, "DUNNO");
+}
 
-        buffer_consume(&buf, eoq + strlen("\n\n") - buf.data);
-        if (xwrite(fd, "DUNNO\n\n", strlen("DUNNO\n\n"))) {
-            UNIXERR("write");
-            break;
-        }
+static int policy_run(server_t *pcy, void* config)
+{
+    ssize_t search_offs = MAX(0, pcy->ibuf.len - 1);
+    int nb = buffer_read(&pcy->ibuf, pcy->fd, -1);
+    const char *eoq;
+
+    if (nb < 0) {
+        if (errno == EAGAIN || errno == EINTR)
+            return 0;
+        UNIXERR("read");
+        return -1;
+    }
+    if (nb == 0) {
+        if (pcy->ibuf.len)
+            syslog(LOG_ERR, "unexpected end of data");
+        return -1;
     }
-    buffer_wipe(&buf);
 
-    close(fd);
-    return NULL;
+    if (!(eoq = strstr(pcy->ibuf.data + search_offs, "\n\n")))
+        return 0;
+
+    if (postfix_parsejob(pcy->data, pcy->ibuf.data) < 0)
+        return -1;
+    ((query_t*)pcy->data)->eoq = eoq + strlen("\n\n");
+    epoll_modify(pcy->fd, 0, pcy);
+    policy_process(pcy);
+    return 0;
+}
+
+int start_listener(int port)
+{
+    return start_server(port, NULL, NULL);
 }
 
 /* administrivia {{{ */
 
 static int main_initialize(void)
 {
-    struct sigaction sa;
-
     openlog("postlicyd", LOG_PID, LOG_MAIL);
     signal(SIGPIPE, SIG_IGN);
-    sigaction(SIGINT, NULL, &sa);
-    sa.sa_handler = &common_sighandler;
-    sa.sa_flags  &= ~SA_RESTART;
-    sigaction(SIGINT, &sa, NULL);
+    signal(SIGINT,  &common_sighandler);
     signal(SIGTERM, &common_sighandler);
     signal(SIGHUP,  &common_sighandler);
     signal(SIGSEGV, &common_sighandler);
@@ -267,14 +287,9 @@ void usage(void)
 
 int main(int argc, char *argv[])
 {
-    struct sockaddr_in addr = {
-        .sin_family = AF_INET,
-        .sin_addr   = { htonl(INADDR_LOOPBACK) },
-    };
     const char *pidfile = NULL;
     bool daemonize = true;
     int port = DEFAULT_PORT;
-    int sock = -1;
 
     for (int c = 0; (c = getopt(argc, argv, "hf" "l:p:")) >= 0; ) {
         switch (c) {
@@ -315,23 +330,11 @@ int main(int argc, char *argv[])
 
     pidfile_refresh();
 
-    addr.sin_port = htons(port);
-    sock = tcp_listen((struct sockaddr *)&addr, sizeof(addr));
-    if (sock < 0)
+    if (start_listener(port) < 0)
         return EXIT_FAILURE;
 
-    while (!sigint) {
-        int fd = accept(sock, NULL, 0);
-        if (fd < 0) {
-            if (errno != EINTR && errno != EAGAIN)
-                UNIXERR("accept");
-            continue;
-        }
-        thread_launch(policy_run, fd, NULL);
-        threads_join();
-    }
+    (void)server_loop(query_new, query_delete, policy_run, NULL);
 
-    close(sock);
     syslog(LOG_INFO, "Stopping...");
     return EXIT_SUCCESS;
 }