Added new option '-c' to specify configuration name in control block.

[yaz-moved-to-github.git] / server / statserv.c

diff --git a/server/statserv.c b/server/statserv.c
index 5edcc2e..7d24826 100644 (file)
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,28 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
- * Revision 1.24  1995-06-16 10:31:39  quinn
+ * Revision 1.31  1995-11-17 11:09:39  adam
+ * Added new option '-c' to specify configuration name in control block.
+ *
+ * Revision 1.30  1995/11/01  13:54:59  quinn
+ * Minor adjustments
+ *
+ * Revision 1.29  1995/10/30  12:41:29  quinn
+ * Added hostname lookup for server.
+ *
+ * Revision 1.28  1995/09/29  17:12:30  quinn
+ * Smallish
+ *
+ * Revision 1.27  1995/09/27  15:03:02  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.26  1995/08/29  14:44:51  quinn
+ * Reset timeouts.
+ *
+ * Revision 1.25  1995/08/29  11:18:02  quinn
+ * Added code to receive close
+ *
+ * Revision 1.24  1995/06/16  10:31:39  quinn
  * Added session timeout.
  *
  * Revision 1.23  1995/06/15  12:30:48  quinn
@@ -93,6 +114,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <pwd.h>
+#include <sys/time.h>
 
 #include <options.h>
 #include <eventl.h>
@@ -103,7 +125,6 @@
 #ifdef USE_XTIMOSI
 #include <xmosi.h>
 #endif
-#include <dmalloc.h>
 #include <log.h>
 #include <statserv.h>
 
@@ -118,14 +139,12 @@ static statserv_options_block control_block = {
     "",                         /* diagnostic output to stderr */
     "tcp:@:9999",               /* default listener port */
     PROTO_Z3950,                /* default application protocol */
-    2*60,                       /* idle timeout (minutes) */
+    60,                         /* idle timeout (minutes) */
     1024*1024,                  /* maximum PDU size (approx.) to allow */
     "default-config",           /* configuration name to pass to backend */
     ""                          /* set user id */
 };
 
-#define DEFAULT_LISTENER "tcp:localhost:9999"
-
 /*
  * handle incoming connect requests.
  * The dynamic mode is a bit tricky mostly because we want to avoid
@@ -203,6 +222,7 @@ static void listener(IOCHAN h, int event)
     {
        COMSTACK new_line;
        IOCHAN new_chan;
+       char *a;
 
        if (!(new_line = cs_accept(line)))
        {
@@ -241,7 +261,8 @@ static void listener(IOCHAN h, int event)
        }
        iochan_setdata(new_chan, newas);
        iochan_settimeout(new_chan, control_block.idle_timeout * 60);
-       logf(LOG_LOG, "accepted connection");
+       a = cs_addrstr(new_line);
+       logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]");
     }
     else
     {
@@ -344,7 +365,7 @@ int statserv_main(int argc, char **argv)
     int protocol = control_block.default_proto;
 
     me = argv[0];
-    while ((ret = options("a:szSl:v:u:", argv, argc, &arg)) != -2)
+    while ((ret = options("a:szSl:v:u:c:", argv, argc, &arg)) != -2)
     {
        switch (ret)
        {
@@ -367,10 +388,14 @@ int statserv_main(int argc, char **argv)
                strcpy(control_block.apdufile, arg ? arg : ""); break;
            case 'u':
                strcpy(control_block.setuid, arg ? arg : ""); break;
+            case 'c':
+                strcpy(control_block.configname, arg ? arg : ""); break;
            default:
-               fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel> -l <logfile> -u <user> -zsS <listener-addr> ... ]\n", me);
+               fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
+                        " -l <logfile> -u <user> -c <config>"
+                        " -zsS <listener-addr> ... ]\n", me);
                exit(1);
-       }
+            }
     }
     if (control_block.dynamic)
        signal(SIGCHLD, catchchld);