X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fstatserv.c;h=b4d67d6d010098815a4fcaa6e53997764af2e224;hp=89626f4d804d1b018fbd680a28ad1d781a7a114a;hb=d32b1dbdc1f0392883547cc9e56c26f384a4c57f;hpb=1ff3deef138c1f1af5f435c4931f61e5b1595372 diff --git a/server/statserv.c b/server/statserv.c index 89626f4..b4d67d6 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -4,7 +4,48 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: statserv.c,v $ - * Revision 1.3 1995-03-14 11:30:15 quinn + * Revision 1.16 1995-04-10 10:23:40 quinn + * Some work to add scan and other things. + * + * Revision 1.15 1995/03/31 10:16:51 quinn + * Fixed logging. + * + * Revision 1.14 1995/03/31 09:18:58 quinn + * Added logging. + * + * Revision 1.13 1995/03/30 16:08:39 quinn + * Little mods. + * + * Revision 1.12 1995/03/30 13:29:02 quinn + * Smallish + * + * Revision 1.11 1995/03/30 12:18:17 quinn + * Fixed bug. + * + * Revision 1.10 1995/03/29 15:40:16 quinn + * Ongoing work. Statserv is now dynamic by default + * + * Revision 1.9 1995/03/27 08:34:30 quinn + * Added dynamic server functionality. + * Released bindings to session.c (is now redundant) + * + * Revision 1.8 1995/03/20 09:46:26 quinn + * Added osi support. + * + * 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 @@ -21,6 +62,11 @@ */ #include +#include +#include +#include +#include +#include #include #include @@ -28,56 +74,138 @@ #include #include #include +#ifdef USE_XTIMOSI #include +#endif +#include +#include -static char *me = ""; +static char *me = "statserver"; +int dynamic = 1; /* fork on incoming connection */ +static int loglevel = LOG_DEFAULT_LEVEL; +char *apdufile = 0; + +#define DEFAULT_LISTENER "tcp:localhost:9999" /* * handle incoming connect requests. + * The dynamic mode is a bit tricky mostly because we want to avoid + * doing all of the listening and accepting in the parent - it's + * safer that way. */ -void listener(IOCHAN h, int event) +static void listener(IOCHAN h, int event) { COMSTACK line = (COMSTACK) iochan_getdata(h); association *newas; + static int hand[2]; + static int child = 0; + int res; if (event == EVENT_INPUT) { - if (cs_listen(line, 0, 0) < 0) + if (dynamic && !child) { - if (cs_errno(line) == CSNODATA) + int res; + + if (pipe(hand) < 0) + { + logf(LOG_FATAL|LOG_ERRNO, "pipe"); + exit(1); + } + if ((res = fork()) < 0) + { + logf(LOG_FATAL|LOG_ERRNO, "fork"); + exit(1); + } + else if (res == 0) /* child */ + { + char nbuf[100]; + + close(hand[0]); + child = 1; + sprintf(nbuf, "%s(%d)", me, getpid()); + log_init(loglevel, nbuf, 0); + } + else /* parent */ + { + close(hand[1]); + /* wait for child to take the call */ + for (;;) + { + char dummy[1]; + int res; + + if ((res = read(hand[0], dummy, 1)) < 0 && errno != EINTR) + { + logf(LOG_FATAL|LOG_ERRNO, "handshake read"); + exit(1); + } + else if (res >= 0) + break; + } + logf(LOG_DEBUG, "P: Child has taken the call"); + close(hand[0]); return; - fprintf(stderr, "cs_listen failed.\n"); - exit(1); + } + } + if ((res = cs_listen(line, 0, 0)) < 0) + { + logf(LOG_FATAL, "cs_listen failed."); + return; } - iochan_setflags(h, EVENT_OUTPUT); /* set us up for accepting */ + else if (res == 1) + return; + logf(LOG_DEBUG, "listen ok"); + iochan_setevent(h, EVENT_OUTPUT); + iochan_setflags(h, EVENT_OUTPUT | EVENT_EXCEPT); /* set up for acpt */ } + /* in dynamic mode, only the child ever comes down here */ else if (event == EVENT_OUTPUT) { COMSTACK new_line; IOCHAN new_chan; - if (!(new_line = cs_accept(line))) - { - fprintf(stderr, "Accept failed.\n"); - exit(1); + if (!(new_line = cs_accept(line))) + { + logf(LOG_FATAL, "Accept failed."); + iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ + return; + } + logf(LOG_DEBUG, "accept ok"); + if (dynamic) + { + IOCHAN pp; + /* close our half of the listener sockets */ + for (pp = iochan_getchan(); pp; pp = iochan_getnext(pp)) + { + COMSTACK l = iochan_getdata(pp); + cs_close(l); + iochan_destroy(pp); + } + /* release dad */ + logf(LOG_DEBUG, "Releasing parent"); + close(hand[1]); } + else + iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ + if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, EVENT_INPUT))) { - fprintf(stderr, "Failed to create iochan\n"); + logf(LOG_FATAL, "Failed to create iochan"); exit(1); } if (!(newas = create_association(new_chan, new_line))) { - fprintf(stderr, "Failed to create new assoc.\n"); + logf(LOG_FATAL, "Failed to create new assoc."); exit(1); } iochan_setdata(new_chan, newas); - iochan_setflags(h, EVENT_INPUT); /* reset for listening */ + logf(LOG_LOG, "accepted connection"); } else { - fprintf(stderr, "Bad event on listener.\n"); + logf(LOG_FATAL, "Bad event on listener."); exit(1); } } @@ -85,7 +213,7 @@ void listener(IOCHAN h, int event) /* * Set up a listening endpoint, and give it to the event-handler. */ -void add_listener(char *where) +static void add_listener(char *where, int what) { COMSTACK l; CS_TYPE type; @@ -108,7 +236,7 @@ void add_listener(char *where) } type = tcpip_type; } -#if 0 +#ifdef USE_XTIMOSI else if (!strcmp(mode, "osi")) { if (!(ap = mosi_strtoaddr(addr))) @@ -124,43 +252,71 @@ void add_listener(char *where) fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n"); exit(1); } - if (!(l = cs_create(type, 1))) + logf(LOG_LOG, "Adding %s %s listener on %s", + dynamic ? "dynamic" : "static", + what == PROTO_SR ? "SR" : "Z3950", where); + if (!(l = cs_create(type, 0, what))) { - fprintf(stderr, "Failed to create listener\n"); + logf(LOG_FATAL|LOG_ERRNO, "Failed to create listener"); exit(1); } if (cs_bind(l, ap, CS_SERVER) < 0) { - fprintf(stderr, "Failed to bind.\n"); - perror(where); + logf(LOG_FATAL|LOG_ERRNO, "Failed to bind to %s", 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"); + logf(LOG_FATAL|LOG_ERRNO, "Failed to create IOCHAN-type"); exit(1); } iochan_setdata(lst, l); } -int main(int argc, char **argv) +static void catchchld(int num) +{ + while (waitpid(-1, 0, WNOHANG) > 0); + signal(SIGCHLD, catchchld); +} + +int statserv_main(int argc, char **argv) { int ret, listeners = 0; char *arg; + int protocol = CS_Z3950; + char *logfile = 0; - while ((ret = options("l:", argv, argc, &arg)) != -2) + me = argv[0]; + while ((ret = options("a:szSl:v:", argv, argc, &arg)) != -2) switch (ret) { - case 0: me = arg; break; - case 'l': add_listener(arg); listeners++; break; + case 0: + add_listener(arg, protocol); + listeners++; + break; + case 'z': protocol = CS_Z3950; break; + case 's': protocol = CS_SR; break; + case 'S': dynamic = 0; break; + case 'l': + logfile = arg; + log_init(loglevel, me, logfile); + break; + case 'v': + loglevel = log_mask_str(arg); + log_init(loglevel, me, logfile); + break; + case 'a': + apdufile = arg; break; default: - fprintf(stderr, "Usage: %s [-l ]\n", me); + fprintf(stderr, "Usage: %s [ -v -l -zsS ... ]\n", me); exit(1); } + if (dynamic) + signal(SIGCHLD, catchchld); if (!listeners) - { - fprintf(stderr, "%s: Must specify at least one listener.\n", me); - exit(1); - } + add_listener(DEFAULT_LISTENER, protocol); + logf(LOG_LOG, "Entering event loop."); + return event_loop(); }