updates.

[silc.git] / apps / silcd / silcd.c

diff --git a/apps/silcd/silcd.c b/apps/silcd/silcd.c
index 2c8914cd609eaf521f78eb5b138619a416db6e34..ace7c3ce463709c3689ebf491816a67eae593584 100644 (file)
--- a/apps/silcd/silcd.c
+++ b/apps/silcd/silcd.c
@@ -2,7 +2,7 @@
 
   silcd.c
   
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+  Author: Pekka Riikonen <priikone@silcnet.org>
 
   Copyright (C) 1997 - 2001 Pekka Riikonen
 
@@ -37,14 +37,13 @@ silc_server_create_key_pair(char *pkcs_name, int bits, char *path,
                            SilcPublicKey *ret_pub_key,
                            SilcPrivateKey *ret_prv_key);
 
-SILC_MUTEX_DEFINE(testi);
-
 /* Long command line options */
 static struct option long_opts[] = 
 {
   { "config-file", 1, NULL, 'f' },
-  { "debug", 0, NULL, 'd' },
+  { "debug", 1, NULL, 'd' },
   { "help", 0, NULL, 'h' },
+  { "foreground", 0, NULL, 'F' },
   { "version", 0, NULL,'V' },
 
   /* Key management options */
@@ -72,8 +71,9 @@ Usage: silcd [options]\n\
 \n\
   Generic Options:\n\
   -f  --config-file=FILE        Alternate configuration file\n\
-  -d  --debug                   Enable debugging (no daemon)\n\
+  -d  --debug=string            Enable debugging (Implies --foreground)\n\
   -h  --help                    Display this message\n\
+  -F  --foreground              Dont fork\n\
   -V  --version                 Display version\n\
 \n\
   Key Management Options:\n\
@@ -97,10 +97,38 @@ Usage: silcd [options]\n\
   exit(0);
 }
 
+/* Dies if a *valid* pid file exists already */
+
+static void silc_checkpid(SilcServer silcd)
+{
+  if (silcd->config->pidfile && silcd->config->pidfile->pid_file) {
+    int oldpid;
+    char *buf;
+    uint32 buf_len;
+
+    SILC_LOG_DEBUG(("Checking for another silcd running"));
+    buf = silc_file_readfile(silcd->config->pidfile->pid_file, &buf_len);
+    if (!buf)
+      return;
+    oldpid = atoi(buf);
+    silc_free(buf);
+    if (oldpid <= 0)
+      return;
+    kill(oldpid, SIGCHLD); /* this signal does nothing, check if alive */
+    if (errno != ESRCH) {
+      fprintf(stderr, "\nI detected another daemon running with the same pid file.\n");
+      fprintf(stderr, "Please change the config file, or erase the %s\n",
+       silcd->config->pidfile->pid_file);
+      exit(1);
+    }
+  }
+}
+
 int main(int argc, char **argv)
 {
   int ret;
   int opt, option_index;
+  int foreground = FALSE;
   char *config_file = NULL;
   SilcServer silcd;
   struct sigaction sa;
@@ -109,7 +137,7 @@ int main(int argc, char **argv)
 
   /* Parse command line arguments */
   if (argc > 1) {
-    while ((opt = getopt_long(argc, argv, "cf:dhVC:",
+    while ((opt = getopt_long(argc, argv, "cf:d:hFVC:",
                              long_opts, &option_index)) != EOF) {
       switch(opt) 
        {
@@ -121,15 +149,26 @@ int main(int argc, char **argv)
                 "version %s (base: SILC Toolkit %s)\n",
                  silc_dist_version, silc_version);
          printf("(c) 1997 - 2001 Pekka Riikonen "
-                "<priikone@poseidon.pspt.fi>\n");
+                "<priikone@silcnet.org>\n");
          exit(0);
          break;
        case 'd':
          silc_debug = TRUE;
+         silc_debug_hexdump = TRUE;
+         silc_log_set_debug_string(optarg);
+         foreground = TRUE;
+#ifndef SILC_DEBUG
+         fprintf(stdout, 
+                 "Run-time debugging is not enabled. To enable it recompile\n"
+                 "the server with --enable-debug configuration option.\n");
+#endif
          break;
        case 'f':
          config_file = strdup(optarg);
          break;
+       case 'F':
+         foreground = TRUE;
+         break;
 
          /*
           * Key management options
@@ -184,6 +223,9 @@ int main(int argc, char **argv)
   if (silcd->config == NULL)
     goto fail;
 
+  /* Check for another silcd running */
+  silc_checkpid(silcd);
+
   /* Initialize the server */
   ret = silc_server_init(silcd);
   if (ret == FALSE)
@@ -195,11 +237,21 @@ int main(int argc, char **argv)
   sigemptyset(&sa.sa_mask);
   sigaction(SIGPIPE, &sa, NULL);
 
-  if (silc_debug == FALSE)
-    /* Before running the server, fork to background and set
-       both user and group no non-root */    
+  /* Before running the server, fork to background. */
+  if (!foreground)
     silc_server_daemonise(silcd);
-  
+
+  /* If set, write pid to file */
+  if (silcd->config->pidfile && silcd->config->pidfile->pid_file) {
+    char buf[10];
+    unlink(silcd->config->pidfile->pid_file);
+    snprintf(buf, sizeof(buf) - 1, "%d\n", getpid());
+    silc_file_writefile(silcd->config->pidfile->pid_file, buf, strlen(buf));
+  }
+
+  /* Drop root. */
+  silc_server_drop(silcd);
+
   /* Run the server. When this returns the server has been stopped
      and we will exit. */
   silc_server_run(silcd);