X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=3c35cfbc2e5e2fa6f499a89fe9bb216ba1c762e7;hb=2004bbd9b3bbce5eb8ecc49520255b3d0bf578b9;hp=5ac15e9138b5f59e761ac5cb4d788e53996e48ec;hpb=1db60f5a7396b9b37560f6b6962be0b68240486c;p=yaz-moved-to-github.git

diff --git a/server/statserv.c b/server/statserv.c
index 5ac15e9..3c35cfb 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,31 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
- * Revision 1.22  1995-06-15 07:45:17  quinn
+ * 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
+ * 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 +111,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <pwd.h>
+#include <sys/time.h>
 
 #include <options.h>
 #include <eventl.h>
@@ -97,7 +122,6 @@
 #ifdef USE_XTIMOSI
 #include <xmosi.h>
 #endif
-#include <dmalloc.h>
 #include <log.h>
 #include <statserv.h>
 
@@ -110,16 +134,14 @@ 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 */
+    "tcp:@:9999",               /* default listener port */
+    PROTO_Z3950,                /* default application protocol */
     60,                         /* idle timeout (minutes) */
-    1024*1024*4,                /* maximum PDU size (approx.) to allow */
+    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
@@ -197,6 +219,7 @@ static void listener(IOCHAN h, int event)
     {
     	COMSTACK new_line;
     	IOCHAN new_chan;
+	char *a;
 
 	if (!(new_line = cs_accept(line)))
 	{
@@ -234,7 +257,9 @@ static void listener(IOCHAN h, int event)
 	    exit(1);
 	}
 	iochan_setdata(new_chan, newas);
-	logf(LOG_LOG, "accepted connection");
+	iochan_settimeout(new_chan, control_block.idle_timeout * 60);
+	a = cs_addrstr(new_line);
+	logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]");
     }
     else
     {
@@ -269,17 +294,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 +400,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)