X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=server%2Fstatserv.c;h=d84065f397be7b224b731484fd5e7ce7c27f7ab1;hb=25b7a1f19e0a16578e5918dd7ce70320d915dd23;hp=89626f4d804d1b018fbd680a28ad1d781a7a114a;hpb=1ff3deef138c1f1af5f435c4931f61e5b1595372;p=yaz-moved-to-github.git

diff --git a/server/statserv.c b/server/statserv.c
index 89626f4..d84065f 100644
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
- * Revision 1.3  1995-03-14 11:30:15  quinn
+ * Revision 1.7  1995-03-16 13:29:04  quinn
+ * Partitioned server.
+ *
+ * Revision 1.6  1995/03/15  15:18:52  quinn
+ * Little changes to better support nonblocking I/O
+ * Added backend.h
+ *
+ * Revision 1.5  1995/03/15  08:37:45  quinn
+ * Now we're pretty much set for nonblocking I/O.
+ *
+ * Revision 1.4  1995/03/14  16:59:48  quinn
+ * Bug-fixes
+ *
+ * Revision 1.3  1995/03/14  11:30:15  quinn
  * Works better now.
  *
  * Revision 1.2  1995/03/14  10:28:03  quinn
@@ -30,8 +43,13 @@
 #include <tcpip.h>
 #include <xmosi.h>
 
+#include <unistd.h>
+#include <fcntl.h>
+
 static char *me = "";
 
+#define DEFAULT_LISTENER "tcp:localhost:9999"
+
 /*
  * handle incoming connect requests.
  */
@@ -49,7 +67,8 @@ void listener(IOCHAN h, int event)
 	    fprintf(stderr, "cs_listen failed.\n");
 	    exit(1);
 	}
-	iochan_setflags(h, EVENT_OUTPUT); /* set us up for accepting */
+	iochan_setevent(h, EVENT_OUTPUT);
+	iochan_setflags(h, EVENT_OUTPUT | EVENT_EXCEPT); /* set up for acpt */
     }
     else if (event == EVENT_OUTPUT)
     {
@@ -73,7 +92,7 @@ void listener(IOCHAN h, int event)
 	    exit(1);
 	}
 	iochan_setdata(new_chan, newas);
-    	iochan_setflags(h, EVENT_INPUT); /* reset for listening */
+    	iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset for listen */
     }
     else
     {
@@ -93,6 +112,7 @@ void add_listener(char *where)
     void *ap;
     IOCHAN lst;
 
+    fprintf(stderr, "Adding listener on %s\n", where);
     if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2)
     {
     	fprintf(stderr, "%s: Address format: ('tcp'|'osi')':'<address>.\n",
@@ -124,7 +144,7 @@ void add_listener(char *where)
     	fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n");
     	exit(1);
     }
-    if (!(l = cs_create(type, 1)))
+    if (!(l = cs_create(type, 0)))
     {
     	fprintf(stderr, "Failed to create listener\n");
     	exit(1);
@@ -135,7 +155,8 @@ void add_listener(char *where)
     	perror(where);
     	exit(1);
     }
-    if (!(lst = iochan_create(cs_fileno(l), listener, EVENT_INPUT)))
+    if (!(lst = iochan_create(cs_fileno(l), listener, EVENT_INPUT |
+   	 EVENT_EXCEPT)))
     {
     	fprintf(stderr, "Failed to create IOCHAN-type\n");
     	exit(1);
@@ -143,11 +164,12 @@ void add_listener(char *where)
     iochan_setdata(lst, l);
 }
 
-int main(int argc, char **argv)
+int statserv_main(int argc, char **argv)
 {
     int ret, listeners = 0;
     char *arg;
 
+    me = argv[0];
     while ((ret = options("l:", argv, argc, &arg)) != -2)
     	switch (ret)
     	{
@@ -158,9 +180,6 @@ int main(int argc, char **argv)
 	    	exit(1);
 	}
     if (!listeners)
-    {
-    	fprintf(stderr, "%s: Must specify at least one listener.\n", me);
-    	exit(1);
-    }
+	add_listener(DEFAULT_LISTENER);
     return event_loop();
 }