X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fstatserv.c;h=11a7b5471946e323eadce661efd26db0ad7b5648;hb=23a3d157b61486fec09962339c407c4626e18268;hp=2f9c86c92dce4b2fc30d1065cd69b0a7619227ac;hpb=6f2577984a4b90d7ef4c4565b619927cd45c9132;p=yaz-moved-to-github.git diff --git a/server/statserv.c b/server/statserv.c index 2f9c86c..11a7b54 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -1,13 +1,68 @@ /* - * Copyright (c) 1995-1998, Index Data + * Copyright (c) 1995-2000, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * NT server based on threads by - * Chas Woodfield, Fretwell Downing Datasystems. + * Chas Woodfield, Fretwell Downing Informatics. * * $Log: statserv.c,v $ - * Revision 1.49 1998-02-27 14:04:55 adam + * Revision 1.66 2000-10-06 12:00:28 adam + * Fixed Handle leak for WIN32. + * + * Revision 1.65 2000/09/04 08:58:15 adam + * Added prefix yaz_ for most logging utility functions. + * + * Revision 1.64 2000/04/05 07:39:55 adam + * Added shared library support (libtool). + * + * Revision 1.63 2000/03/20 19:06:25 adam + * Added Segment request for fronend server. Work on admin for client. + * + * Revision 1.62 2000/03/17 12:47:02 adam + * Minor changes to admin client. + * + * Revision 1.61 2000/03/15 12:59:49 adam + * Added handle member to statserv_control. + * + * Revision 1.60 2000/03/14 09:06:11 adam + * Added POSIX threads support for frontend server. + * + * Revision 1.59 1999/11/30 13:47:12 adam + * Improved installation. Moved header files to include/yaz. + * + * Revision 1.58 1999/08/27 09:40:32 adam + * Renamed logf function to yaz_log. Removed VC++ project files. + * + * Revision 1.57 1999/07/06 12:17:15 adam + * Added option -1 that runs server once (for profiling purposes). + * + * Revision 1.56 1999/06/10 11:45:30 adam + * Added bend_start, bend_stop handlers and removed pre_init. + * Handlers bend_start/bend_stop are called when service/daemon is + * started/stopped. + * + * Revision 1.55 1999/06/10 09:18:54 adam + * Modified so that pre_init is called when service/server is started. + * + * Revision 1.54 1999/04/16 14:45:55 adam + * Added interface for tcpd wrapper for access control. + * + * Revision 1.53 1999/02/02 13:57:39 adam + * Uses preprocessor define WIN32 instead of WINDOWS to build code + * for Microsoft WIN32. + * + * Revision 1.52 1998/08/21 14:13:34 adam + * Added GNU Configure script to build Makefiles. + * + * Revision 1.51 1998/07/07 15:51:03 adam + * Changed server so that it stops if bind fails - "address already in + * use" typically causes this. + * + * Revision 1.50 1998/06/22 11:32:39 adam + * Added 'conditional cs_listen' feature. + * + * Revision 1.49 1998/02/27 14:04:55 adam * Fixed bug in statserv_remove. * * Revision 1.48 1998/02/11 11:53:36 adam @@ -173,15 +228,17 @@ * */ -#include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #include #include #include "service.h" #else +#if HAVE_PTHREAD_H +#include +#endif #include #include #endif @@ -189,16 +246,16 @@ #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; @@ -209,6 +266,8 @@ static char *me = "statserver"; 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 */ @@ -218,16 +277,21 @@ 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 */ + 0, /* bend_start handler */ + 0, /* bend_stop handler */ check_options, /* Default routine, for checking the run-time arguments */ - 0 /* default value for inet deamon */ - -#ifdef WINDOWS + 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 /* WINDOWS */ +#endif /* WIN32 */ }; /* @@ -236,7 +300,7 @@ 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; @@ -384,14 +448,16 @@ 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 event_loop_thread (IOCHAN iochan) { - return event_loop (&iochan); + event_loop (&iochan); } static void listener(IOCHAN h, int event) @@ -399,18 +465,18 @@ 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 */ } @@ -419,69 +485,59 @@ static void listener(IOCHAN h, int event) COMSTACK new_line; IOCHAN new_chan; char *a = NULL; - DWORD ThreadId; if (!(new_line = cs_accept(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 (!(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); + 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) + newHandle = (HANDLE) _beginthread(event_loop_thread, 0, new_chan); + if (newHandle == (HANDLE) -1) { - logf(LOG_FATAL|LOG_ERRNO, "Failed to create new thread."); + 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 */ +#else /* ! WIN32 */ /* To save having an #ifdef in event_loop we need to define this empty function */ void statserv_remove(IOCHAN pIOChannel) @@ -491,14 +547,25 @@ 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) +{ + statserv_closedown(); + exit (0); +} + +static void *new_session (void *vp); + 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; @@ -511,13 +578,13 @@ static void listener(IOCHAN h, int event) 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; } @@ -538,7 +605,7 @@ static void listener(IOCHAN h, int event) } } sprintf(nbuf, "%s(%d)", me, getpid()); - log_init(control_block.loglevel, nbuf, 0); + yaz_log_init(control_block.loglevel, nbuf, 0); } else /* parent */ { @@ -551,25 +618,26 @@ static void listener(IOCHAN h, int event) if ((res = read(hand[0], dummy, 1)) < 0 && 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, "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 */ } @@ -577,16 +645,14 @@ static void listener(IOCHAN h, int event) else if (event == EVENT_OUTPUT) { COMSTACK new_line; - IOCHAN new_chan; - char *a; if (!(new_line = cs_accept(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; @@ -598,41 +664,67 @@ static void listener(IOCHAN h, int event) 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))) - { - logf(LOG_FATAL, "Failed to create iochan"); - iochan_destroy(h); - return; - } - new_chan->next = pListener; - pListener = new_chan; - if (!(newas = create_association(new_chan, new_line))) + +#if HAVE_PTHREAD_H + if (control_block.threads) { - logf(LOG_FATAL, "Failed to create new assoc."); - iochan_destroy(h); - return; + pthread_t child_thread; + pthread_create (&child_thread, 0, new_session, new_line); + pthread_detach (child_thread); } - 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 { - 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; + if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, + EVENT_INPUT))) + { + 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; + } + iochan_setdata(new_chan, newas); + iochan_settimeout(new_chan, control_block.idle_timeout * 60); + a = cs_addrstr(new_line); + yaz_log(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]"); + if (control_block.threads) + { + event_loop(&new_chan); + } + else + { + new_chan->next = pListener; + pListener = new_chan; + } + return 0; +} + +#endif /* WIN32 */ static void inetd_connection(int what) { @@ -650,23 +742,23 @@ 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]"); } 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"); } } @@ -683,7 +775,7 @@ static void add_listener(char *where, int what) if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2) { - logf (LOG_WARN, "%s: Address format: ('tcp'|'osi')':'
", me); + yaz_log (LOG_WARN, "%s: Address format: ('tcp'|'osi')':'
", me); return; } if (!strcmp(mode, "tcp")) @@ -693,21 +785,23 @@ static void add_listener(char *where, int what) #ifdef USE_XTIMOSI type = mosi_type; #else - logf (LOG_WARN, "OSI Transport not allowed by configuration."); + yaz_log (LOG_WARN, "OSI Transport not allowed by configuration."); return; #endif } else { - logf (LOG_WARN, "You must specify either 'osi:' or 'tcp:'"); + yaz_log (LOG_WARN, "You must specify either 'osi:' or 'tcp:'"); return; } - logf(LOG_LOG, "Adding %s %s listener on %s", - control_block.dynamic ? "dynamic" : "static", + yaz_log(LOG_LOG, "Adding %s %s listener on %s", + control_block.dynamic ? "dynamic" : + (control_block.threads ? "threaded" : "static"), what == PROTO_SR ? "SR" : "Z3950", where); if (!(l = cs_create(type, 0, what))) { - logf(LOG_FATAL|LOG_ERRNO, "Failed to create listener"); + yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to create listener"); + return; } ap = cs_straddr (l, addr); if (!ap) @@ -718,12 +812,16 @@ static void add_listener(char *where, int what) } 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; } 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; } iochan_setdata(lst, l); @@ -732,7 +830,7 @@ static void add_listener(char *where, int what) pListener = lst; } -#ifndef WINDOWS +#ifndef WIN32 /* For windows we don't need to catch the signals */ static void catchchld(int num) { @@ -740,7 +838,7 @@ static void catchchld(int num) ; signal(SIGCHLD, catchchld); } -#endif /* WINDOWS */ +#endif /* WIN32 */ statserv_options_block *statserv_getcontrol(void) { @@ -760,12 +858,12 @@ int statserv_start(int argc, char **argv) int ret; nmem_init (); -#ifdef WINDOWS +#ifdef WIN32 /* We need to initialize the thread list */ ThreadList_Initialize(); -#endif /* WINDOWS */ +#endif /* WIN32 */ -#ifdef WINDOWS +#ifdef WIN32 if ((me = strrchr (argv[0], '\\'))) me++; else @@ -776,42 +874,59 @@ int statserv_start(int argc, char **argv) if (control_block.options_func(argc, argv)) return(1); -#ifndef WINDOWS + if (control_block.bend_start) + (*control_block.bend_start)(&control_block); +#ifdef WIN32 + logf (LOG_LOG, "Starting server %s", me); +#else if (control_block.inetd) inetd_connection(control_block.default_proto); else { - if (control_block.pre_init) - (*control_block.pre_init)(&control_block); + logf (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); + pthread_create (& + + +#endif if (control_block.dynamic) signal(SIGCHLD, catchchld); } + + 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 */ +#endif /* WIN32 */ if ((pListener == NULL) && *control_block.default_listen) add_listener(control_block.default_listen, control_block.default_proto); - logf(LOG_LOG, "Entering event loop."); if (pListener == NULL) ret = 1; else + { + yaz_log(LOG_LOG, "Entering event loop."); ret = event_loop(&pListener); + } nmem_exit (); return ret; } @@ -821,13 +936,17 @@ int check_options(int argc, char **argv) int ret = 0, r; char *arg; - while ((ret = options("a:iszSl:v:u:c:w:t:k:", argv, argc, &arg)) != -2) + while ((ret = options("1a:iszSTl:v:u:c:w:t:k:d:", argv, argc, &arg)) != -2) { switch (ret) { case 0: add_listener(arg, control_block.default_proto); break; + case '1': + control_block.one_shot = 1; + control_block.dynamic = 0; + break; case 'z': control_block.default_proto = PROTO_Z3950; break; @@ -837,13 +956,22 @@ int check_options(int argc, char **argv) case 'S': control_block.dynamic = 0; break; + case 'T': +#if HAVE_PTHREAD_H + 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 : ""); - log_init(control_block.loglevel, me, control_block.logfile); + yaz_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); + 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 : ""); @@ -854,6 +982,9 @@ int check_options(int argc, char **argv) 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))) { @@ -865,7 +996,7 @@ int check_options(int argc, char **argv) case 'k': if (!arg || !(r = atoi(arg))) { - fprintf(stderr, "%s: Specify positive timeout for -t.\n", me); + fprintf(stderr, "%s: Specify positive size for -k.\n", me); return(1); } control_block.maxrecordsize = r * 1024; @@ -877,21 +1008,21 @@ int check_options(int argc, char **argv) if (chdir(arg)) { perror(arg); - return(1); + return 1; } break; default: - fprintf(stderr, "Usage: %s [ -i -a -v " + fprintf(stderr, "Usage: %s [ -a -v " " -l -u -c -t " - " -k " - " -zsS -w ... ]\n", me); - return(1); + " -k -d " + " -zsiST -w ... ]\n", me); + return 1; } } return 0; } -#ifdef WINDOWS +#ifdef WIN32 typedef struct _Args { char **argv; @@ -906,10 +1037,17 @@ 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; + + statserv_setcontrol(cb); + /* Lets setup the Arg structure */ ArgDetails.argc = argc; ArgDetails.argv = argv; @@ -942,9 +1080,18 @@ void StopAppService(void *pHandle) statserv_closedown(); } #else -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)) { - 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 (); return ret; }