X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fstatserv.c;h=766a87323bfc3d77567f95d2ed7437da2da1a003;hp=7d24826e0f137d5ddbc57b341f30c2da06ee7905;hb=e0816c15e2756bff6ef9265ac72ad5baf5306be9;hpb=91921982a89c15eaea23d60b2e01ec7261513c33

diff --git a/server/statserv.c b/server/statserv.c
index 7d24826..766a873 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
- * Revision 1.31  1995-11-17 11:09:39  adam
+ * Revision 1.35  1996-05-29 10:03:28  quinn
+ * Options work
+ *
+ * Revision 1.34  1996/02/21  13:12:07  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.33  1996/02/10  12:23:49  quinn
+ * Enable inetd operations fro TCP/IP stack
+ *
+ * Revision 1.32  1996/01/19  15:41:52  quinn
+ * *** empty log message ***
+ *
+ * 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
@@ -178,9 +190,19 @@ static void listener(IOCHAN h, int event)
 	    else if (res == 0) /* child */
 	    {
 	    	char nbuf[100];
+		IOCHAN pp;
 
 		close(hand[0]);
 		child = 1;
+		for (pp = iochan_getchan(); pp; pp = iochan_getnext(pp))
+		{
+		    if (pp != h)
+		    {
+			COMSTACK l = iochan_getdata(pp);
+			cs_close(l);
+			iochan_destroy(pp);
+		    }
+		}
 		sprintf(nbuf, "%s(%d)", me, getpid());
 		log_init(control_block.loglevel, nbuf, 0);
 	    }
@@ -234,7 +256,7 @@ static void listener(IOCHAN h, int event)
 	if (control_block.dynamic)
 	{
 	    IOCHAN pp;
-	    /* close our half of the listener sockets */
+	    /* close our half of the listener socket */
 	    for (pp = iochan_getchan(); pp; pp = iochan_getnext(pp))
 	    {
 		COMSTACK l = iochan_getdata(pp);
@@ -271,6 +293,34 @@ static void listener(IOCHAN h, int event)
     }
 }
 
+static void inetd_connection(int what)
+{
+    COMSTACK line;
+    IOCHAN chan;
+    association *assoc;
+    char *addr;
+
+    if (!(line = cs_createbysocket(0, tcpip_type, 0, what)))
+    {
+	logf(LOG_ERRNO|LOG_FATAL, "Failed to create comstack on socket 0");
+	exit(1);
+    }
+    if (!(chan = iochan_create(cs_fileno(line), ir_session, EVENT_INPUT)))
+    {
+	logf(LOG_FATAL, "Failed to create iochan");
+	exit(1);
+    }
+    if (!(assoc = create_association(chan, line)))
+    {
+	logf(LOG_FATAL, "Failed to create association structure");
+	exit(1);
+    }
+    iochan_setdata(chan, assoc);
+    iochan_settimeout(chan, control_block.idle_timeout * 60);
+    addr = cs_addrstr(line);
+    logf(LOG_LOG, "Inetd association from %s", addr ? addr : "[UNKNOWN]");
+}
+
 /*
  * Set up a listening endpoint, and give it to the event-handler.
  */
@@ -360,12 +410,12 @@ void statserv_setcontrol(statserv_options_block *block)
 
 int statserv_main(int argc, char **argv)
 {
-    int ret, listeners = 0;
+    int ret, listeners = 0, inetd = 0, r;
     char *arg;
     int protocol = control_block.default_proto;
 
     me = argv[0];
-    while ((ret = options("a:szSl:v:u:c:", argv, argc, &arg)) != -2)
+    while ((ret = options("a:iszSl:v:u:c:w:t:k:", argv, argc, &arg)) != -2)
     {
     	switch (ret)
     	{
@@ -390,17 +440,50 @@ int statserv_main(int argc, char **argv)
 	    	strcpy(control_block.setuid, arg ? arg : ""); break;
             case 'c':
                 strcpy(control_block.configname, arg ? arg : ""); break;
+	    case 't':
+	        if (!arg || !(r = atoi(arg)))
+		{
+		    fprintf(stderr, "%s: Specify positive timeout for -t.\n",
+		        me);
+		    exit(1);
+		}
+		control_block.idle_timeout = r;
+		break;
+	    case  'k':
+	        if (!arg || !(r = atoi(arg)))
+		{
+		    fprintf(stderr, "%s: Specify positive timeout for -t.\n",
+			me);
+		    exit(1);
+		}
+		control_block.maxrecordsize = r * 1024;
+		break;
+	    case 'i':
+	    	inetd = 1; break;
+	    case 'w':
+	        if (chdir(arg))
+		{
+		    perror(arg);
+		    exit(1);
+		}
+		break;
 	    default:
-	    	fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
-                        " -l <logfile> -u <user> -c <config>"
-                        " -zsS <listener-addr> ... ]\n", me);
+	    	fprintf(stderr, "Usage: %s [ -i -a <pdufile> -v <loglevel>"
+                        " -l <logfile> -u <user> -c <config> -t <minutes>"
+			" -k <kilobytes>"
+                        " -zsS <listener-addr> -w <directory> ... ]\n", me);
 	    	exit(1);
             }
     }
-    if (control_block.dynamic)
-    	signal(SIGCHLD, catchchld);
-    if (!listeners && *control_block.default_listen)
-	add_listener(control_block.default_listen, protocol);
+    if (inetd)
+	inetd_connection(protocol);
+    else
+    {
+	if (control_block.dynamic)
+	    signal(SIGCHLD, catchchld);
+	if (!listeners && *control_block.default_listen)
+	    add_listener(control_block.default_listen, protocol);
+    }
     if (*control_block.setuid)
     {
     	struct passwd *pw;