X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fstatserv.c;h=154db57a7ffd47a9da3ff3fd3103e71cb66f48bd;hp=84190dda2ed3794a2ff1462bf82f7421535a8d11;hb=b3be6bf5b31785568d39c3c1d631759df84d90ca;hpb=2f5c9e5bc97a81a1e83f825146453a4a89696274 diff --git a/server/statserv.c b/server/statserv.c index 84190dd..154db57 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -1,10 +1,37 @@ /* - * 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.10 1995-03-29 15:40:16 quinn + * 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 @@ -56,11 +83,28 @@ #include #include #include +#ifdef USE_XTIMOSI #include +#endif #include +#include +#include -static char *me = ""; -static int dynamic = 1; /* fork on incoming connection */ +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 */ +}; #define DEFAULT_LISTENER "tcp:localhost:9999" @@ -80,24 +124,28 @@ static void listener(IOCHAN h, int event) if (event == EVENT_INPUT) { - if (dynamic && !child) + if (control_block.dynamic && !child) { int res; if (pipe(hand) < 0) { - perror("pipe"); + logf(LOG_FATAL|LOG_ERRNO, "pipe"); exit(1); } if ((res = fork()) < 0) { - perror("fork"); + 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 */ { @@ -110,24 +158,25 @@ static void listener(IOCHAN h, int event) if ((res = read(hand[0], dummy, 1)) < 0 && errno != EINTR) { - perror("handshake read"); + logf(LOG_FATAL|LOG_ERRNO, "handshake read"); exit(1); } else if (res >= 0) break; } - fprintf(stderr, "P: Child has taken the call\n"); + logf(LOG_DEBUG, "P: Child has taken the call"); close(hand[0]); return; } } if ((res = cs_listen(line, 0, 0)) < 0) { - fprintf(stderr, "cs_listen failed.\n"); + 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 */ } @@ -139,11 +188,12 @@ static void listener(IOCHAN h, int event) if (!(new_line = cs_accept(line))) { - fprintf(stderr, "Accept failed.\n"); + logf(LOG_FATAL, "Accept failed."); iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ return; } - if (dynamic) + logf(LOG_DEBUG, "accept ok"); + if (control_block.dynamic) { IOCHAN pp; /* close our half of the listener sockets */ @@ -154,9 +204,8 @@ static void listener(IOCHAN h, int event) iochan_destroy(pp); } /* release dad */ - fprintf(stderr, "Releasing parent\n"); + logf(LOG_DEBUG, "Releasing parent"); close(hand[1]); - fprintf(stderr, "New fd is %d\n", cs_fileno(new_line)); } else iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ @@ -164,19 +213,20 @@ static void listener(IOCHAN h, int event) 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); + logf(LOG_LOG, "accepted connection"); } else { - fprintf(stderr, "Bad event on listener.\n"); + logf(LOG_FATAL, "Bad event on listener."); exit(1); } } @@ -192,9 +242,6 @@ static void add_listener(char *where, int what) void *ap; IOCHAN lst; - fprintf(stderr, "Adding %s %s listener on %s\n", - dynamic ? "dynamic" : "static", - what == PROTO_SR ? "SR" : "Z3950", where); if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2) { fprintf(stderr, "%s: Address format: ('tcp'|'osi')':'
.\n", @@ -210,6 +257,7 @@ static void add_listener(char *where, int what) } type = tcpip_type; } +#ifdef USE_XTIMOSI else if (!strcmp(mode, "osi")) { if (!(ap = mosi_strtoaddr(addr))) @@ -219,26 +267,29 @@ static void add_listener(char *where, int what) } type = mosi_type; } +#endif else { fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n"); exit(1); } + 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); @@ -250,14 +301,28 @@ static void catchchld(int num) 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 = CS_Z3950;; + int protocol = control_block.default_proto; me = argv[0]; - while ((ret = options("szSl:", argv, argc, &arg)) != -2) + while ((ret = options("a:szSl:v:", argv, argc, &arg)) != -2) + { switch (ret) { case 0: @@ -266,14 +331,27 @@ int statserv_main(int argc, char **argv) break; case 'z': protocol = CS_Z3950; break; case 's': protocol = CS_SR; break; - case 'S': dynamic = 0; 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; default: - fprintf(stderr, "Usage: %s [ -zsS ... ]\n", me); + fprintf(stderr, "Usage: %s [ -a -v -l -zsS ... ]\n", me); exit(1); } - if (dynamic) + } + if (control_block.dynamic) signal(SIGCHLD, catchchld); - if (!listeners) - add_listener(DEFAULT_LISTENER, protocol); + if (!listeners && *control_block.default_listen) + add_listener(control_block.default_listen, protocol); + logf(LOG_LOG, "Entering event loop."); + return event_loop(); }