X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main-srsd.c;h=c3549240d2f3f2b4b1ce885faddb2a9995d723bf;hb=b9983db8164466ba74eaf52285fe932846fb9f05;hp=891f7ee83b4fed1a2c21402659d805d069ebdf55;hpb=083a49e2edd85f2aa4cc949f4cbf4e7b00cdb88c;p=apps%2Fpfixtools.git

diff --git a/main-srsd.c b/main-srsd.c
index 891f7ee..c354924 100644
--- a/main-srsd.c
+++ b/main-srsd.c
@@ -33,20 +33,17 @@
  * Copyright © 2005-2007 Pierre Habouzit
  */
 
-#include <fcntl.h>
-#include <netinet/in.h>
-#include <sys/epoll.h>
-#include <sys/stat.h>
+#include "common.h"
 
 #include <srs2.h>
 
-#include "common.h"
+#include "epoll.h"
 #include "mem.h"
 #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"
 
@@ -163,7 +160,7 @@ int process_srs(srs_t *srs, const char *domain, srsd_t *srsd)
     return 0;
 }
 
-int start_listener(int epollfd, int port, bool decoder)
+int start_listener(int port, bool decoder)
 {
     struct sockaddr_in addr = {
         .sin_family = AF_INET,
@@ -224,6 +221,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);
 }
 
@@ -231,18 +229,9 @@ void usage(void)
 
 int main_loop(srs_t *srs, const char *domain, int port_enc, int port_dec)
 {
-    int exitcode = EXIT_SUCCESS;
-    int epollfd = epoll_create(128);
-
-    if (epollfd < 0) {
-        UNIXERR("epoll_create");
-        exitcode = EXIT_FAILURE;
-        goto error;
-    }
-
-    if (start_listener(epollfd, port_enc, false) < 0)
+    if (start_listener(port_enc, false) < 0)
         return EXIT_FAILURE;
-    if (start_listener(epollfd, port_dec, true) < 0)
+    if (start_listener(port_dec, true) < 0)
         return EXIT_FAILURE;
 
     while (!sigint) {
@@ -253,8 +242,7 @@ int main_loop(srs_t *srs, const char *domain, int port_enc, int port_dec)
         if (n < 0) {
             if (errno != EAGAIN && errno != EINTR) {
                 UNIXERR("epoll_wait");
-                exitcode = EXIT_FAILURE;
-                break;
+                return EXIT_FAILURE;
             }
             continue;
         }
@@ -328,10 +316,7 @@ int main_loop(srs_t *srs, const char *domain, int port_enc, int port_dec)
         }
     }
 
-    close(epollfd);
-
-  error:
-    return exitcode;
+    return EXIT_SUCCESS;
 }
 
 static srs_t *srs_read_secrets(const char *sfile)
@@ -378,25 +363,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;
 
-    if (atexit(common_shutdown)) {
-        fputs("Cannot hook my atexit function, quitting !\n", stderr);
-        return EXIT_FAILURE;
-    }
-    common_initialize();
-
-    for (int c = 0; (c = getopt(argc, argv, "he:d:p:u")) >= 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;
@@ -422,13 +404,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) {
@@ -436,24 +414,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;
 }