/*
- * Copyright (c) 1995-1998, Index Data
+ * Copyright (c) 1995-1999, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* 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
*
*/
-#include <yconfig.h>
#include <stdio.h>
#include <string.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <process.h>
#include <winsock.h>
#include <direct.h>
#include <signal.h>
#include <errno.h>
-#include <options.h>
#include <comstack.h>
#include <tcpip.h>
+#include <options.h>
#ifdef USE_XTIMOSI
#include <xmosi.h>
#endif
"", /* 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 */
};
/*
* doing all of the listening and accepting in the parent - it's
* safer that way.
*/
-#ifdef WINDOWS
+#ifdef WIN32
typedef struct _ThreadList ThreadList;
{
/* We need to look at another thread */
pNextThread = pCurrentThread->pNext;
+ pPrevThread = pCurrentThread;
}
}
{
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)
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]");
}
}
-#else /* WINDOWS */
+#else /* WIN32 */
/* To save having an #ifdef in event_loop we need to define this empty function */
void statserv_remove(IOCHAN pIOChannel)
{
if (pp != h)
{
- COMSTACK l = iochan_getdata(pp);
+ COMSTACK l = (COMSTACK)iochan_getdata(pp);
cs_close(l);
iochan_destroy(pp);
}
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)
/* 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);
}
}
}
-#endif /* WINDOWS */
+#endif /* WIN32 */
static void inetd_connection(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)
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);
pListener = lst;
}
-#ifndef WINDOWS
+#ifndef WIN32
/* For windows we don't need to catch the signals */
static void catchchld(int num)
{
;
signal(SIGCHLD, catchchld);
}
-#endif /* WINDOWS */
+#endif /* WIN32 */
statserv_options_block *statserv_getcontrol(void)
{
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
if (control_block.options_func(argc, argv))
return(1);
-#ifndef WINDOWS
+#ifndef WIN32
if (control_block.inetd)
inetd_connection(control_block.default_proto);
else
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;
}
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)
{
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)))
{
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;
default:
fprintf(stderr, "Usage: %s [ -i -a <pdufile> -v <loglevel>"
" -l <logfile> -u <user> -c <config> -t <minutes>"
- " -k <kilobytes>"
+ " -k <kilobytes> -d <daemon>"
" -zsS <listener-addr> -w <directory> ... ]\n", me);
return(1);
}
return 0;
}
-#ifdef WINDOWS
+#ifdef WIN32
typedef struct _Args
{
char **argv;
projects / yaz-moved-to-github.git / blobdiff