X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fstatserv.c;h=5ac15e9138b5f59e761ac5cb4d788e53996e48ec;hp=05317980df2d1b4c9b8db1f0de0f37d9b9d764d6;hb=1db60f5a7396b9b37560f6b6962be0b68240486c;hpb=74c93e64254dddb35f08ec54ee401fc85d3f8cb7 diff --git a/server/statserv.c b/server/statserv.c index 0531798..5ac15e9 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -1,10 +1,53 @@ /* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. + * Copyright (c) 1995, Index Data + * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: statserv.c,v $ - * Revision 1.8 1995-03-20 09:46:26 quinn + * Revision 1.22 1995-06-15 07:45:17 quinn + * Moving to v3. + * + * Revision 1.21 1995/06/06 08:15:40 quinn + * Cosmetic. + * + * Revision 1.20 1995/05/29 08:12:09 quinn + * Moved oid to util + * + * Revision 1.19 1995/05/16 09:37:27 quinn + * Fixed bug + * + * Revision 1.18 1995/05/16 08:51:09 quinn + * License, documentation, and memory fixes + * + * Revision 1.17 1995/05/15 11:56:42 quinn + * Asynchronous facilities. Restructuring of seshigh code. + * + * 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 @@ -37,6 +80,13 @@ */ #include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -44,62 +94,151 @@ #include #include #include +#ifdef USE_XTIMOSI #include +#endif +#include +#include +#include -#include -#include - -static char *me = ""; +static char *me = "statserver"; +/* + * default behavior. + */ +static statserv_options_block control_block = { + 1, /* dynamic mode */ + LOG_DEFAULT_LEVEL, /* log level */ + "", /* no PDUs */ + "", /* diagnostic output to stderr */ + "tcp:localhost:9999", /* default listener port */ + PROTO_Z3950, /* application protocol */ + 60, /* idle timeout (minutes) */ + 1024*1024*4, /* 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 + * 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 (control_block.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(control_block.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; } + 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 (control_block.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 | EVENT_EXCEPT); /* reset for listen */ + logf(LOG_LOG, "accepted connection"); } else { - fprintf(stderr, "Bad event on listener.\n"); + logf(LOG_FATAL, "Bad event on listener."); exit(1); } } @@ -107,7 +246,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; @@ -115,7 +254,6 @@ 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')':'
.\n", @@ -131,6 +269,7 @@ void add_listener(char *where) } type = tcpip_type; } +#ifdef USE_XTIMOSI else if (!strcmp(mode, "osi")) { if (!(ap = mosi_strtoaddr(addr))) @@ -140,47 +279,109 @@ void add_listener(char *where) } type = mosi_type; } +#endif else { fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n"); exit(1); } - if (!(l = cs_create(type, 0))) + logf(LOG_LOG, "Adding %s %s listener on %s", + control_block.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 | 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); } +static void catchchld(int num) +{ + while (waitpid(-1, 0, WNOHANG) > 0) + ; + signal(SIGCHLD, catchchld); +} + +statserv_options_block *statserv_getcontrol(void) +{ + static statserv_options_block cb; + + memcpy(&cb, &control_block, sizeof(cb)); + return &cb; +} + +void statserv_setcontrol(statserv_options_block *block) +{ + memcpy(&control_block, block, sizeof(*block)); +} + int statserv_main(int argc, char **argv) { int ret, listeners = 0; char *arg; + int protocol = control_block.default_proto; me = argv[0]; - while ((ret = options("l:", argv, argc, &arg)) != -2) + while ((ret = options("a:szSl:v:u:", 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 = PROTO_Z3950; break; + case 's': protocol = PROTO_SR; break; + case 'S': control_block.dynamic = 0; break; + case 'l': + strcpy(control_block.logfile, arg ? arg : ""); + log_init(control_block.loglevel, me, control_block.logfile); + break; + case 'v': + control_block.loglevel = log_mask_str(arg); + log_init(control_block.loglevel, me, control_block.logfile); + break; + case 'a': + strcpy(control_block.apdufile, arg ? arg : ""); break; + case 'u': + strcpy(control_block.setuid, arg ? arg : ""); break; default: - fprintf(stderr, "Usage: %s [-l ]\n", me); + fprintf(stderr, "Usage: %s [ -a -v -l -u -zsS ... ]\n", me); exit(1); } - if (!listeners) - add_listener(DEFAULT_LISTENER); + } + if (control_block.dynamic) + signal(SIGCHLD, catchchld); + if (!listeners && *control_block.default_listen) + add_listener(control_block.default_listen, protocol); + if (*control_block.setuid) + { + struct passwd *pw; + + if (!(pw = getpwnam(control_block.setuid))) + { + logf(LOG_FATAL|LOG_ERRNO, "%s", control_block.setuid); + exit(1); + } + if (setuid(pw->pw_uid) < 0) + { + logf(LOG_FATAL|LOG_ERRNO, "setuid"); + exit(1); + } + } + logf(LOG_LOG, "Entering event loop."); + return event_loop(); }