X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fstatserv.c;h=2a0527c658c7b309d799606069fff54d873b39da;hp=03822efe4fe8c0edb6602dadf85ac863f14f07a0;hb=348e11131385e72241a04997e90c8c77147e6423;hpb=9006495b0949ec4c474866cb69376653540b1aab diff --git a/server/statserv.c b/server/statserv.c index 03822ef..2a0527c 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -1,13 +1,61 @@ /* - * Copyright (c) 1995-1997, Index Data + * Copyright (c) 1995-1998, 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.39 1997-09-09 10:10:19 adam + * 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 + * 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. @@ -134,10 +182,12 @@ #include #include +#include #ifdef WINDOWS #include #include #include +#include "service.h" #else #include #include @@ -147,23 +197,24 @@ #include #include -#include "eventl.h" -#include "session.h" #include #include #ifdef USE_XTIMOSI #include #endif #include +#include "eventl.h" +#include "session.h" #include -static IOCHAN pListener; +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 */ LOG_DEFAULT_LEVEL, /* log level */ "", /* no PDUs */ @@ -173,7 +224,17 @@ static statserv_options_block control_block = { 60, /* 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 */ + NULL, /* pre init handler */ + check_options, /* Default routine, for checking the run-time arguments */ + 0 /* default value for inet deamon */ + +#ifdef WINDOWS + ,"Z39.50 Server", /* NT Service Name */ + "Server", /* NT application Name */ + "", /* NT Service Dependencies */ + "Z39.50 Server" /* NT Service Display Name */ +#endif /* WINDOWS */ }; /* @@ -186,12 +247,12 @@ static statserv_options_block control_block = { typedef struct _ThreadList ThreadList; -typedef struct _ThreadList +struct _ThreadList { HANDLE hThread; IOCHAN pIOChannel; ThreadList *pNext; -} ThreadList; +}; static ThreadList *pFirstThread; static CRITICAL_SECTION Thread_CritSect; @@ -200,13 +261,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) @@ -260,6 +321,7 @@ void statserv_remove(IOCHAN pIOChannel) { /* We need to look at another thread */ pNextThread = pCurrentThread->pNext; + pPrevThread = pCurrentThread; } } @@ -334,6 +396,11 @@ void statserv_closedown() } } +int __stdcall event_loop_thread (IOCHAN iochan) +{ + return event_loop (&iochan); +} + static void listener(IOCHAN h, int event) { COMSTACK line = (COMSTACK) iochan_getdata(h); @@ -345,7 +412,7 @@ static void listener(IOCHAN h, int event) { if ((res = cs_listen(line, 0, 0)) < 0) { - logf(LOG_FATAL, "cs_listen failed."); + logf(LOG_FATAL, "cs_listen failed"); return; } else if (res == 1) @@ -367,37 +434,42 @@ static void listener(IOCHAN h, int event) iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ return; } - logf(LOG_DEBUG, "accept ok"); + logf(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"); iochan_destroy(h); return; } - logf(LOG_DEBUG, "accept ok 2"); + logf(LOG_DEBUG, "Creating association"); if (!(newas = create_association(new_chan, new_line))) { logf(LOG_FATAL, "Failed to create new assoc."); iochan_destroy(h); return; } - logf(LOG_DEBUG, "accept ok 3"); + logf(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]"); - /* 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, 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, new_chan, 0, &ThreadId); +#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."); iochan_destroy(h); return; @@ -425,9 +497,22 @@ void statserv_remove(IOCHAN pIOChannel) void statserv_closedown() { - /* We don't need todoanything here - or do we */ - if (pListener != NULL) - iochan_destroy(pListener); + IOCHAN p; + for (p = pListener; p; p = p->next) + iochan_destroy(p); +} + +static int check_ip(void *cd, const char *addr, int len, int type) +{ + const unsigned char *ip = (const unsigned char *) addr; + int i; + char str[64]; + + sprintf (str, "%u", *ip); + for (i = 1; i<4; i++) + sprintf (str + strlen(str), ".%u", ip[i]); + logf (LOG_DEBUG, "ip %s", str); + return 0; } static void listener(IOCHAN h, int event) @@ -463,11 +548,11 @@ static void listener(IOCHAN h, int event) close(hand[0]); child = 1; - for (pp = iochan_getchan(); pp; pp = iochan_getnext(pp)) + for (pp = pListener; pp; pp = iochan_getnext(pp)) { if (pp != h) { - COMSTACK l = iochan_getdata(pp); + COMSTACK l = (COMSTACK)iochan_getdata(pp); cs_close(l); iochan_destroy(pp); } @@ -497,9 +582,9 @@ static void listener(IOCHAN h, int event) return; } } - if ((res = cs_listen(line, 0, 0)) < 0) + if ((res = cs_listen_check(line, 0, 0, check_ip, 0)) < 0) { - logf(LOG_FATAL, "cs_listen failed."); + logf(LOG_WARN, "cs_listen failed"); return; } else if (res == 1) @@ -526,9 +611,9 @@ static void listener(IOCHAN h, int event) { IOCHAN pp; /* close our half of the listener socket */ - for (pp = iochan_getchan(); pp; pp = iochan_getnext(pp)) + 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); } @@ -538,7 +623,7 @@ static void listener(IOCHAN h, int event) } else iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */ - + if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, EVENT_INPUT))) { @@ -546,6 +631,8 @@ static void listener(IOCHAN h, int event) iochan_destroy(h); return; } + new_chan->next = pListener; + pListener = new_chan; if (!(newas = create_association(new_chan, new_line))) { logf(LOG_FATAL, "Failed to create new assoc."); @@ -589,6 +676,8 @@ static void inetd_connection(int what) { logf(LOG_FATAL, "Failed to create association structure"); } + chan->next = pListener; + pListener = chan; } else { @@ -614,32 +703,24 @@ static void add_listener(char *where, int what) if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2) { - fprintf(stderr, "%s: Address format: ('tcp'|'osi')':'
.\n", - me); + logf (LOG_WARN, "%s: Address format: ('tcp'|'osi')':'
", me); + return; } if (!strcmp(mode, "tcp")) - { - if (!(ap = tcpip_strtoaddr(addr))) - { - fprintf(stderr, "Address resolution failed for TCP.\n"); - } type = tcpip_type; - } else if (!strcmp(mode, "osi")) { #ifdef USE_XTIMOSI - if (!(ap = mosi_strtoaddr(addr))) - { - fprintf(stderr, "Address resolution failed for TCP.\n"); - } type = mosi_type; #else - fprintf(stderr, "OSI Transport not allowed by configuration.\n"); + logf (LOG_WARN, "OSI Transport not allowed by configuration."); + return; #endif } else { - fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n"); + 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", @@ -648,14 +729,25 @@ static void add_listener(char *where, int 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; + } if (cs_bind(l, ap, CS_SERVER) < 0) { logf(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"); + cs_close (l); + return; } iochan_setdata(lst, l); @@ -687,92 +779,34 @@ void statserv_setcontrol(statserv_options_block *block) memcpy(&control_block, block, sizeof(*block)); } -int statserv_main(int argc, char **argv) +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 /* We need to initialize the thread list */ ThreadList_Initialize(); #endif /* WINDOWS */ +#ifdef WINDOWS + if ((me = strrchr (argv[0], '\\'))) + me++; + else + me = argv[0]; +#else me = argv[0]; - 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 0 - log_init(control_block.loglevel, NULL, control_block.logfile); -#endif /* WINDOWS */ - - if ((pListener == NULL) && *control_block.default_listen) - add_listener(control_block.default_listen, protocol); +#endif + if (control_block.options_func(argc, argv)) + return(1); #ifndef WINDOWS - if (inetd) - inetd_connection(protocol); + 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); } @@ -793,10 +827,151 @@ int statserv_main(int argc, char **argv) } #endif /* WINDOWS */ - 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) - return(1); + ret = 1; else - return event_loop(pListener); + { + logf(LOG_LOG, "Entering event loop."); + ret = event_loop(&pListener); + } + nmem_exit (); + return ret; } + +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) + { + switch (ret) + { + case 0: + add_listener(arg, control_block.default_proto); + 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 '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': + 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 " + " -zsS -w ... ]\n", me); + return(1); + } + } + return 0; +} + +#ifdef WINDOWS +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) +{ + statserv_options_block *cb = statserv_getcontrol(); + + /* 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); + 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(); +} +#else +int statserv_main(int argc, char **argv) +{ + int ret = statserv_start (argc, argv); + statserv_closedown (); + return ret; +} +#endif