X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main-srsd.c;h=67bda8873f894daa7739110df264beda5bfab82e;hb=8edd7234e1c30a16d914292dc652046ee581fa5b;hp=3634647812a1c0718308970aeb3e56d76f160ec4;hpb=9444dcb2ea8e2b24883d3f5740e28ca20d467ad2;p=apps%2Fpfixtools.git

diff --git a/main-srsd.c b/main-srsd.c
index 3634647..67bda88 100644
--- a/main-srsd.c
+++ b/main-srsd.c
@@ -49,16 +49,19 @@
 #define RUNAS_USER              "nobody"
 #define RUNAS_GROUP             "nogroup"
 
-#define __tostr(x)  #x
-#define STR(x)      __tostr(x)
+DECLARE_MAIN
 
 typedef struct srs_config_t {
     srs_t* srs;
     const char* domain;
 } srs_config_t;
 
-static const char* decoder_ptr = "decoder";
-static const char* encoder_ptr = "encoder";
+
+/* Server {{{1
+ */
+
+static const char* const decoder_ptr = "decoder";
+static const char* const encoder_ptr = "encoder";
 
 static void *srsd_new_decoder(void)
 {
@@ -70,11 +73,20 @@ static void *srsd_new_encoder(void)
     return (void*)encoder_ptr;
 }
 
-static void *srsd_stater(server_t *server)
+static void *srsd_starter(server_t *server)
 {
     return server->data;
 }
 
+int start_listener(int port, bool decoder)
+{
+    return start_server(port, decoder ? srsd_new_decoder : srsd_new_encoder, NULL);
+}
+
+
+/* Processing {{{1
+ */
+
 void urldecode(char *s, char *end)
 {
     char *p = s;
@@ -167,50 +179,42 @@ int process_srs(server_t *srsd, void* vconfig)
     return 0;
 }
 
-int start_listener(int port, bool decoder)
-{
-    return start_server(port, decoder ? srsd_new_decoder : srsd_new_encoder, NULL);
-}
 
-/* }}} */
-/* administrivia {{{ */
+/* config {{{1
+ */
 
-static int main_initialize(void)
-{
-    openlog(DAEMON_NAME, LOG_PID, LOG_MAIL);
-    signal(SIGPIPE, SIG_IGN);
-    signal(SIGINT,  &common_sighandler);
-    signal(SIGTERM, &common_sighandler);
-    signal(SIGHUP,  &common_sighandler);
-    signal(SIGSEGV, &common_sighandler);
-    syslog(LOG_INFO, "Starting...");
-    return 0;
-}
+static srs_config_t config = {
+    .srs = NULL,
+    .domain = NULL
+};
+
+/** overload srs_free since the lib is not properly maintained.
+ */
+#undef srs_free
 
-static void main_shutdown(void)
+inline void srs_free(srs_t* srs)
 {
-    closelog();
+    int  i;
+    for (i = 0; i < srs->numsecrets; i++) {
+        memset(srs->secrets[i], 0, strlen(srs->secrets[i]));
+        free(srs->secrets[i]);
+        srs->secrets[i] = '\0';
+    }
+    if (srs->secrets) {
+        free(srs->secrets);
+    }
+    free(srs);
 }
 
-module_init(main_initialize);
-module_exit(main_shutdown);
-
-void usage(void)
+static void config_shutdown(void)
 {
-    fputs("usage: "DAEMON_NAME" [options] domain secrets\n"
-          "\n"
-          "Options:\n"
-          "    -e <port>    port to listen to for encoding requests\n"
-          "                 (default: "STR(DEFAULT_ENCODER_PORT)")\n"
-          "    -d <port>    port to listen to for decoding requests\n"
-          "                 (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);
+    if (config.srs) {
+        srs_free(config.srs);
+        config.srs = NULL;
+    }
 }
 
-/* }}} */
+module_exit(config_shutdown);
 
 static srs_t *srs_read_secrets(const char *sfile)
 {
@@ -253,6 +257,27 @@ static srs_t *srs_read_secrets(const char *sfile)
     return NULL;
 }
 
+/* administrivia {{{1
+ */
+
+void usage(void)
+{
+    fputs("usage: "DAEMON_NAME" [options] domain secrets\n"
+          "\n"
+          "Options:\n"
+          "    -e <port>    port to listen to for encoding requests\n"
+          "                 (default: "STR(DEFAULT_ENCODER_PORT)")\n"
+          "    -d <port>    port to listen to for decoding requests\n"
+          "                 (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);
+}
+
+/* }}}
+ */
+
 int main(int argc, char *argv[])
 {
     bool unsafe  = false;
@@ -261,9 +286,6 @@ int main(int argc, char *argv[])
     int port_dec = DEFAULT_DECODER_PORT;
     const char *pidfile = NULL;
 
-    int res;
-    srs_t *srs;
-
     for (int c = 0; (c = getopt(argc, argv, "hfu" "e:d:p:")) >= 0; ) {
         switch (c) {
           case 'e':
@@ -292,40 +314,14 @@ int main(int argc, char *argv[])
         return EXIT_FAILURE;
     }
 
-    srs = srs_read_secrets(argv[optind + 1]);
-    if (!srs) {
+    config.domain = argv[optind];
+    config.srs = srs_read_secrets(argv[optind + 1]);
+    if (!config.srs
+        || common_setup(pidfile, unsafe, RUNAS_USER, RUNAS_GROUP,
+                        daemonize) != EXIT_SUCCESS
+        || start_listener(port_enc, false) < 0
+        || start_listener(port_dec, true) < 0) {
         return EXIT_FAILURE;
     }
-
-    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) {
-        syslog(LOG_CRIT, "unable to drop privileges");
-        return EXIT_FAILURE;
-    }
-
-    if (daemonize && daemon_detach() < 0) {
-        syslog(LOG_CRIT, "unable to fork");
-        return EXIT_FAILURE;
-    }
-
-    pidfile_refresh();
-    {
-      srs_config_t config = {
-        .srs    = srs,
-        .domain = argv[optind]
-      };
-
-      if (start_listener(port_enc, false) < 0)
-          return EXIT_FAILURE;
-      if (start_listener(port_dec, true) < 0)
-          return EXIT_FAILURE;
-
-      res = server_loop(srsd_stater, NULL, process_srs, &config);
-    }
-    syslog(LOG_INFO, "Stopping...");
-    return res;
+    return server_loop(srsd_starter, NULL, process_srs, &config);
 }