X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fstatserv.c;h=7df2baa721c94cc36e876cbf0cc48f378c381a9c;hp=9cf20c89b8cd7b54fd813947104cbb96e824e99a;hb=b440dce0831a72bebe4f4821ab7771cc05e8facb;hpb=7574c044d6c2dc8ede5c7c406f9939215a220260 diff --git a/server/statserv.c b/server/statserv.c index 9cf20c8..7df2baa 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -1,13 +1,61 @@ /* - * Copyright (c) 1995-1998, Index Data + * Copyright (c) 1995-1999, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * NT server based on threads by - * Chas Woodfield, Fretwell Downing Datasystem. + * Chas Woodfield, Fretwell Downing Datasystems. * * $Log: statserv.c,v $ - * Revision 1.45 1998-01-29 13:30:23 adam + * 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 + * Changed code so that it compiles as C++. + * + * Revision 1.47 1998/02/10 10:28:57 adam + * Added app_name, service_dependencies, service_display_name and + * options_func. options_func allows us to specify a different function + * to interogate the command line arguments. The other members allow us + * to pass the full service details accross to the service manager (CW). + * + * + * 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 @@ -156,10 +204,9 @@ * */ -#include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #include #include @@ -172,9 +219,9 @@ #include #include -#include #include #include +#include #ifdef USE_XTIMOSI #include #endif @@ -189,8 +236,10 @@ 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, /* one shot (single session) */ LOG_DEFAULT_LEVEL, /* log level */ "", /* no PDUs */ "", /* diagnostic output to stderr */ @@ -200,8 +249,19 @@ 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 */ + +#ifdef WIN32 + ,"Z39.50 Server", /* NT Service Name */ + "Server", /* NT application Name */ + "", /* NT Service Dependencies */ + "Z39.50 Server" /* NT Service Display Name */ +#endif /* WIN32 */ }; /* @@ -210,7 +270,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; @@ -228,13 +288,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) @@ -288,6 +348,7 @@ void statserv_remove(IOCHAN pIOChannel) { /* We need to look at another thread */ pNextThread = pCurrentThread->pNext; + pPrevThread = pCurrentThread; } } @@ -357,6 +418,8 @@ 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); } @@ -378,12 +441,12 @@ static void listener(IOCHAN h, int event) { 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 */ } @@ -396,64 +459,65 @@ static void listener(IOCHAN h, int event) 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))) + 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"); +#ifndef WIN32 + yaz_log(LOG_DEBUG, "Determining client address"); a = cs_addrstr(new_line); - logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]"); + yaz_log(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 */ + /* 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); + new_chan, 0, &ThreadId); 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); - logf(LOG_DEBUG, "Created new thread, iochan %p", new_chan); + yaz_log(LOG_DEBUG, "Created new thread, iochan %p", 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) @@ -483,13 +547,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; } @@ -504,7 +568,7 @@ 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); } @@ -523,25 +587,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 */ } @@ -554,32 +619,32 @@ static void listener(IOCHAN h, int event) 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; /* 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))) { - logf(LOG_FATAL, "Failed to create iochan"); + yaz_log(LOG_FATAL, "Failed to create iochan"); iochan_destroy(h); return; } @@ -587,24 +652,24 @@ static void listener(IOCHAN h, int event) pListener = new_chan; 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; } 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]"); + yaz_log(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]"); } else { - logf(LOG_FATAL, "Bad event on listener."); + yaz_log(LOG_FATAL, "Bad event on listener."); iochan_destroy(h); return; } } -#endif /* WINDOWS */ +#endif /* WIN32 */ static void inetd_connection(int what) { @@ -622,21 +687,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"); } } @@ -653,7 +720,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")) @@ -663,21 +730,22 @@ 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", + yaz_log(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"); + yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to create listener"); + return; } ap = cs_straddr (l, addr); if (!ap) @@ -688,12 +756,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); @@ -702,7 +774,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) { @@ -710,7 +782,7 @@ static void catchchld(int num) ; signal(SIGCHLD, catchchld); } -#endif /* WINDOWS */ +#endif /* WIN32 */ statserv_options_block *statserv_getcontrol(void) { @@ -727,17 +799,15 @@ void statserv_setcontrol(statserv_options_block *block) 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 */ +#endif /* WIN32 */ -#ifdef WINDOWS +#ifdef WIN32 if ((me = strrchr (argv[0], '\\'))) me++; else @@ -745,78 +815,16 @@ 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); - } - } - - if ((pListener == NULL) && *control_block.default_listen) - add_listener(control_block.default_listen, protocol); - -#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); +#ifndef WIN32 + if (control_block.inetd) + inetd_connection(control_block.default_proto); else { - if (control_block.pre_init) - (*control_block.pre_init)(&control_block); if (control_block.dynamic) signal(SIGCHLD, catchchld); } @@ -826,28 +834,115 @@ int statserv_start(int argc, char **argv) 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 */ - logf(LOG_LOG, "Entering event loop."); + 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); + } nmem_exit (); return ret; } -#ifdef WINDOWS +int check_options(int argc, char **argv) +{ + int ret = 0, r; + char *arg; + + while ((ret = options("1a:iszSl: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; + case 's': + control_block.default_proto = 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 '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 [ -i -a -v " + " -l -u -c -t " + " -k -d " + " -zsS -w ... ]\n", me); + return(1); + } + } + return 0; +} + +#ifdef WIN32 typedef struct _Args { char **argv; @@ -865,16 +960,16 @@ static Args ArgDetails; int statserv_main(int argc, char **argv) { statserv_options_block *cb = statserv_getcontrol(); - - /* Lets setup the Arg structure */ + + /* 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_name, /* displayed name of the service */ + SZDEPENDENCIES); return 0; } @@ -887,7 +982,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); }