X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=4e3db64cd5301b6b6a800e54d90f17b95f580137;hb=94c77ca831e55b3dee31184347f25dd0583085d2;hp=3480c5d3406f0665ec8b05a461fd84dc612d3cd8;hpb=ac286ae76051058c8e340bf84eb98391340b7d22;p=yaz-moved-to-github.git

diff --git a/server/statserv.c b/server/statserv.c
index 3480c5d..4e3db64 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -6,7 +6,7 @@
  * NT threaded server code by
  *   Chas Woodfield, Fretwell Downing Informatics.
  *
- * $Id: statserv.c,v 1.92 2003-02-14 18:49:24 adam Exp $
+ * $Id: statserv.c,v 1.98 2003-03-03 19:57:35 adam Exp $
  */
 
 #include <stdio.h>
@@ -58,7 +58,7 @@ statserv_options_block control_block = {
     "",                         /* diagnostic output to stderr */
     "tcp:@:9999",               /* default listener port */
     PROTO_Z3950,                /* default application protocol */
-    60,                         /* idle timeout (minutes) */
+    15,                         /* idle timeout (minutes) */
     1024*1024,                  /* maximum PDU size (approx.) to allow */
     "default-config",           /* configuration name to pass to backend */
     "",                         /* set user id */
@@ -80,6 +80,8 @@ statserv_options_block control_block = {
     0                           /* SOAP handlers */
 };
 
+static int max_sessions = 0;
+
 /*
  * handle incoming connect requests.
  * The dynamic mode is a bit tricky mostly because we want to avoid
@@ -305,7 +307,7 @@ static void listener(IOCHAN h, int event)
 
 	yaz_log(LOG_DEBUG, "Setting timeout %d", control_block.idle_timeout);
 	iochan_setdata(new_chan, newas);
-	iochan_settimeout(new_chan, control_block.idle_timeout * 60);
+	iochan_settimeout(new_chan, 60);
 
 	/* Now what we need todo is create a new thread with this iochan as
 	   the parameter */
@@ -565,10 +567,16 @@ static void *new_session (void *vp)
     newas->cs_get_mask = cs_get_mask;
 
     iochan_setdata(new_chan, newas);
-    iochan_settimeout(new_chan, control_block.idle_timeout * 60);
+    iochan_settimeout(new_chan, 60);
+#if 1
     a = cs_addrstr(new_line);
+#else
+    a = 0;
+#endif
     yaz_log(LOG_LOG, "Starting session %d from %s",
         no_sessions, a ? a : "[Unknown]");
+    if (max_sessions && no_sessions == max_sessions)
+        control_block.one_shot = 1;
     if (control_block.threads)
     {
 	event_loop(&new_chan);
@@ -598,7 +606,7 @@ static void inetd_connection(int what)
             if ((assoc = create_association(chan, line)))
             {
                 iochan_setdata(chan, assoc);
-                iochan_settimeout(chan, control_block.idle_timeout * 60);
+                iochan_settimeout(chan, 60);
                 addr = cs_addrstr(line);
                 yaz_log(LOG_LOG, "Inetd association from %s",
                         addr ? addr : "[UNKNOWN]");
@@ -692,31 +700,8 @@ void statserv_setcontrol(statserv_options_block *block)
     memcpy(&control_block, block, sizeof(*block));
 }
 
-void statserv_add_soap_handler(int (*h)(struct bend_soap_rr *rr),
-                               const char *ns)
-{
-    struct bend_soap_handler *sh = (struct bend_soap_handler *)
-	    xmalloc(sizeof(*sh));
-
-    sh->handler = h;
-    sh->ns = xstrdup(ns);
-    sh->next = control_block.soap_handlers;
-    control_block.soap_handlers = sh;
-    yaz_log(LOG_LOG, "soap handler added");
-}
-
 static void statserv_reset(void)
 {
-    struct bend_soap_handler *sh = control_block.soap_handlers;
-
-    control_block.soap_handlers = 0;
-    while (sh)
-    {
-        struct bend_soap_handler *sh_next = sh->next;
-        xfree (sh->ns);
-        xfree (sh);
-        sh = sh_next;
-    }
 }
 
 int statserv_start(int argc, char **argv)
@@ -802,7 +787,7 @@ int check_options(int argc, char **argv)
     int ret = 0, r;
     char *arg;
 
-    while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:", argv, argc, &arg)) != -2)
+    while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:D:", argv, argc, &arg)) != -2)
     {
     	switch (ret)
     	{
@@ -882,6 +867,9 @@ int check_options(int argc, char **argv)
 		return 1;
 	    }
 	    break;
+        case 'D':
+            max_sessions = atoi(arg);
+            break;
 	default:
 	    fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
 		    " -l <logfile> -u <user> -c <config> -t <minutes>"