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

diff --git a/main-postlicyd.c b/main-postlicyd.c
index 39adf81..97afe21 100644
--- a/main-postlicyd.c
+++ b/main-postlicyd.c
@@ -38,8 +38,8 @@
 #include "buffer.h"
 #include "common.h"
 #include "epoll.h"
-#include "threads.h"
 #include "tokens.h"
+#include "server.h"
 
 #define DAEMON_NAME             "postlicyd"
 #define DEFAULT_PORT            10000
@@ -88,36 +88,22 @@ typedef struct query_t {
     const char *encryption_cipher;
     const char *encryption_keysize;
     const char *etrn_domain;
-} query_t;
-
-typedef struct plicyd_t {
-    unsigned listener : 1;
-    unsigned watchwr  : 1;
-    int fd;
-    buffer_t ibuf;
-    buffer_t obuf;
-} plicyd_t;
 
+    const char *eoq;
+} query_t;
 
-static plicyd_t *plicyd_new(void)
+static void* query_new()
 {
-    plicyd_t *plicyd = p_new(plicyd_t, 1);
-    plicyd->fd = -1;
-    return plicyd;
+    return p_new(query_t, 1);
 }
 
-#if 0
-static void plicyd_delete(plicyd_t **plicyd)
+static void query_delete(void *arg)
 {
-    if (*plicyd) {
-        if ((*plicyd)->fd >= 0)
-            close((*plicyd)->fd);
-        buffer_wipe(&(*plicyd)->ibuf);
-        buffer_wipe(&(*plicyd)->obuf);
-        p_delete(plicyd);
+    query_t **query = arg;
+    if (*query) {
+        p_delete(query);
     }
 }
-#endif
 
 static int postfix_parsejob(query_t *query, char *p)
 {
@@ -213,73 +199,57 @@ 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;
-
-        if (postfix_parsejob(&q, buf.data) < 0)
-            break;
-
-        buffer_consume(&buf, eoq + strlen("\n\n") - buf.data);
-        if (xwrite(fd, "DUNNO\n\n", strlen("DUNNO\n\n"))) {
-            UNIXERR("write");
-            break;
-        }
-    }
-    buffer_wipe(&buf);
+    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);
+}
 
-    close(fd);
-    return NULL;
+static void policy_process(server_t *pcy)
+{
+    policy_answer(pcy, "DUNNO");
 }
 
-int start_listener(int port)
+static int policy_run(server_t *pcy, void* config)
 {
-    struct sockaddr_in addr = {
-        .sin_family = AF_INET,
-        .sin_addr   = { htonl(INADDR_LOOPBACK) },
-    };
-    struct epoll_event evt = { .events = EPOLLIN };
-    plicyd_t *tmp;
-    int sock;
-
-    addr.sin_port = htons(port);
-    sock = tcp_listen_nonblock((const struct sockaddr *)&addr, sizeof(addr));
-    if (sock < 0) {
+    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;
     }
-
-    evt.data.ptr  = tmp = plicyd_new();
-    tmp->fd       = sock;
-    tmp->listener = true;
-    if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sock, &evt) < 0) {
-        UNIXERR("epoll_ctl");
+    if (nb == 0) {
+        if (pcy->ibuf.len)
+            syslog(LOG_ERR, "unexpected end of data");
         return -1;
     }
+
+    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)
@@ -363,36 +333,7 @@ int main(int argc, char *argv[])
     if (start_listener(port) < 0)
         return EXIT_FAILURE;
 
-    while (!sigint) {
-        struct epoll_event evts[1024];
-        int n;
-
-        n = epoll_wait(epollfd, evts, countof(evts), -1);
-        if (n < 0) {
-            if (errno != EAGAIN && errno != EINTR) {
-                UNIXERR("epoll_wait");
-                return EXIT_FAILURE;
-            }
-            continue;
-        }
-
-        while (--n >= 0) {
-            plicyd_t *d = evts[n].data.ptr;
-
-            if (d->listener) {
-                int fd = accept(d->fd, NULL, 0);
-                if (fd < 0) {
-                    if (errno != EINTR && errno != EAGAIN) {
-                        UNIXERR("accept");
-                        return EXIT_FAILURE;
-                    }
-                    continue;
-                }
-                thread_launch(policy_run, fd, NULL);
-            }
-        }
-        threads_join();
-    }
+    (void)server_loop(query_new, query_delete, policy_run, NULL);
 
     syslog(LOG_INFO, "Stopping...");
     return EXIT_SUCCESS;