Initial code commit for Toolkit 1.1.

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

diff --git a/apps/silcd/silcd.c b/apps/silcd/silcd.c
index 86d75b553536e0c8aa2cfe215003ec570ac1bfd5..2ab5106562a6a6d202937d438349cf2297183f8c 100644 (file)
--- a/apps/silcd/silcd.c
+++ b/apps/silcd/silcd.c
@@ -4,12 +4,11 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 1997 - 2003 Pekka Riikonen
+  Copyright (C) 1997 - 2005 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
+  the Free Software Foundation; version 2 of the License.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,6 +33,7 @@ static SilcServer silcd;
 
 static void silc_usage(void);
 
+#ifdef HAVE_GETOPT_LONG
 /* Long command line options */
 static struct option long_opts[] =
 {
@@ -54,6 +54,7 @@ static struct option long_opts[] =
 
   { NULL, 0, NULL, 0 }
 };
+#endif /* HAVE_GETOPT_LONG */
 
 /* Command line option variables */
 static char *opt_keypath = NULL;
@@ -260,14 +261,22 @@ SILC_TASK_CALLBACK(stop_server)
 SILC_TASK_CALLBACK(dump_stats)
 {
   FILE *fdd;
+  int fild;
   char filename[256];
 
   memset(filename, 0, sizeof(filename));
-  snprintf(filename, sizeof(filename) - 1, "/tmp/silcd.%d.stats", getpid());
-  fdd = fopen(filename, "w+");
-  if (!fdd)
+  snprintf(filename, sizeof(filename) - 1, "/tmp/silcd.%d.stats-XXXXXX", getpid());
+  fild = mkstemp(filename);
+  if (fild == -1)
     return;
 
+  fdd = fdopen(fild, "w");
+  if (fdd == NULL) {
+    close(fild);
+    unlink(filename);
+    return;
+  }
+
 #define STAT_OUTPUT(fmt, stat) fprintf(fdd, fmt "\n", (int)stat);
 
   fprintf(fdd, "SILC Server %s Statistics\n\n", silcd->server_name);
@@ -302,6 +311,8 @@ SILC_TASK_CALLBACK(dump_stats)
   STAT_OUTPUT("  Authentication failures : %d", silcd->stat.auth_failures);
   STAT_OUTPUT("  Packets sent            : %d", silcd->stat.packets_sent);
   STAT_OUTPUT("  Packets received        : %d", silcd->stat.packets_received);
+  STAT_OUTPUT("  Commands sent           : %d", silcd->stat.commands_sent);
+  STAT_OUTPUT("  Commands received       : %d", silcd->stat.commands_received);
   STAT_OUTPUT("  Connections             : %d", silcd->stat.conn_num);
 
 #undef STAT_OUTPUT
@@ -398,7 +409,7 @@ SILC_TASK_CALLBACK(dump_stats)
                  (unsigned char *)"N/A", client_entry->id ?
                  silc_id_render(client_entry->id, SILC_ID_CLIENT) : "N/A",
                  client_entry->data.status, server_entry ?
-                 server_entry->server_name ? server_entry->server_name : 
+                 server_entry->server_name ? server_entry->server_name :
                  "N/A" : "local");
          if (!silc_idcache_list_next(list, &id_cache))
            break;
@@ -419,7 +430,7 @@ SILC_TASK_CALLBACK(dump_stats)
                  (unsigned char *)"N/A", client_entry->id ?
                  silc_id_render(client_entry->id, SILC_ID_CLIENT) : "N/A",
                  client_entry->data.status, server_entry ?
-                 server_entry->server_name ? server_entry->server_name : 
+                 server_entry->server_name ? server_entry->server_name :
                  "N/A" : "local");
          if (!silc_idcache_list_next(list, &id_cache))
            break;
@@ -589,8 +600,12 @@ int main(int argc, char **argv)
 
   /* Parse command line arguments */
   if (argc > 1) {
+#ifdef HAVE_GETOPT_LONG
     while ((opt = getopt_long(argc, argv, "f:p:d:D:xhFVC:",
                              long_opts, &option_index)) != EOF) {
+#else
+    while ((opt = getopt(argc, argv, "f:p:d:D:xhFVC:")) != EOF) {
+#endif /* HAVE_GETOPT_LONG */
       switch(opt) {
        case 'h':
          silc_usage();
@@ -605,11 +620,11 @@ int main(int argc, char **argv)
          break;
        case 'd':
 #ifdef SILC_DEBUG
-         silc_debug = TRUE;
+         silc_log_debug(TRUE);
+         silc_log_quick(TRUE);
          if (optarg)
            silc_log_set_debug_string(optarg);
          foreground = TRUE;        /* implied */
-         silc_log_quick = TRUE;    /* implied */
 #else
          fprintf(stderr,
                  "Run-time debugging is not enabled. To enable it recompile\n"
@@ -618,11 +633,11 @@ int main(int argc, char **argv)
          break;
        case 'D':
 #ifdef SILC_DEBUG
-         silc_debug = TRUE;
+         silc_log_debug(TRUE);
+         silc_log_quick(TRUE);
          if (optarg)
            silc_get_debug_level(atoi(optarg));
          foreground = TRUE;        /* implied */
-         silc_log_quick = TRUE;    /* implied */
 #else
          fprintf(stderr,
                  "Run-time debugging is not enabled. To enable it recompile\n"
@@ -631,10 +646,10 @@ int main(int argc, char **argv)
          break;
        case 'x':
 #ifdef SILC_DEBUG
-         silc_debug_hexdump = TRUE;
-         silc_debug = TRUE; /* implied */
+         silc_log_debug(TRUE);
+         silc_log_debug_hexdump(TRUE);
+         silc_log_quick(TRUE);
          foreground = TRUE; /* implied */
-         silc_log_quick = TRUE; /* implied */
 #else
          fprintf(stderr,
                  "Run-time debugging is not enabled. To enable it recompile\n"
@@ -765,12 +780,9 @@ int main(int argc, char **argv)
       snprintf(buf, sizeof(buf) - 1, "%d\n", getpid());
       silc_file_writefile(pidfile, buf, strlen(buf));
     }
-  }
 
-  /* Drop root if we are not in debug mode, so you don't need to bother about
-     file writing permissions and so on */
-  if (!silc_debug)
     silc_server_drop_privs(silcd);
+  }
 
   /* Run the server. When this returns the server has been stopped
      and we will exit. */