Smallish

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

diff --git a/server/statserv.c b/server/statserv.c
index 5ac15e9..a692eb2 100644 (file)
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,25 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
- * Revision 1.22  1995-06-15 07:45:17  quinn
+ * 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
+ * Setuid-facility.
+ *
+ * Revision 1.22  1995/06/15  07:45:17  quinn
  * Moving to v3.
  *
  * Revision 1.21  1995/06/06  08:15:40  quinn
@@ -87,6 +105,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <pwd.h>
+#include <sys/time.h>
 
 #include <options.h>
 #include <eventl.h>
@@ -110,10 +129,10 @@ static statserv_options_block control_block = {
     LOG_DEFAULT_LEVEL,          /* log level */
     "",                         /* no PDUs */
     "",                         /* diagnostic output to stderr */
-    "tcp:localhost:9999",       /* default listener port */
-    PROTO_Z3950,                /* application protocol */
-    60,                         /* idle timeout (minutes) */
-    1024*1024*4,                /* maximum PDU size (approx.) to allow */
+    "tcp:@:9999",               /* default listener port */
+    PROTO_Z3950,                /* default application protocol */
+    2*60,                       /* idle timeout (minutes) */
+    1024*1024,                  /* maximum PDU size (approx.) to allow */
     "default-config",           /* configuration name to pass to backend */
     ""                          /* set user id */
 };
@@ -234,6 +253,7 @@ static void listener(IOCHAN h, int event)
            exit(1);
        }
        iochan_setdata(new_chan, newas);
+       iochan_settimeout(new_chan, control_block.idle_timeout * 60);
        logf(LOG_LOG, "accepted connection");
     }
     else
@@ -269,17 +289,20 @@ static void add_listener(char *where, int what)
        }
        type = tcpip_type;
     }
-#ifdef USE_XTIMOSI
     else if (!strcmp(mode, "osi"))
     {
+#ifdef USE_XTIMOSI
        if (!(ap = mosi_strtoaddr(addr)))
        {
            fprintf(stderr, "Address resolution failed for TCP.\n");
            exit(1);
        }
        type = mosi_type;
-    }
+#else
+       fprintf(stderr, "OSI Transport not allowed by configuration.\n");
+       exit(1);
 #endif
+    }
     else
     {
        fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n");
@@ -372,7 +395,7 @@ int statserv_main(int argc, char **argv)
        
        if (!(pw = getpwnam(control_block.setuid)))
        {
-           logf(LOG_FATAL|LOG_ERRNO, "%s", control_block.setuid);
+           logf(LOG_FATAL, "%s: Unknown user", control_block.setuid);
            exit(1);
        }
        if (setuid(pw->pw_uid) < 0)