X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fstatserv.c;h=dd3dc75ed654ade7bc2f054d1bc30c7c213ed261;hp=e9d7912f47bdfaac164cf7d868b69e035773e33a;hb=c620a713f1418315efcd4e6fab225e036775d365;hpb=a807bde38544a7aa45dd2988e504a1acb3fd30c0 diff --git a/server/statserv.c b/server/statserv.c index e9d7912..dd3dc75 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -1,169 +1,17 @@ /* - * Copyright (c) 1995-1998, Index Data + * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * - * NT server based on threads by - * Chas Woodfield, Fretwell Downing Datasystem. - * - * $Log: statserv.c,v $ - * Revision 1.46 1998-01-30 15:24:57 adam - * Fixed bug in inetd code. The server listened on tcp:@:9999 even - * though it was started in inetd mode. - * - * Revision 1.45 1998/01/29 13:30:23 adam - * Better event handle system for NT/Unix. - * - * Revision 1.44 1997/11/07 13:31:52 adam - * Added NT Service name part of statserv_options_block. Moved NT - * service utility to server library. - * - * Revision 1.43 1997/10/31 12:20:09 adam - * Improved memory debugging for xmalloc/nmem.c. References to NMEM - * instead of ODR in n ESPEC-1 handling in source d1_espec.c. - * Bug fix: missing fclose in data1_read_espec1. - * - * Revision 1.42 1997/10/27 14:03:02 adam - * Added new member to statserver_options_block, pre_init, which - * specifies a callback to be invoked after command line parsing and - * before the server listens for the first time. - * - * Revision 1.41 1997/09/29 07:19:32 adam - * Server library uses nmem_init/nmem_exit. The log prefix no longer - * includes leading path on NT. - * - * Revision 1.40 1997/09/17 12:10:41 adam - * YAZ version 1.4. - * - * Revision 1.39 1997/09/09 10:10:19 adam - * Another MSV5.0 port. Changed projects to include proper - * library/include paths. - * Server starts server in test-mode when no options are given. - * - * Revision 1.38 1997/09/04 14:19:14 adam - * Added credits. - * - * Revision 1.37 1997/09/01 08:53:01 adam - * New windows NT/95 port using MSV5.0. The test server 'ztest' was - * moved a separate directory. MSV5.0 project server.dsp created. - * As an option, the server can now operate as an NT service. - * - * Revision 1.36 1996/07/06 19:58:36 quinn - * System headerfiles gathered in yconfig - * - * Revision 1.35 1996/05/29 10:03:28 quinn - * Options work - * - * Revision 1.34 1996/02/21 13:12:07 quinn - * *** empty log message *** - * - * Revision 1.33 1996/02/10 12:23:49 quinn - * Enable inetd operations fro TCP/IP stack - * - * Revision 1.32 1996/01/19 15:41:52 quinn - * *** empty log message *** - * - * Revision 1.31 1995/11/17 11:09:39 adam - * Added new option '-c' to specify configuration name in control block. - * - * Revision 1.30 1995/11/01 13:54:59 quinn - * Minor adjustments - * - * Revision 1.29 1995/10/30 12:41:29 quinn - * Added hostname lookup for server. - * - * Revision 1.28 1995/09/29 17:12:30 quinn - * Smallish - * - * Revision 1.27 1995/09/27 15:03:02 quinn - * Modified function heads & prototypes. - * - * Revision 1.26 1995/08/29 14:44:51 quinn - * Reset timeouts. - * - * Revision 1.25 1995/08/29 11:18:02 quinn - * Added code to receive close - * - * Revision 1.24 1995/06/16 10:31:39 quinn - * Added session timeout. - * - * Revision 1.23 1995/06/15 12:30:48 quinn - * Setuid-facility. - * - * 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. * + * $Id: statserv.c,v 1.91 2003-02-12 15:06:43 adam Exp $ */ -#include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #include #include @@ -172,20 +20,27 @@ #include #include #endif + +#if YAZ_POSIX_THREADS +#include +#elif YAZ_GNU_THREADS +#include +#endif + #include #include #include -#include -#include -#include +#include +#include +#include #ifdef USE_XTIMOSI -#include +#include #endif -#include +#include #include "eventl.h" #include "session.h" -#include +#include static IOCHAN pListener = NULL; @@ -193,8 +48,11 @@ 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 */ @@ -204,8 +62,22 @@ static statserv_options_block control_block = { 1024*1024, /* maximum PDU size (approx.) to allow */ "default-config", /* configuration name to pass to backend */ "", /* set user id */ - NULL, /* pre init handler */ - "Z39.50 Server" /* NT Service Name */ + 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 */ }; /* @@ -214,7 +86,7 @@ static statserv_options_block control_block = { * doing all of the listening and accepting in the parent - it's * safer that way. */ -#ifdef WINDOWS +#ifdef WIN32 typedef struct _ThreadList ThreadList; @@ -232,13 +104,13 @@ static BOOL bInitialized = FALSE; static void ThreadList_Initialize() { /* Initialize the critical Sections */ - InitializeCriticalSection(&Thread_CritSect); + InitializeCriticalSection(&Thread_CritSect); /* Set the first thraed */ - pFirstThread = NULL; + pFirstThread = NULL; - /* we have been initialized */ - bInitialized = TRUE; + /* we have been initialized */ + bInitialized = TRUE; } static void statserv_add(HANDLE hThread, IOCHAN pIOChannel) @@ -292,6 +164,7 @@ void statserv_remove(IOCHAN pIOChannel) { /* We need to look at another thread */ pNextThread = pCurrentThread->pNext; + pPrevThread = pCurrentThread; } } @@ -300,6 +173,7 @@ void statserv_remove(IOCHAN pIOChannel) } } +/* WIN32 statserv_closedown */ void statserv_closedown() { /* Shouldn't do anything if we are not initialized */ @@ -325,6 +199,7 @@ void statserv_closedown() { /* 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++; @@ -354,6 +229,7 @@ void statserv_closedown() /* 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); @@ -361,105 +237,116 @@ void statserv_closedown() 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); } } -int __stdcall event_loop_thread (IOCHAN iochan) +void __cdecl event_loop_thread (IOCHAN iochan) { - return event_loop (&iochan); + event_loop (&iochan); } -static void listener(IOCHAN h, int event) +/* WIN32 listener */ +static void listener(IOCHAN h, int event) { COMSTACK line = (COMSTACK) iochan_getdata(h); association *newas; int res; - HANDLE NewHandle; + HANDLE newHandle; if (event == EVENT_INPUT) { if ((res = cs_listen(line, 0, 0)) < 0) { - logf(LOG_FATAL, "cs_listen failed."); + yaz_log(LOG_FATAL, "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 */ } else if (event == EVENT_OUTPUT) { - COMSTACK new_line; + COMSTACK new_line = cs_accept(line); IOCHAN new_chan; char *a = NULL; - DWORD ThreadId; - if (!(new_line = cs_accept(line))) + if (!new_line) { - logf(LOG_FATAL, "Accept failed."); - iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ + yaz_log(LOG_FATAL, "Accept failed."); + iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); return; } - logf(LOG_DEBUG, "Accept ok"); + yaz_log(LOG_DEBUG, "Accept ok"); - if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, EVENT_INPUT))) + if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, + EVENT_INPUT))) { - logf(LOG_FATAL, "Failed to create iochan"); + yaz_log(LOG_FATAL, "Failed to create iochan"); iochan_destroy(h); return; } - logf(LOG_DEBUG, "Creating association"); + yaz_log(LOG_DEBUG, "Creating association"); if (!(newas = create_association(new_chan, new_line))) { - logf(LOG_FATAL, "Failed to create new assoc."); + yaz_log(LOG_FATAL, "Failed to create new assoc."); iochan_destroy(h); return; } - logf(LOG_DEBUG, "Setting timeout %d", control_block.idle_timeout); + 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, control_block.idle_timeout * 60); -#ifndef WINDOWS - logf(LOG_DEBUG, "Determining client address"); - a = cs_addrstr(new_line); - logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]"); -#endif - /* Now what we need todo is create a new thread with this iochan as - the parameter */ - /* if (CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)event_loop_thread, - new_chan, 0, &ThreadId) == NULL) */ - /* Somehow, somewhere we need to store this thread id, otherwise we won't be - able to close cleanly */ - NewHandle = (HANDLE)_beginthreadex(NULL, 0, event_loop_thread, - new_chan, 0, &ThreadId); - if (NewHandle == (HANDLE)-1) - { - logf(LOG_FATAL|LOG_ERRNO, "Failed to create new thread."); + /* 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); + statserv_add(newHandle, new_chan); - logf(LOG_DEBUG, "Created new thread, iochan %p", 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 { - logf(LOG_FATAL, "Bad event on listener."); + yaz_log(LOG_FATAL, "Bad event on listener."); iochan_destroy(h); return; } } -#else /* WINDOWS */ +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; +} -/* To save having an #ifdef in event_loop we need to define this empty function */ void statserv_remove(IOCHAN pIOChannel) { } @@ -467,14 +354,27 @@ 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); - association *newas; static int hand[2]; static int child = 0; int res; @@ -485,15 +385,16 @@ static void listener(IOCHAN h, int event) { int res; + ++no_sessions; if (pipe(hand) < 0) { - logf(LOG_FATAL|LOG_ERRNO, "pipe"); + yaz_log(LOG_FATAL|LOG_ERRNO, "pipe"); iochan_destroy(h); return; } if ((res = fork()) < 0) { - logf(LOG_FATAL|LOG_ERRNO, "fork"); + yaz_log(LOG_FATAL|LOG_ERRNO, "fork"); iochan_destroy(h); return; } @@ -508,13 +409,17 @@ static void listener(IOCHAN h, int event) { if (pp != h) { - COMSTACK l = iochan_getdata(pp); + 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 */ { @@ -525,90 +430,159 @@ 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"); + 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; - char *a; + 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 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"); - iochan_destroy(h); - return; + pthread_t child_thread; + pthread_create (&child_thread, 0, new_session, new_line); + pthread_detach (child_thread); } - new_chan->next = pListener; - pListener = new_chan; - 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."); - iochan_destroy(h); - return; + 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); - iochan_settimeout(new_chan, control_block.idle_timeout * 60); - a = cs_addrstr(new_line); - logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]"); + 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."); + yaz_log(LOG_FATAL, "Bad event on listener."); iochan_destroy(h); - return; } } -#endif /* WINDOWS */ +static void *new_session (void *vp) +{ + 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 (mask) + { + cs_accept_mask = mask; /* accept didn't complete */ + cs_get_mask = 0; + } + else + { + cs_accept_mask = 0; /* accept completed. */ + cs_get_mask = mask = EVENT_INPUT; + } + + if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, mask))) + { + 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, control_block.idle_timeout * 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) { @@ -626,97 +600,84 @@ static void inetd_connection(int what) iochan_setdata(chan, assoc); iochan_settimeout(chan, control_block.idle_timeout * 60); addr = cs_addrstr(line); - logf(LOG_LOG, "Inetd association from %s", addr ? addr : "[UNKNOWN]"); + yaz_log(LOG_LOG, "Inetd association from %s", + addr ? addr : "[UNKNOWN]"); + assoc->cs_get_mask = EVENT_INPUT; } else { - logf(LOG_FATAL, "Failed to create association structure"); + yaz_log(LOG_FATAL, "Failed to create association structure"); } chan->next = pListener; pListener = chan; } else { - logf(LOG_FATAL, "Failed to create iochan"); + yaz_log(LOG_FATAL, "Failed to create iochan"); } } else { - logf(LOG_ERRNO|LOG_FATAL, "Failed to create comstack on socket 0"); + yaz_log(LOG_ERRNO|LOG_FATAL, "Failed to create comstack on socket 0"); } } /* * Set up a listening endpoint, and give it to the event-handler. */ -static void add_listener(char *where, int what) +static int add_listener(char *where, int what) { COMSTACK l; - CS_TYPE type; - char mode[100], addr[100]; void *ap; IOCHAN lst = NULL; + const char *mode; - if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2) - { - logf (LOG_WARN, "%s: Address format: ('tcp'|'osi')':'
", me); - return; - } - if (!strcmp(mode, "tcp")) - type = tcpip_type; - else if (!strcmp(mode, "osi")) - { -#ifdef USE_XTIMOSI - type = mosi_type; -#else - logf (LOG_WARN, "OSI Transport not allowed by configuration."); - return; -#endif - } + 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_WARN, "You must specify either 'osi:' or 'tcp:'"); - return; - } - 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))) - { - logf(LOG_FATAL|LOG_ERRNO, "Failed to create listener"); - } - ap = cs_straddr (l, addr); - if (!ap) - { - fprintf(stderr, "Address resolution failed.\n"); - cs_close (l); - return; + 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); + 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"); + 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 WINDOWS -/* For windows we don't need to catch the signals */ +#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 /* WINDOWS */ +#endif statserv_options_block *statserv_getcontrol(void) { @@ -731,19 +692,43 @@ void statserv_setcontrol(statserv_options_block *block) memcpy(&control_block, block, sizeof(*block)); } +void statserv_add_soap_handler(int (*h)(struct bend_soap_rr *rr), + const char *ns) +{ + struct bend_soap_handler *sh = 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, listeners = 0, inetd = 0, r; - char *arg; - int protocol = control_block.default_proto; + int ret; - nmem_init (); -#ifdef WINDOWS +#ifdef WIN32 /* We need to initialize the thread list */ ThreadList_Initialize(); -#endif /* WINDOWS */ - -#ifdef WINDOWS +/* WIN32 */ +#endif + +#ifdef WIN32 if ((me = strrchr (argv[0], '\\'))) me++; else @@ -751,108 +736,163 @@ int statserv_start(int argc, char **argv) #else me = argv[0]; #endif - while ((ret = options("a:iszSl:v:u:c:w:t:k:", argv, argc, &arg)) != -2) - { - 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; - case 'c': - strcpy(control_block.configname, 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 timeout for -t.\n", - me); - return(1); - } - control_block.maxrecordsize = r * 1024; - break; - case 'i': - inetd = 1; break; - case 'w': - if (chdir(arg)) - { - perror(arg); - - return(1); - } - break; - default: - fprintf(stderr, "Usage: %s [ -i -a -v " - " -l -u -c -t " - " -k " - " -zsS -w ... ]\n", me); - return(1); - } - } -#ifndef WINDOWS - if (inetd) - inetd_connection(protocol); + 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 { - if (control_block.pre_init) - (*control_block.pre_init)(&control_block); + 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); } + signal (SIGPIPE, SIG_IGN); + signal (SIGTERM, sigterm); if (*control_block.setuid) { struct passwd *pw; if (!(pw = getpwnam(control_block.setuid))) { - logf(LOG_FATAL, "%s: Unknown user", control_block.setuid); + 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); } } -#endif /* WINDOWS */ - +/* UNIX */ +#endif + + if ((pListener == NULL) && *control_block.default_listen) - add_listener(control_block.default_listen, protocol); - - logf(LOG_LOG, "Entering event loop."); + 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); - nmem_exit (); + } return ret; } -#ifdef WINDOWS +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; @@ -867,19 +907,26 @@ static Args ArgDetails; /* list of service dependencies - "dep1\0dep2\0\0" */ #define SZDEPENDENCIES "" -int statserv_main(int argc, char **argv) +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; - /* Lets setup the Arg structure */ + 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_name, /* displayed name of the service */ - SZDEPENDENCIES); + cb->service_name, /* internal service name */ + cb->service_display_name, /* displayed name */ + SZDEPENDENCIES); return 0; } @@ -892,7 +939,7 @@ int StartAppService(void *pHandle, int argc, char **argv) void RunAppService(void *pHandle) { Args *pArgs = (Args *)pHandle; - + /* Starts the app running */ statserv_start(pArgs->argc, pArgs->argv); } @@ -901,12 +948,25 @@ void StopAppService(void *pHandle) { /* Stops the app */ statserv_closedown(); + statserv_reset(); } +/* WIN32 */ #else -int statserv_main(int argc, char **argv) +/* UNIX */ +int statserv_main(int argc, char **argv, + bend_initresult *(*bend_init)(bend_initrequest *r), + void (*bend_close)(void *handle)) { - int ret = statserv_start (argc, argv); + 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