X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fstatserv.c;h=6bfee9311d8e8f0de1b2f63d781a7e79fff013ec;hp=b514f291520588fb8f31142be114178f446a8145;hb=bf7ee634e855d15e955d06e7b225d2045abd518a;hpb=8f7995bdfe85beb2ff6fa08e99bb05242f3bf71f diff --git a/server/statserv.c b/server/statserv.c index b514f29..6bfee93 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1998, Index Data + * Copyright (c) 1995-1999, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * @@ -7,7 +7,30 @@ * Chas Woodfield, Fretwell Downing Datasystems. * * $Log: statserv.c,v $ - * Revision 1.47 1998-02-10 10:28:57 adam + * 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 @@ -167,10 +190,9 @@ * */ -#include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #include #include @@ -183,9 +205,9 @@ #include #include -#include #include #include +#include #ifdef USE_XTIMOSI #include #endif @@ -214,14 +236,16 @@ statserv_options_block control_block = { "", /* set user id */ NULL, /* pre init handler */ check_options, /* Default routine, for checking the run-time arguments */ + check_ip_tcpd, + "", 0 /* default value for inet deamon */ -#ifdef WINDOWS +#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 */ }; /* @@ -230,7 +254,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; @@ -308,6 +332,7 @@ void statserv_remove(IOCHAN pIOChannel) { /* We need to look at another thread */ pNextThread = pCurrentThread->pNext; + pPrevThread = pCurrentThread; } } @@ -398,7 +423,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) @@ -440,7 +465,7 @@ static void listener(IOCHAN h, int event) 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 +#ifndef WIN32 logf(LOG_DEBUG, "Determining client address"); a = cs_addrstr(new_line); logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]"); @@ -474,7 +499,7 @@ static void listener(IOCHAN h, int event) } } -#else /* WINDOWS */ +#else /* WIN32 */ /* To save having an #ifdef in event_loop we need to define this empty function */ void statserv_remove(IOCHAN pIOChannel) @@ -525,7 +550,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); } @@ -555,9 +580,10 @@ static void listener(IOCHAN h, int event) 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."); + logf(LOG_WARN, "cs_listen failed"); return; } else if (res == 1) @@ -586,7 +612,7 @@ static void listener(IOCHAN h, int event) /* 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); } @@ -625,7 +651,7 @@ static void listener(IOCHAN h, int event) } } -#endif /* WINDOWS */ +#endif /* WIN32 */ static void inetd_connection(int what) { @@ -701,6 +727,7 @@ static void add_listener(char *where, int what) if (!(l = cs_create(type, 0, what))) { logf(LOG_FATAL|LOG_ERRNO, "Failed to create listener"); + return; } ap = cs_straddr (l, addr); if (!ap) @@ -712,11 +739,15 @@ 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); + 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); @@ -725,7 +756,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) { @@ -733,7 +764,7 @@ static void catchchld(int num) ; signal(SIGCHLD, catchchld); } -#endif /* WINDOWS */ +#endif /* WIN32 */ statserv_options_block *statserv_getcontrol(void) { @@ -753,12 +784,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 @@ -769,7 +800,7 @@ int statserv_start(int argc, char **argv) if (control_block.options_func(argc, argv)) return(1); -#ifndef WINDOWS +#ifndef WIN32 if (control_block.inetd) inetd_connection(control_block.default_proto); else @@ -794,17 +825,19 @@ int statserv_start(int argc, char **argv) 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 + { + logf(LOG_LOG, "Entering event loop."); ret = event_loop(&pListener); + } nmem_exit (); return ret; } @@ -814,7 +847,7 @@ 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("a:iszSl:v:u:c:w:t:k:d:", argv, argc, &arg)) != -2) { switch (ret) { @@ -847,6 +880,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))) { @@ -858,7 +894,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; @@ -876,7 +912,7 @@ int check_options(int argc, char **argv) default: fprintf(stderr, "Usage: %s [ -i -a -v " " -l -u -c -t " - " -k " + " -k -d " " -zsS -w ... ]\n", me); return(1); } @@ -884,7 +920,7 @@ int check_options(int argc, char **argv) return 0; } -#ifdef WINDOWS +#ifdef WIN32 typedef struct _Args { char **argv;