X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=e4297bc1d23501888de31cfe9394fe57adea56da;hb=fcd3a8318a95b56fa3724d800c4e6057774e0da5;hp=f7d20254236a56d439fd8ea71528dc3c83db9bb4;hpb=7f6f1b2def7cb8f2124168f90ea3e2e728bd39b3;p=yaz-moved-to-github.git

diff --git a/server/statserv.c b/server/statserv.c
index f7d2025..e4297bc 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-2000, Index Data
+ * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
@@ -7,7 +7,16 @@
  *   Chas Woodfield, Fretwell Downing Informatics.
  *
  * $Log: statserv.c,v $
- * Revision 1.69  2000-12-01 17:56:41  adam
+ * Revision 1.72  2001-03-25 21:55:13  adam
+ * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate.
+ *
+ * Revision 1.71  2001/03/21 12:43:36  adam
+ * Implemented cs_create_host. Better error reporting for SSL comstack.
+ *
+ * Revision 1.70  2001/02/01 08:52:26  adam
+ * Fixed bug regarding inetd mode.
+ *
+ * Revision 1.69  2000/12/01 17:56:41  adam
  * on WIN32 function statserv_closedown closes socket(s) to provoke close.
  *
  * Revision 1.68  2000/11/29 14:22:47  adam
@@ -782,6 +791,7 @@ static void inetd_connection(int what)
                 iochan_settimeout(chan, control_block.idle_timeout * 60);
                 addr = cs_addrstr(line);
                 yaz_log(LOG_LOG, "Inetd association from %s", addr ? addr : "[UNKNOWN]");
+		assoc->cs_get_mask = EVENT_INPUT;
             }
             else
             {
@@ -807,47 +817,24 @@ static void inetd_connection(int what)
 static void add_listener(char *where, int what)
 {
     COMSTACK l;
-    CS_TYPE type;
-    char mode[100], addr[100];
     void *ap;
     IOCHAN lst = NULL;
+    const char *mode;
 
-    if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2)
-    {
-	yaz_log (LOG_WARN, "%s: Address format: ('tcp'|'ssl')':'<address>",
-		 me);
-	return;
-    }
-    if (!strcmp(mode, "tcp"))
-	type = tcpip_type;
-    else if (!strcmp(mode, "ssl"))
-    {
-#if HAVE_OPENSSL_SSL_H
-	type = ssl_type;
-#else
-	yaz_log (LOG_WARN, "SSL Transport not allowed by configuration.");
-	return;
-#endif
-    }
+    if (control_block.dynamic)
+	mode = "dynamic";
+    else if (control_block.threads)
+	mode = "threaded";
     else
+	mode = "static";
+
+    yaz_log(LOG_LOG, "Adding %s %s listener on %s", mode,
+	    what == PROTO_SR ? "SR" : "Z3950", where);
+
+    l = cs_create_host(where, 0, &ap);
+    if (!l)
     {
-    	yaz_log (LOG_WARN, "You must specify either 'ssl:' or 'tcp:'");
-	return;
-    }
-    yaz_log(LOG_LOG, "Adding %s %s listener on %s",
-	    control_block.dynamic ? "dynamic" : 
-	    (control_block.threads ? "threaded" : "static"),
-    	what == PROTO_SR ? "SR" : "Z3950", where);
-    if (!(l = cs_create(type, 0, what)))
-    {
-    	yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to create listener");
-	return;
-    }
-    ap = cs_straddr (l, addr);
-    if (!ap)
-    {
-	fprintf(stderr, "Address resolution failed.\n");
-	cs_close (l);
+	yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to listen on %s", where);
 	return;
     }
     if (cs_bind(l, ap, CS_SERVER) < 0)