refactor.

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

diff --git a/main-postlicyd.c b/main-postlicyd.c
index ff5097f..39adf81 100644 (file)
--- a/main-postlicyd.c
+++ b/main-postlicyd.c
@@ -37,6 +37,7 @@
 
 #include "buffer.h"
 #include "common.h"
+#include "epoll.h"
 #include "threads.h"
 #include "tokens.h"
 
@@ -70,7 +71,7 @@ typedef struct query_t {
     const char *recipient_count;
     const char *client_address;
     const char *client_name;
-    const char *rclient_name;
+    const char *reverse_client_name;
     const char *instance;
 
     /* postfix 2.2+ */
@@ -89,6 +90,35 @@ typedef struct query_t {
     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;
+
+
+static plicyd_t *plicyd_new(void)
+{
+    plicyd_t *plicyd = p_new(plicyd_t, 1);
+    plicyd->fd = -1;
+    return plicyd;
+}
+
+#if 0
+static void plicyd_delete(plicyd_t **plicyd)
+{
+    if (*plicyd) {
+        if ((*plicyd)->fd >= 0)
+            close((*plicyd)->fd);
+        buffer_wipe(&(*plicyd)->ibuf);
+        buffer_wipe(&(*plicyd)->obuf);
+        p_delete(plicyd);
+    }
+}
+#endif
+
 static int postfix_parsejob(query_t *query, char *p)
 {
 #define PARSE_CHECK(expr, error, ...)                                        \
@@ -99,8 +129,8 @@ static int postfix_parsejob(query_t *query, char *p)
         }                                                                    \
     } while (0)
 
-    p_clear(&query, 1);
-    while (p[0] != '\r' || p[1] != '\n') {
+    p_clear(query, 1);
+    while (*p != '\n') {
         char *k, *v;
         int klen, vlen, vtk;
 
@@ -113,10 +143,10 @@ static int postfix_parsejob(query_t *query, char *p)
 
         while (isblank(*p))
             p++;
-        p = strstr(v = p, "\r\n");
-        PARSE_CHECK(p, "could not find final \\r\\n in line");
+        p = strchr(v = p, '\n');
+        PARSE_CHECK(p, "could not find final \\n in line");
         for (vlen = p - v; vlen && isblank(v[vlen]); vlen--);
-        p += 2; /* skip \r\n */
+        p += 1; /* skip \n */
 
         vtk = tokenize(v, vlen);
         switch (tokenize(k, klen)) {
@@ -128,7 +158,7 @@ static int postfix_parsejob(query_t *query, char *p)
             CASE(RECIPIENT_COUNT,     recipient_count);
             CASE(CLIENT_ADDRESS,      client_address);
             CASE(CLIENT_NAME,         client_name);
-            CASE(RCLIENT_NAME,        rclient_name);
+            CASE(REVERSE_CLIENT_NAME, reverse_client_name);
             CASE(INSTANCE,            instance);
             CASE(SASL_METHOD,         sasl_method);
             CASE(SASL_USERNAME,       sasl_username);
@@ -189,6 +219,7 @@ static void *policy_run(int fd, void *data)
 
     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;
@@ -205,15 +236,15 @@ static void *policy_run(int fd, void *data)
             break;
         }
 
-        eoq = strstr(buf.data + MAX(0, buf.len - 3), "\r\n\r\n");
+        eoq = strstr(buf.data + search_offs, "\n\n");
         if (!eoq)
             continue;
 
         if (postfix_parsejob(&q, buf.data) < 0)
             break;
 
-        buffer_consume(&buf, eoq + strlen("\r\n\r\n") - buf.data);
-        if (xwrite(fd, "DUNNO\r\n", strlen("DUNNO\r\n"))) {
+        buffer_consume(&buf, eoq + strlen("\n\n") - buf.data);
+        if (xwrite(fd, "DUNNO\n\n", strlen("DUNNO\n\n"))) {
             UNIXERR("write");
             break;
         }
@@ -224,6 +255,31 @@ static void *policy_run(int fd, void *data)
     return NULL;
 }
 
+int start_listener(int port)
+{
+    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) {
+        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");
+        return -1;
+    }
+    return 0;
+}
 /* administrivia {{{ */
 
 static int main_initialize(void)
@@ -261,14 +317,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) {
@@ -309,23 +360,40 @@ 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");
+        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;
         }
-        thread_launch(policy_run, fd, NULL);
+
+        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();
     }
 
-    close(sock);
     syslog(LOG_INFO, "Stopping...");
     return EXIT_SUCCESS;
 }