Works better now.

diff --git a/server/Makefile b/server/Makefile
index a8d26c5..db3ca27 100644 (file)
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,16 +1,17 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss

-# $Id: Makefile,v 1.2 1995-03-14 10:27:57 quinn Exp $
+# $Id: Makefile,v 1.3 1995-03-14 11:30:14 quinn Exp $

 
 SHELL=/bin/sh
 
 SHELL=/bin/sh

-INCLUDE=-I../include -I. -I../asn -I../odr -I../yazlib -I../../egate/include -I../../xtimosi/src
+INCLUDE=-I../include -I. -I../asn -I../odr -I../yazlib -I../../egate/include\
+ -I../../xtimosi/src -I../../alex/include

 LIBDIR=../../lib
 LIBINCLUDE=-L$(LIBDIR)
 #CFLAGS=-Wall -pedantic -g
 DEFS=$(INCLUDE)
 LIB=$(LIBDIR)/libserver.a 
 LIBDIR=../../lib
 LIBINCLUDE=-L$(LIBDIR)
 #CFLAGS=-Wall -pedantic -g
 DEFS=$(INCLUDE)
 LIB=$(LIBDIR)/libserver.a 

-LIBS=-lserver -lasn -lodr -lcomstack options.o
+LIBS=-lserver -lasn -lodr -lcomstack ../../alex/lib/util.a 

 PO = eventl.o 
 CPP=cc -E
 PROG=statserv
 PO = eventl.o 
 CPP=cc -E
 PROG=statserv

@@ -18,7 +19,7 @@ PROGO=statserv.o session.o
 
 all: $(LIBDIR) $(LIB) $(PROG)
 
 
 all: $(LIBDIR) $(LIB) $(PROG)
 

-$(PROG): $(LIB) $(PROGO) options.o
+$(PROG): $(LIB) $(PROGO)

        $(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS)
 
 alll:
        $(CC) $(CFLAGS) $(LIBINCLUDE) -o $(PROG) $(PROGO) $(LIBS)
 
 alll:

diff --git a/server/eventl.c b/server/eventl.c
index 3d2df2f..980b0c2 100644 (file)
--- a/server/eventl.c
+++ b/server/eventl.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: eventl.c,v $

- * Revision 1.2  1995-03-14 10:27:59  quinn
+ * Revision 1.3  1995-03-14 11:30:14  quinn
+ * Works better now.
+ *
+ * Revision 1.2  1995/03/14  10:27:59  quinn

  * More work on demo server.
  *
  * Revision 1.1  1995/03/10  18:22:44  quinn
  * More work on demo server.
  *
  * Revision 1.1  1995/03/10  18:22:44  quinn

@@ -51,6 +54,7 @@ int event_loop()
        FD_ZERO(&out);
        FD_ZERO(&except);
        timeout = 0; /* hang on select */
        FD_ZERO(&out);
        FD_ZERO(&except);
        timeout = 0; /* hang on select */

+       max = 0;

        for (p = iochans; p; p = p->next)
        {
            if (p->force_event)
        for (p = iochans; p; p = p->next)
        {
            if (p->force_event)

diff --git a/server/statserv.c b/server/statserv.c
index f536f02..89626f4 100644 (file)
--- a/server/statserv.c
+++ b/server/statserv.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: statserv.c,v $

- * Revision 1.2  1995-03-14 10:28:03  quinn
+ * Revision 1.3  1995-03-14 11:30:15  quinn
+ * Works better now.
+ *
+ * Revision 1.2  1995/03/14  10:28:03  quinn

  * More work on demo server.
  *
  * Revision 1.1  1995/03/10  18:22:45  quinn
  * More work on demo server.
  *
  * Revision 1.1  1995/03/10  18:22:45  quinn

@@ -69,7 +72,7 @@ void listener(IOCHAN h, int event)
            fprintf(stderr, "Failed to create new assoc.\n");
            exit(1);
        }
            fprintf(stderr, "Failed to create new assoc.\n");
            exit(1);
        }

-       iochan_setdata(h, newas);
+       iochan_setdata(new_chan, newas);

        iochan_setflags(h, EVENT_INPUT); /* reset for listening */
     }
     else
        iochan_setflags(h, EVENT_INPUT); /* reset for listening */
     }
     else