bad typing

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

diff --git a/main-srsd.c b/main-srsd.c
index bcf9fea..ce4113b 100644 (file)
--- a/main-srsd.c
+++ b/main-srsd.c
@@ -42,8 +42,8 @@
 #include "buffer.h"
 
 #define DAEMON_NAME             "pfix-srsd"
-#define DEFAULT_ENCODER_PORT    10000
-#define DEFAULT_DECODER_PORT    10001
+#define DEFAULT_ENCODER_PORT    10001
+#define DEFAULT_DECODER_PORT    10002
 #define RUNAS_USER              "nobody"
 #define RUNAS_GROUP             "nogroup"
 
@@ -55,7 +55,6 @@
 typedef struct srsd_t {
     unsigned listener : 1;
     unsigned decoder  : 1;
-    unsigned watchwr  : 1;
     int fd;
     buffer_t ibuf;
     buffer_t obuf;
@@ -101,6 +100,11 @@ void urldecode(char *s, char *end)
 
 int process_srs(srs_t *srs, const char *domain, srsd_t *srsd)
 {
+    int res = buffer_read(&srsd->ibuf, srsd->fd, -1);
+
+    if ((res < 0 && errno != EINTR && errno != EAGAIN) || res == 0)
+        return -1;
+
     while (srsd->ibuf.len > 4) {
         char buf[BUFSIZ], *p, *q, *nl;
         int err;
@@ -166,7 +170,6 @@ int start_listener(int port, bool decoder)
         .sin_family = AF_INET,
         .sin_addr   = { htonl(INADDR_LOOPBACK) },
     };
-    struct epoll_event evt = { .events = EPOLLIN };
     srsd_t *tmp;
     int sock;
 
@@ -176,17 +179,31 @@ int start_listener(int port, bool decoder)
         return -1;
     }
 
-    evt.data.ptr  = tmp = srsd_new();
+    tmp           = srsd_new();
     tmp->fd       = sock;
     tmp->decoder  = decoder;
     tmp->listener = true;
-    if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sock, &evt) < 0) {
-        UNIXERR("epoll_ctl");
-        return -1;
-    }
+    epoll_register(sock, EPOLLIN, tmp);
     return 0;
 }
 
+void start_client(srsd_t *srsd)
+{
+    srsd_t *tmp;
+    int sock;
+
+    sock = accept_nonblock(srsd->fd);
+    if (sock < 0) {
+        UNIXERR("accept");
+        return;
+    }
+
+    tmp          = srsd_new();
+    tmp->decoder = srsd->decoder;
+    tmp->fd      = sock;
+    epoll_register(sock, EPOLLIN, tmp);
+}
+
 /* }}} */
 /* administrivia {{{ */
 
@@ -221,6 +238,7 @@ void usage(void)
           "                 (default: "STR(DEFAULT_DECODER_PORT)")\n"
           "    -p <pidfile> file to write our pid to\n"
           "    -u           unsafe mode: don't drop privilegies\n"
+          "    -f           stay in foreground\n"
          , stderr);
 }
 
@@ -237,7 +255,7 @@ int main_loop(srs_t *srs, const char *domain, int port_enc, int port_dec)
         struct epoll_event evts[1024];
         int n;
 
-        n = epoll_wait(epollfd, evts, countof(evts), -1);
+        n = epoll_select(evts, countof(evts), -1);
         if (n < 0) {
             if (errno != EAGAIN && errno != EINTR) {
                 UNIXERR("epoll_wait");
@@ -250,67 +268,28 @@ int main_loop(srs_t *srs, const char *domain, int port_enc, int port_dec)
             srsd_t *srsd = evts[n].data.ptr;
 
             if (srsd->listener) {
-                struct epoll_event evt = { .events = EPOLLIN };
-                srsd_t *tmp;
-                int sock;
-
-                sock = accept_nonblock(srsd->fd);
-                if (sock < 0) {
-                    UNIXERR("accept");
-                    continue;
-                }
-
-                evt.data.ptr = tmp = srsd_new();
-                tmp->decoder = srsd->decoder;
-                tmp->fd      = sock;
-                if (epoll_ctl(epollfd, EPOLL_CTL_ADD, sock, &evt) < 0) {
-                    UNIXERR("epoll_ctl");
-                    srsd_delete(&tmp);
-                    close(sock);
-                }
+                start_client(srsd);
                 continue;
             }
 
             if (evts[n].events & EPOLLIN) {
-                int res = buffer_read(&srsd->ibuf, srsd->fd, -1);
-
-                if ((res < 0 && errno != EINTR && errno != EAGAIN)
-                ||  res == 0)
-                {
-                    srsd_delete(&srsd);
-                    continue;
-                }
-
                 if (process_srs(srs, domain, srsd) < 0) {
                     srsd_delete(&srsd);
                     continue;
                 }
+                if (srsd->obuf.len) {
+                    epoll_register(srsd->fd, EPOLLIN | EPOLLOUT, srsd);
+                }
             }
 
             if ((evts[n].events & EPOLLOUT) && srsd->obuf.len) {
-                int res = write(srsd->fd, srsd->obuf.data, srsd->obuf.len);
-
-                if (res < 0 && errno != EINTR && errno != EAGAIN) {
+                if (buffer_write(&srsd->obuf, srsd->fd) < 0) {
                     srsd_delete(&srsd);
                     continue;
                 }
-
-                if (res > 0) {
-                    buffer_consume(&srsd->obuf, res);
-                }
-            }
-
-            if (srsd->watchwr == !srsd->obuf.len) {
-                struct epoll_event evt = {
-                    .events   = EPOLLIN | (srsd->obuf.len ? EPOLLOUT : 0),
-                    .data.ptr = srsd,
-                };
-                if (epoll_ctl(epollfd, EPOLL_CTL_MOD, srsd->fd, &evt) < 0) {
-                    UNIXERR("epoll_ctl");
-                    srsd_delete(&srsd);
-                    continue;
+                if (!srsd->obuf.len) {
+                    epoll_modify(srsd->fd, EPOLLIN, srsd);
                 }
-                srsd->watchwr = srsd->obuf.len != 0;
             }
         }
     }
@@ -362,19 +341,22 @@ static srs_t *srs_read_secrets(const char *sfile)
 int main(int argc, char *argv[])
 {
     bool unsafe  = false;
+    bool daemonize = true;
     int port_enc = DEFAULT_ENCODER_PORT;
     int port_dec = DEFAULT_DECODER_PORT;
     const char *pidfile = NULL;
 
-    FILE *f = NULL;
     int res;
     srs_t *srs;
 
-    for (int c = 0; (c = getopt(argc, argv, "hu" "e:d:p:")) >= 0; ) {
+    for (int c = 0; (c = getopt(argc, argv, "hfu" "e:d:p:")) >= 0; ) {
         switch (c) {
           case 'e':
             port_enc = atoi(optarg);
             break;
+          case 'f':
+            daemonize = false;
+            break;
           case 'd':
             port_dec = atoi(optarg);
             break;
@@ -400,13 +382,9 @@ int main(int argc, char *argv[])
         return EXIT_FAILURE;
     }
 
-    if (pidfile) {
-        f = fopen(pidfile, "w");
-        if (!f) {
-            syslog(LOG_CRIT, "unable to write pidfile %s", pidfile);
-        }
-        fprintf(f, "%d\n", getpid());
-        fflush(f);
+    if (pidfile_open(pidfile) < 0) {
+        syslog(LOG_CRIT, "unable to write pidfile %s", pidfile);
+        return EXIT_FAILURE;
     }
 
     if (!unsafe && drop_privileges(RUNAS_USER, RUNAS_GROUP) < 0) {
@@ -414,24 +392,13 @@ int main(int argc, char *argv[])
         return EXIT_FAILURE;
     }
 
-    if (daemon_detach() < 0) {
+    if (daemonize && daemon_detach() < 0) {
         syslog(LOG_CRIT, "unable to fork");
         return EXIT_FAILURE;
     }
 
-    if (f) {
-        rewind(f);
-        ftruncate(fileno(f), 0);
-        fprintf(f, "%d\n", getpid());
-        fflush(f);
-    }
+    pidfile_refresh();
     res = main_loop(srs, argv[optind], port_enc, port_dec);
-    if (f) {
-        rewind(f);
-        ftruncate(fileno(f), 0);
-        fclose(f);
-        f = NULL;
-    }
     syslog(LOG_INFO, "Stopping...");
     return res;
 }