X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fstatserv.c;h=2e01fbb31fc197c28fc4ad250c19b5e67e3742a7;hp=5ac15e9138b5f59e761ac5cb4d788e53996e48ec;hb=db585d7fcb8319fa86543eb062df7fdaf16858c6;hpb=1db60f5a7396b9b37560f6b6962be0b68240486c diff --git a/server/statserv.c b/server/statserv.c index 5ac15e9..2e01fbb 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -1,135 +1,380 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * $Log: statserv.c,v $ - * 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 - * 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 - * More work on demo server. - * - * Revision 1.1 1995/03/10 18:22:45 quinn - * The rudiments of an asynchronous server. + * NT threaded server code by + * Chas Woodfield, Fretwell Downing Informatics. * - */ - -/* - * Simple, static server. I wouldn't advise a static server unless you - * really have to, but it's great for debugging memory management. :) + * $Id: statserv.c,v 1.93 2003-02-17 21:23:31 adam Exp $ */ #include +#include +#ifdef WIN32 +#include +#include +#include +#include "service.h" +#else #include +#include +#endif + +#if YAZ_POSIX_THREADS +#include +#elif YAZ_GNU_THREADS +#include +#endif + #include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include #ifdef USE_XTIMOSI -#include +#include #endif -#include -#include -#include +#include +#include "eventl.h" +#include "session.h" +#include + +static IOCHAN pListener = NULL; static char *me = "statserver"; /* * default behavior. */ -static statserv_options_block control_block = { +int check_options(int argc, char **argv); +statserv_options_block control_block = { 1, /* dynamic mode */ + 0, /* threaded mode */ + 0, /* one shot (single session) */ 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 */ + "tcp:@:9999", /* default listener port */ + PROTO_Z3950, /* default application protocol */ + 15, /* idle timeout (minutes) */ + 1024*1024, /* maximum PDU size (approx.) to allow */ "default-config", /* configuration name to pass to backend */ - "" /* set user id */ + "", /* set user id */ + 0, /* bend_start handler */ + 0, /* bend_stop handler */ + check_options, /* Default routine, for checking the run-time arguments */ + check_ip_tcpd, + "", + 0, /* default value for inet deamon */ + 0, /* handle (for service, etc) */ + 0, /* bend_init handle */ + 0, /* bend_close handle */ +#ifdef WIN32 + "Z39.50 Server", /* NT Service Name */ + "Server", /* NT application Name */ + "", /* NT Service Dependencies */ + "Z39.50 Server", /* NT Service Display Name */ +#endif /* WIN32 */ + 0 /* SOAP handlers */ }; -#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. */ -static void listener(IOCHAN h, int event) +#ifdef WIN32 + +typedef struct _ThreadList ThreadList; + +struct _ThreadList +{ + HANDLE hThread; + IOCHAN pIOChannel; + ThreadList *pNext; +}; + +static ThreadList *pFirstThread; +static CRITICAL_SECTION Thread_CritSect; +static BOOL bInitialized = FALSE; + +static void ThreadList_Initialize() +{ + /* Initialize the critical Sections */ + InitializeCriticalSection(&Thread_CritSect); + + /* Set the first thraed */ + pFirstThread = NULL; + + /* we have been initialized */ + bInitialized = TRUE; +} + +static void statserv_add(HANDLE hThread, IOCHAN pIOChannel) +{ + /* Only one thread can go through this section at a time */ + EnterCriticalSection(&Thread_CritSect); + + { + /* Lets create our new object */ + ThreadList *pNewThread = (ThreadList *)malloc(sizeof(ThreadList)); + pNewThread->hThread = hThread; + pNewThread->pIOChannel = pIOChannel; + pNewThread->pNext = pFirstThread; + pFirstThread = pNewThread; + + /* Lets let somebody else create a new object now */ + LeaveCriticalSection(&Thread_CritSect); + } +} + +void statserv_remove(IOCHAN pIOChannel) +{ + /* Only one thread can go through this section at a time */ + EnterCriticalSection(&Thread_CritSect); + + { + ThreadList *pCurrentThread = pFirstThread; + ThreadList *pNextThread; + ThreadList *pPrevThread =NULL; + + /* Step through alll the threads */ + for (; pCurrentThread != NULL; pCurrentThread = pNextThread) + { + /* We only need to compare on the IO Channel */ + if (pCurrentThread->pIOChannel == pIOChannel) + { + /* We have found the thread we want to delete */ + /* First of all reset the next pointers */ + if (pPrevThread == NULL) + pFirstThread = pCurrentThread->pNext; + else + pPrevThread->pNext = pCurrentThread->pNext; + + /* All we need todo now is delete the memory */ + free(pCurrentThread); + + /* No need to look at any more threads */ + pNextThread = NULL; + } + else + { + /* We need to look at another thread */ + pNextThread = pCurrentThread->pNext; + pPrevThread = pCurrentThread; + } + } + + /* Lets let somebody else remove an object now */ + LeaveCriticalSection(&Thread_CritSect); + } +} + +/* WIN32 statserv_closedown */ +void statserv_closedown() +{ + /* Shouldn't do anything if we are not initialized */ + if (bInitialized) + { + int iHandles = 0; + HANDLE *pThreadHandles = NULL; + + /* We need to stop threads adding and removing while we */ + /* start the closedown process */ + EnterCriticalSection(&Thread_CritSect); + + { + /* We have exclusive access to the thread stuff now */ + /* Y didn't i use a semaphore - Oh well never mind */ + ThreadList *pCurrentThread = pFirstThread; + + /* Before we do anything else, we need to shutdown the listener */ + if (pListener != NULL) + iochan_destroy(pListener); + + for (; pCurrentThread != NULL; pCurrentThread = pCurrentThread->pNext) + { + /* Just destroy the IOCHAN, that should do the trick */ + iochan_destroy(pCurrentThread->pIOChannel); + closesocket(pCurrentThread->pIOChannel->fd); + + /* Keep a running count of our handles */ + iHandles++; + } + + if (iHandles > 0) + { + HANDLE *pCurrentHandle ; + + /* Allocate the thread handle array */ + pThreadHandles = (HANDLE *)malloc(sizeof(HANDLE) * iHandles); + pCurrentHandle = pThreadHandles; + + for (pCurrentThread = pFirstThread; + pCurrentThread != NULL; + pCurrentThread = pCurrentThread->pNext, pCurrentHandle++) + { + /* Just the handle */ + *pCurrentHandle = pCurrentThread->hThread; + } + } + + /* We can now leave the critical section */ + LeaveCriticalSection(&Thread_CritSect); + } + + /* Now we can really do something */ + if (iHandles > 0) + { + logf (LOG_LOG, "waiting for %d to die", iHandles); + /* This will now wait, until all the threads close */ + WaitForMultipleObjects(iHandles, pThreadHandles, TRUE, INFINITE); + + /* Free the memory we allocated for the handle array */ + free(pThreadHandles); + } + + if (control_block.bend_stop) + (*control_block.bend_stop)(&control_block); + /* No longer require the critical section, since all threads are dead */ + DeleteCriticalSection(&Thread_CritSect); + } +} + +void __cdecl event_loop_thread (IOCHAN iochan) +{ + event_loop (&iochan); +} + +/* WIN32 listener */ +static void listener(IOCHAN h, int event) { COMSTACK line = (COMSTACK) iochan_getdata(h); association *newas; + int res; + HANDLE newHandle; + + if (event == EVENT_INPUT) + { + if ((res = cs_listen(line, 0, 0)) < 0) + { + yaz_log(LOG_FATAL, "cs_listen failed"); + return; + } + else if (res == 1) + return; + yaz_log(LOG_DEBUG, "listen ok"); + iochan_setevent(h, EVENT_OUTPUT); + iochan_setflags(h, EVENT_OUTPUT | EVENT_EXCEPT); /* set up for acpt */ + } + else if (event == EVENT_OUTPUT) + { + COMSTACK new_line = cs_accept(line); + IOCHAN new_chan; + char *a = NULL; + + if (!new_line) + { + yaz_log(LOG_FATAL, "Accept failed."); + iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); + return; + } + yaz_log(LOG_DEBUG, "Accept ok"); + + if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, + EVENT_INPUT))) + { + yaz_log(LOG_FATAL, "Failed to create iochan"); + iochan_destroy(h); + return; + } + + yaz_log(LOG_DEBUG, "Creating association"); + if (!(newas = create_association(new_chan, new_line))) + { + yaz_log(LOG_FATAL, "Failed to create new assoc."); + iochan_destroy(h); + return; + } + newas->cs_get_mask = EVENT_INPUT; + newas->cs_put_mask = 0; + newas->cs_accept_mask = 0; + + yaz_log(LOG_DEBUG, "Setting timeout %d", control_block.idle_timeout); + iochan_setdata(new_chan, newas); + iochan_settimeout(new_chan, 60); + + /* Now what we need todo is create a new thread with this iochan as + the parameter */ + newHandle = (HANDLE) _beginthread(event_loop_thread, 0, new_chan); + if (newHandle == (HANDLE) -1) + { + + yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to create new thread."); + iochan_destroy(h); + return; + } + /* We successfully created the thread, so add it to the list */ + statserv_add(newHandle, new_chan); + + yaz_log(LOG_DEBUG, "Created new thread, id = %ld iochan %p",(long) newHandle, new_chan); + iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ + } + else + { + yaz_log(LOG_FATAL, "Bad event on listener."); + iochan_destroy(h); + return; + } +} + +int statserv_must_terminate(void) +{ + return 0; +} + +#else /* ! WIN32 */ + +static int term_flag = 0; +/* To save having an #ifdef in event_loop we need to + define this empty function +*/ +int statserv_must_terminate(void) +{ + return term_flag; +} + +void statserv_remove(IOCHAN pIOChannel) +{ +} + +void statserv_closedown() +{ + IOCHAN p; + + if (control_block.bend_stop) + (*control_block.bend_stop)(&control_block); + for (p = pListener; p; p = p->next) + { + iochan_destroy(p); + } +} + +void sigterm(int sig) +{ + term_flag = 1; +} + +static void *new_session (void *vp); +static int no_sessions = 0; + +/* UNIX listener */ +static void listener(IOCHAN h, int event) +{ + COMSTACK line = (COMSTACK) iochan_getdata(h); static int hand[2]; static int child = 0; int res; @@ -140,24 +385,41 @@ static void listener(IOCHAN h, int event) { int res; + ++no_sessions; if (pipe(hand) < 0) { - logf(LOG_FATAL|LOG_ERRNO, "pipe"); - exit(1); + yaz_log(LOG_FATAL|LOG_ERRNO, "pipe"); + iochan_destroy(h); + return; } if ((res = fork()) < 0) { - logf(LOG_FATAL|LOG_ERRNO, "fork"); - exit(1); + yaz_log(LOG_FATAL|LOG_ERRNO, "fork"); + iochan_destroy(h); + return; } else if (res == 0) /* child */ { char nbuf[100]; + IOCHAN pp; close(hand[0]); child = 1; + for (pp = pListener; pp; pp = iochan_getnext(pp)) + { + if (pp != h) + { + COMSTACK l = (COMSTACK)iochan_getdata(pp); + cs_close(l); + iochan_destroy(pp); + } + } sprintf(nbuf, "%s(%d)", me, getpid()); - log_init(control_block.loglevel, nbuf, 0); + yaz_log_init(control_block.loglevel, nbuf, 0); + /* ensure that bend_stop is not called when each child exits - + only for the main process .. + */ + control_block.bend_stop = 0; } else /* parent */ { @@ -168,151 +430,254 @@ static void listener(IOCHAN h, int event) char dummy[1]; int res; - if ((res = read(hand[0], dummy, 1)) < 0 && errno != EINTR) + if ((res = read(hand[0], dummy, 1)) < 0 && + yaz_errno() != EINTR) { - logf(LOG_FATAL|LOG_ERRNO, "handshake read"); - exit(1); + yaz_log(LOG_FATAL|LOG_ERRNO, "handshake read"); + return; } else if (res >= 0) break; } - logf(LOG_DEBUG, "P: Child has taken the call"); + yaz_log(LOG_DEBUG, "P: Child has taken the call"); close(hand[0]); return; } } - if ((res = cs_listen(line, 0, 0)) < 0) + if ((res = cs_listen_check(line, 0, 0, control_block.check_ip, + control_block.daemon_name)) < 0) { - logf(LOG_FATAL, "cs_listen failed."); + yaz_log(LOG_WARN|LOG_ERRNO, "cs_listen failed"); return; } else if (res == 1) return; - logf(LOG_DEBUG, "listen ok"); + yaz_log(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; + COMSTACK new_line = cs_accept(line); - if (!(new_line = cs_accept(line))) + if (!new_line) { - logf(LOG_FATAL, "Accept failed."); + yaz_log(LOG_FATAL, "Accept failed."); iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ return; } - logf(LOG_DEBUG, "accept ok"); + yaz_log(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)) + /* close our half of the listener socket */ + for (pp = pListener; pp; pp = iochan_getnext(pp)) { - COMSTACK l = iochan_getdata(pp); + COMSTACK l = (COMSTACK)iochan_getdata(pp); cs_close(l); iochan_destroy(pp); } /* release dad */ - logf(LOG_DEBUG, "Releasing parent"); + yaz_log(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))) + ++no_sessions; + } +#if YAZ_POSIX_THREADS + if (control_block.threads) { - logf(LOG_FATAL, "Failed to create iochan"); - exit(1); + pthread_t child_thread; + pthread_create (&child_thread, 0, new_session, new_line); + pthread_detach (child_thread); } - if (!(newas = create_association(new_chan, new_line))) + else + new_session(new_line); +#elif YAZ_GNU_THREADS + if (control_block.threads) { - logf(LOG_FATAL, "Failed to create new assoc."); - exit(1); + pth_attr_t attr; + pth_t child_thread; + + attr = pth_attr_new (); + pth_attr_set (attr, PTH_ATTR_JOINABLE, FALSE); + pth_attr_set (attr, PTH_ATTR_STACK_SIZE, 32*1024); + pth_attr_set (attr, PTH_ATTR_NAME, "session"); + yaz_log (LOG_LOG, "pth_spawn begin"); + child_thread = pth_spawn (attr, new_session, new_line); + yaz_log (LOG_LOG, "pth_spawn finish"); + pth_attr_destroy (attr); } - iochan_setdata(new_chan, newas); - logf(LOG_LOG, "accepted connection"); + else + new_session(new_line); +#else + new_session(new_line); +#endif + } + else if (event == EVENT_TIMEOUT) + { + yaz_log(LOG_LOG, "Shutting down listener."); + iochan_destroy(h); } else { - logf(LOG_FATAL, "Bad event on listener."); - exit(1); + yaz_log(LOG_FATAL, "Bad event on listener."); + iochan_destroy(h); } } -/* - * Set up a listening endpoint, and give it to the event-handler. - */ -static void add_listener(char *where, int what) +static void *new_session (void *vp) { - COMSTACK l; - CS_TYPE type; - char mode[100], addr[100]; - void *ap; - IOCHAN lst; + char *a; + association *newas; + IOCHAN new_chan; + COMSTACK new_line = (COMSTACK) vp; + + unsigned cs_get_mask, cs_accept_mask, mask = + ((new_line->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) | + ((new_line->io_pending & CS_WANT_READ) ? EVENT_INPUT : 0); - if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2) + if (mask) { - fprintf(stderr, "%s: Address format: ('tcp'|'osi')':'
.\n", - me); - exit(1); + cs_accept_mask = mask; /* accept didn't complete */ + cs_get_mask = 0; } - if (!strcmp(mode, "tcp")) + else { - if (!(ap = tcpip_strtoaddr(addr))) - { - fprintf(stderr, "Address resolution failed for TCP.\n"); - exit(1); - } - type = tcpip_type; + cs_accept_mask = 0; /* accept completed. */ + cs_get_mask = mask = EVENT_INPUT; } -#ifdef USE_XTIMOSI - else if (!strcmp(mode, "osi")) + + if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, mask))) { - if (!(ap = mosi_strtoaddr(addr))) - { - fprintf(stderr, "Address resolution failed for TCP.\n"); - exit(1); - } - type = mosi_type; + yaz_log(LOG_FATAL, "Failed to create iochan"); + return 0; + } + if (!(newas = create_association(new_chan, new_line))) + { + yaz_log(LOG_FATAL, "Failed to create new assoc."); + return 0; } + newas->cs_accept_mask = cs_accept_mask; + newas->cs_get_mask = cs_get_mask; + + iochan_setdata(new_chan, newas); + iochan_settimeout(new_chan, 60); + a = cs_addrstr(new_line); + yaz_log(LOG_LOG, "Starting session %d from %s", + no_sessions, a ? a : "[Unknown]"); + if (control_block.threads) + { + event_loop(&new_chan); + } + else + { + new_chan->next = pListener; + pListener = new_chan; + } + return 0; +} + +/* UNIX */ #endif + +static void inetd_connection(int what) +{ + COMSTACK line; + IOCHAN chan; + association *assoc; + char *addr; + + if ((line = cs_createbysocket(0, tcpip_type, 0, what))) + { + if ((chan = iochan_create(cs_fileno(line), ir_session, EVENT_INPUT))) + { + if ((assoc = create_association(chan, line))) + { + iochan_setdata(chan, assoc); + iochan_settimeout(chan, control_block.idle_timeout * 60); + addr = cs_addrstr(line); + yaz_log(LOG_LOG, "Inetd association from %s", + addr ? addr : "[UNKNOWN]"); + assoc->cs_get_mask = EVENT_INPUT; + } + else + { + yaz_log(LOG_FATAL, "Failed to create association structure"); + } + chan->next = pListener; + pListener = chan; + } + else + { + yaz_log(LOG_FATAL, "Failed to create iochan"); + } + } else { - fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n"); - exit(1); + yaz_log(LOG_ERRNO|LOG_FATAL, "Failed to create comstack on socket 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))) +} + +/* + * Set up a listening endpoint, and give it to the event-handler. + */ +static int add_listener(char *where, int what) +{ + COMSTACK l; + void *ap; + IOCHAN lst = NULL; + const char *mode; + + if (control_block.dynamic) + mode = "dynamic"; + else if (control_block.threads) + mode = "threaded"; + else + mode = "static"; + + yaz_log(LOG_LOG, "Adding %s %s listener on %s", mode, + what == PROTO_SR ? "SR" : "Z3950", where); + + l = cs_create_host(where, 0, &ap); + if (!l) { - logf(LOG_FATAL|LOG_ERRNO, "Failed to create listener"); - exit(1); + yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to listen on %s", where); + return -1; } if (cs_bind(l, ap, CS_SERVER) < 0) { - logf(LOG_FATAL|LOG_ERRNO, "Failed to bind to %s", where); - exit(1); + yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to bind to %s", where); + cs_close (l); + return -1; } if (!(lst = iochan_create(cs_fileno(l), listener, EVENT_INPUT | EVENT_EXCEPT))) { - logf(LOG_FATAL|LOG_ERRNO, "Failed to create IOCHAN-type"); - exit(1); + yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to create IOCHAN-type"); + cs_close (l); + return -1; } iochan_setdata(lst, l); + + /* Ensure our listener chain is setup properly */ + lst->next = pListener; + pListener = lst; + return 0; /* OK */ } +#ifndef WIN32 +/* UNIX only (for windows we don't need to catch the signals) */ static void catchchld(int num) { while (waitpid(-1, 0, WNOHANG) > 0) ; signal(SIGCHLD, catchchld); } +#endif statserv_options_block *statserv_getcontrol(void) { @@ -327,61 +692,282 @@ void statserv_setcontrol(statserv_options_block *block) memcpy(&control_block, block, sizeof(*block)); } -int statserv_main(int argc, char **argv) +void statserv_add_soap_handler(int (*h)(struct bend_soap_rr *rr), + const char *ns) { - int ret, listeners = 0; - char *arg; - int protocol = control_block.default_proto; + struct bend_soap_handler *sh = (struct bend_soap_handler *) + xmalloc(sizeof(*sh)); + sh->handler = h; + sh->ns = xstrdup(ns); + sh->next = control_block.soap_handlers; + control_block.soap_handlers = sh; + yaz_log(LOG_LOG, "soap handler added"); +} + +static void statserv_reset(void) +{ + struct bend_soap_handler *sh = control_block.soap_handlers; + + control_block.soap_handlers = 0; + while (sh) + { + struct bend_soap_handler *sh_next = sh->next; + xfree (sh->ns); + xfree (sh); + sh = sh_next; + } +} + +int statserv_start(int argc, char **argv) +{ + int ret; + +#ifdef WIN32 + /* We need to initialize the thread list */ + ThreadList_Initialize(); +/* WIN32 */ +#endif + +#ifdef WIN32 + if ((me = strrchr (argv[0], '\\'))) + me++; + else + me = argv[0]; +#else me = argv[0]; - while ((ret = options("a:szSl:v:u:", argv, argc, &arg)) != -2) +#endif + if (control_block.options_func(argc, argv)) + return(1); + + if (control_block.bend_start) + (*control_block.bend_start)(&control_block); +#ifdef WIN32 + yaz_log (LOG_LOG, "Starting server %s", me); +#else +/* UNIX */ + if (control_block.inetd) + inetd_connection(control_block.default_proto); + else { - switch (ret) - { - 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 [ -a -v -l -u -zsS ... ]\n", me); - exit(1); - } + yaz_log (LOG_LOG, "Starting server %s pid=%d", me, getpid()); +#if 0 + sigset_t sigs_to_block; + + sigemptyset(&sigs_to_block); + sigaddset (&sigs_to_block, SIGTERM); + pthread_sigmask (SIG_BLOCK, &sigs_to_block, 0); + /* missing... */ +#endif + if (control_block.dynamic) + signal(SIGCHLD, catchchld); } - if (control_block.dynamic) - signal(SIGCHLD, catchchld); - if (!listeners && *control_block.default_listen) - add_listener(control_block.default_listen, protocol); + signal (SIGPIPE, SIG_IGN); + signal (SIGTERM, sigterm); if (*control_block.setuid) { struct passwd *pw; if (!(pw = getpwnam(control_block.setuid))) { - logf(LOG_FATAL|LOG_ERRNO, "%s", control_block.setuid); - exit(1); + yaz_log(LOG_FATAL, "%s: Unknown user", control_block.setuid); + return(1); } if (setuid(pw->pw_uid) < 0) { - logf(LOG_FATAL|LOG_ERRNO, "setuid"); + yaz_log(LOG_FATAL|LOG_ERRNO, "setuid"); exit(1); } } - logf(LOG_LOG, "Entering event loop."); - - return event_loop(); +/* UNIX */ +#endif + + + if ((pListener == NULL) && *control_block.default_listen) + add_listener(control_block.default_listen, + control_block.default_proto); + + if (pListener == NULL) + ret = 1; + else + { + yaz_log(LOG_LOG, "Entering event loop."); + ret = event_loop(&pListener); + } + return ret; } + +int check_options(int argc, char **argv) +{ + int ret = 0, r; + char *arg; + + while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:", argv, argc, &arg)) != -2) + { + switch (ret) + { + case 0: + if (add_listener(arg, control_block.default_proto)) + return 1; /* failed to create listener */ + break; + case '1': + control_block.one_shot = 1; + control_block.dynamic = 0; + break; + case 'z': + control_block.default_proto = PROTO_Z3950; + break; + case 's': + fprintf (stderr, "%s: SR protocol no longer supported\n", me); + exit (1); + break; + case 'S': + control_block.dynamic = 0; + break; + case 'T': +#if YAZ_POSIX_THREADS + control_block.dynamic = 0; + control_block.threads = 1; +#elif YAZ_GNU_THREADS + control_block.dynamic = 0; + control_block.threads = 1; +#else + fprintf(stderr, "%s: Threaded mode not available.\n", me); + return 1; +#endif + break; + case 'l': + strcpy(control_block.logfile, arg ? arg : ""); + yaz_log_init(control_block.loglevel, me, control_block.logfile); + break; + case 'v': + control_block.loglevel = yaz_log_mask_str(arg); + yaz_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; + case 'c': + strcpy(control_block.configname, arg ? arg : ""); + break; + case 'd': + strcpy(control_block.daemon_name, arg ? arg : ""); + break; + case 't': + if (!arg || !(r = atoi(arg))) + { + fprintf(stderr, "%s: Specify positive timeout for -t.\n", me); + return(1); + } + control_block.idle_timeout = r; + break; + case 'k': + if (!arg || !(r = atoi(arg))) + { + fprintf(stderr, "%s: Specify positive size for -k.\n", me); + return(1); + } + control_block.maxrecordsize = r * 1024; + break; + case 'i': + control_block.inetd = 1; + break; + case 'w': + if (chdir(arg)) + { + perror(arg); + return 1; + } + break; + default: + fprintf(stderr, "Usage: %s [ -a -v " + " -l -u -c -t " + " -k -d " + " -ziST1 -w ... ]\n", me); + return 1; + } + } + return 0; +} + +#ifdef WIN32 +typedef struct _Args +{ + char **argv; + int argc; +} Args; + +static Args ArgDetails; + +/* name of the executable */ +#define SZAPPNAME "server" + +/* list of service dependencies - "dep1\0dep2\0\0" */ +#define SZDEPENDENCIES "" + +int statserv_main(int argc, char **argv, + bend_initresult *(*bend_init)(bend_initrequest *r), + void (*bend_close)(void *handle)) +{ + statserv_options_block *cb = statserv_getcontrol(); + + cb->bend_init = bend_init; + cb->bend_close = bend_close; + + statserv_setcontrol(cb); + + /* Lets setup the Arg structure */ + ArgDetails.argc = argc; + ArgDetails.argv = argv; + + /* Now setup the service with the service controller */ + SetupService(argc, argv, &ArgDetails, SZAPPNAME, + cb->service_name, /* internal service name */ + cb->service_display_name, /* displayed name */ + SZDEPENDENCIES); + return 0; +} + +int StartAppService(void *pHandle, int argc, char **argv) +{ + /* Initializes the App */ + return 1; +} + +void RunAppService(void *pHandle) +{ + Args *pArgs = (Args *)pHandle; + + /* Starts the app running */ + statserv_start(pArgs->argc, pArgs->argv); +} + +void StopAppService(void *pHandle) +{ + /* Stops the app */ + statserv_closedown(); + statserv_reset(); +} +/* WIN32 */ +#else +/* UNIX */ +int statserv_main(int argc, char **argv, + bend_initresult *(*bend_init)(bend_initrequest *r), + void (*bend_close)(void *handle)) +{ + int ret; + statserv_options_block *cb = statserv_getcontrol(); + + cb->bend_init = bend_init; + cb->bend_close = bend_close; + + statserv_setcontrol(cb); + ret = statserv_start (argc, argv); + statserv_closedown (); + statserv_reset(); + return ret; +} +#endif