* Sebastian Hammer, Adam Dickmeiss
*
* $Log: statserv.c,v $
- * Revision 1.23 1995-06-15 12:30:48 quinn
+ * Revision 1.37 1997-09-01 08:53:01 adam
+ * New windows NT/95 port using MSV5.0. The test server 'ztest' was
+ * moved a separate directory. MSV5.0 project server.dsp created.
+ * As an option, the server can now operate as an NT service.
+ *
+ * Revision 1.36 1996/07/06 19:58:36 quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.35 1996/05/29 10:03:28 quinn
+ * Options work
+ *
+ * Revision 1.34 1996/02/21 13:12:07 quinn
+ * *** empty log message ***
+ *
+ * Revision 1.33 1996/02/10 12:23:49 quinn
+ * Enable inetd operations fro TCP/IP stack
+ *
+ * Revision 1.32 1996/01/19 15:41:52 quinn
+ * *** empty log message ***
+ *
+ * Revision 1.31 1995/11/17 11:09:39 adam
+ * Added new option '-c' to specify configuration name in control block.
+ *
+ * Revision 1.30 1995/11/01 13:54:59 quinn
+ * Minor adjustments
+ *
+ * Revision 1.29 1995/10/30 12:41:29 quinn
+ * Added hostname lookup for server.
+ *
+ * Revision 1.28 1995/09/29 17:12:30 quinn
+ * Smallish
+ *
+ * Revision 1.27 1995/09/27 15:03:02 quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.26 1995/08/29 14:44:51 quinn
+ * Reset timeouts.
+ *
+ * Revision 1.25 1995/08/29 11:18:02 quinn
+ * Added code to receive close
+ *
+ * Revision 1.24 1995/06/16 10:31:39 quinn
+ * Added session timeout.
+ *
+ * Revision 1.23 1995/06/15 12:30:48 quinn
* Setuid-facility.
*
* Revision 1.22 1995/06/15 07:45:17 quinn
* really have to, but it's great for debugging memory management. :)
*/
+#include <yconfig.h>
#include <stdio.h>
+#ifdef WINDOWS
+#include <process.h>
+#include <winsock.h>
+#include <direct.h>
+#else
#include <unistd.h>
+#include <pwd.h>
+#endif
#include <fcntl.h>
-#include <sys/wait.h>
#include <signal.h>
#include <errno.h>
-#include <sys/types.h>
-#include <pwd.h>
#include <options.h>
-#include <eventl.h>
-#include <session.h>
-#include <eventl.h>
+#include "eventl.h"
+#include "session.h"
#include <comstack.h>
#include <tcpip.h>
#ifdef USE_XTIMOSI
#include <xmosi.h>
#endif
-#include <dmalloc.h>
#include <log.h>
#include <statserv.h>
+static IOCHAN pListener;
+
static char *me = "statserver";
/*
* default behavior.
LOG_DEFAULT_LEVEL, /* log level */
"", /* no PDUs */
"", /* diagnostic output to stderr */
- "tcp:@:9999", /* default listener port */
- PROTO_Z3950, /* application protocol */
+ "tcp:@:9999", /* default listener port */
+ PROTO_Z3950, /* default application protocol */
60, /* idle timeout (minutes) */
- 1024*1024*4, /* maximum PDU size (approx.) to allow */
+ 1024*1024, /* maximum PDU size (approx.) to allow */
"default-config", /* configuration name to pass to backend */
"" /* set user id */
};
-#define DEFAULT_LISTENER "tcp:localhost:9999"
-
/*
* handle incoming connect requests.
* The dynamic mode is a bit tricky mostly because we want to avoid
* doing all of the listening and accepting in the parent - it's
* safer that way.
*/
+#ifdef WINDOWS
+
+typedef struct _ThreadList ThreadList;
+
+typedef struct _ThreadList
+{
+ HANDLE hThread;
+ IOCHAN pIOChannel;
+ ThreadList *pNext;
+} ThreadList;
+
+static ThreadList *pFirstThread;
+static CRITICAL_SECTION Thread_CritSect;
+static BOOL bInitialized = FALSE;
+
+static void ThreadList_Initialize()
+{
+ /* Initialize the critical Sections */
+ InitializeCriticalSection(&Thread_CritSect);
+
+ /* Set the first thraed */
+ pFirstThread = NULL;
+
+ /* we have been initialized */
+ bInitialized = TRUE;
+}
+
+static void statserv_add(HANDLE hThread, IOCHAN pIOChannel)
+{
+ /* Only one thread can go through this section at a time */
+ EnterCriticalSection(&Thread_CritSect);
+
+ {
+ /* Lets create our new object */
+ ThreadList *pNewThread = (ThreadList *)malloc(sizeof(ThreadList));
+ pNewThread->hThread = hThread;
+ pNewThread->pIOChannel = pIOChannel;
+ pNewThread->pNext = pFirstThread;
+ pFirstThread = pNewThread;
+
+ /* Lets let somebody else create a new object now */
+ LeaveCriticalSection(&Thread_CritSect);
+ }
+}
+
+void statserv_remove(IOCHAN pIOChannel)
+{
+ /* Only one thread can go through this section at a time */
+ EnterCriticalSection(&Thread_CritSect);
+
+ {
+ ThreadList *pCurrentThread = pFirstThread;
+ ThreadList *pNextThread;
+ ThreadList *pPrevThread =NULL;
+
+ /* Step through alll the threads */
+ for (; pCurrentThread != NULL; pCurrentThread = pNextThread)
+ {
+ /* We only need to compare on the IO Channel */
+ if (pCurrentThread->pIOChannel == pIOChannel)
+ {
+ /* We have found the thread we want to delete */
+ /* First of all reset the next pointers */
+ if (pPrevThread == NULL)
+ pFirstThread = pCurrentThread->pNext;
+ else
+ pPrevThread->pNext = pCurrentThread->pNext;
+
+ /* All we need todo now is delete the memory */
+ free(pCurrentThread);
+
+ /* No need to look at any more threads */
+ pNextThread = NULL;
+ }
+ else
+ {
+ /* We need to look at another thread */
+ pNextThread = pCurrentThread->pNext;
+ }
+ }
+
+ /* Lets let somebody else remove an object now */
+ LeaveCriticalSection(&Thread_CritSect);
+ }
+}
+
+void statserv_closedown()
+{
+ /* Shouldn't do anything if we are not initialized */
+ if (bInitialized)
+ {
+ int iHandles = 0;
+ HANDLE *pThreadHandles = NULL;
+
+ /* We need to stop threads adding and removing while we start the closedown process */
+ EnterCriticalSection(&Thread_CritSect);
+
+ {
+ /* We have exclusive access to the thread stuff now */
+ /* Y didn't i use a semaphore - Oh well never mind */
+ ThreadList *pCurrentThread = pFirstThread;
+
+ /* Before we do anything else, we need to shutdown the listener */
+ if (pListener != NULL)
+ iochan_destroy(pListener);
+
+ for (; pCurrentThread != NULL; pCurrentThread = pCurrentThread->pNext)
+ {
+ /* Just destroy the IOCHAN, that should do the trick */
+ iochan_destroy(pCurrentThread->pIOChannel);
+
+ /* Keep a running count of our handles */
+ iHandles++;
+ }
+
+ if (iHandles > 0)
+ {
+ HANDLE *pCurrentHandle ;
+
+ /* Allocate the thread handle array */
+ pThreadHandles = (HANDLE *)malloc(sizeof(HANDLE) * iHandles);
+ pCurrentHandle = pThreadHandles;
+
+ for (pCurrentThread = pFirstThread;
+ pCurrentThread != NULL;
+ pCurrentThread = pCurrentThread->pNext, pCurrentHandle++)
+ {
+ /* Just the handle */
+ *pCurrentHandle = pCurrentThread->hThread;
+ }
+ }
+
+ /* We can now leave the critical section */
+ LeaveCriticalSection(&Thread_CritSect);
+ }
+
+ /* Now we can really do something */
+ if (iHandles > 0)
+ {
+ /* This will now wait, until all the threads close */
+ WaitForMultipleObjects(iHandles, pThreadHandles, TRUE, INFINITE);
+
+ /* Free the memory we allocated for the handle array */
+ free(pThreadHandles);
+ }
+
+ /* No longer require the critical section, since all threads are dead */
+ DeleteCriticalSection(&Thread_CritSect);
+ }
+}
+
+static void listener(IOCHAN h, int event)
+{
+ COMSTACK line = (COMSTACK) iochan_getdata(h);
+ association *newas;
+ int res;
+ HANDLE NewHandle;
+
+ if (event == EVENT_INPUT)
+ {
+ if ((res = cs_listen(line, 0, 0)) < 0)
+ {
+ logf(LOG_FATAL, "cs_listen failed.");
+ return;
+ }
+ else if (res == 1)
+ return;
+ logf(LOG_DEBUG, "listen ok");
+ iochan_setevent(h, EVENT_OUTPUT);
+ iochan_setflags(h, EVENT_OUTPUT | EVENT_EXCEPT); /* set up for acpt */
+ }
+ else if (event == EVENT_OUTPUT)
+ {
+ COMSTACK new_line;
+ IOCHAN new_chan;
+ char *a;
+ DWORD ThreadId;
+
+ if (!(new_line = cs_accept(line)))
+ {
+ logf(LOG_FATAL, "Accept failed.");
+ iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */
+ return;
+ }
+ logf(LOG_DEBUG, "accept ok");
+
+ if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, EVENT_INPUT)))
+ {
+ logf(LOG_FATAL, "Failed to create iochan");
+ iochan_destroy(h);
+ return;
+ }
+ if (!(newas = create_association(new_chan, new_line)))
+ {
+ logf(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]");
+
+ /* 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);
+ if (NewHandle == (HANDLE)-1)
+ {
+ logf(LOG_FATAL, "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);
+ iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */
+ }
+ else
+ {
+ logf(LOG_FATAL, "Bad event on listener.");
+ iochan_destroy(h);
+ return;
+ }
+}
+
+#else /* WINDOWS */
+
+/* To save having an #ifdef in event_loop we need to define this empty function */
+void statserv_remove(IOCHAN pIOChannel)
+{
+}
+
+void statserv_closedown()
+{
+ /* We don't need todoanything here - or do we */
+ if (pListener != NULL)
+ iochan_destroy(pListener);
+}
+
static void listener(IOCHAN h, int event)
{
COMSTACK line = (COMSTACK) iochan_getdata(h);
if (pipe(hand) < 0)
{
logf(LOG_FATAL|LOG_ERRNO, "pipe");
- exit(1);
+ iochan_destroy(h);
+ return;
}
if ((res = fork()) < 0)
{
logf(LOG_FATAL|LOG_ERRNO, "fork");
- exit(1);
+ iochan_destroy(h);
+ return;
}
else if (res == 0) /* child */
{
char nbuf[100];
+ IOCHAN pp;
close(hand[0]);
child = 1;
+ for (pp = iochan_getchan(); pp; pp = iochan_getnext(pp))
+ {
+ if (pp != h)
+ {
+ COMSTACK l = iochan_getdata(pp);
+ cs_close(l);
+ iochan_destroy(pp);
+ }
+ }
sprintf(nbuf, "%s(%d)", me, getpid());
log_init(control_block.loglevel, nbuf, 0);
}
if ((res = read(hand[0], dummy, 1)) < 0 && errno != EINTR)
{
logf(LOG_FATAL|LOG_ERRNO, "handshake read");
- exit(1);
+ return;
}
else if (res >= 0)
break;
{
COMSTACK new_line;
IOCHAN new_chan;
+ char *a;
if (!(new_line = cs_accept(line)))
{
if (control_block.dynamic)
{
IOCHAN pp;
- /* close our half of the listener sockets */
+ /* close our half of the listener socket */
for (pp = iochan_getchan(); pp; pp = iochan_getnext(pp))
{
COMSTACK l = iochan_getdata(pp);
EVENT_INPUT)))
{
logf(LOG_FATAL, "Failed to create iochan");
- exit(1);
+ iochan_destroy(h);
+ return;
}
if (!(newas = create_association(new_chan, new_line)))
{
logf(LOG_FATAL, "Failed to create new assoc.");
- exit(1);
+ iochan_destroy(h);
+ return;
}
iochan_setdata(new_chan, newas);
- logf(LOG_LOG, "accepted connection");
+ 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
{
logf(LOG_FATAL, "Bad event on listener.");
- exit(1);
+ iochan_destroy(h);
+ return;
+ }
+}
+
+#endif /* WINDOWS */
+
+static void inetd_connection(int what)
+{
+ COMSTACK line;
+ IOCHAN chan;
+ association *assoc;
+ char *addr;
+
+ if ((line = cs_createbysocket(0, tcpip_type, 0, what)))
+ {
+ if ((chan = iochan_create(cs_fileno(line), ir_session, EVENT_INPUT)))
+ {
+ if ((assoc = create_association(chan, line)))
+ {
+ 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]");
+ }
+ else
+ {
+ logf(LOG_FATAL, "Failed to create association structure");
+ }
+ }
+ else
+ {
+ logf(LOG_FATAL, "Failed to create iochan");
+ }
+ }
+ else
+ {
+ logf(LOG_ERRNO|LOG_FATAL, "Failed to create comstack on socket 0");
}
}
CS_TYPE type;
char mode[100], addr[100];
void *ap;
- IOCHAN lst;
+ IOCHAN lst = NULL;
if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2)
{
fprintf(stderr, "%s: Address format: ('tcp'|'osi')':'<address>.\n",
me);
- exit(1);
}
if (!strcmp(mode, "tcp"))
{
if (!(ap = tcpip_strtoaddr(addr)))
{
fprintf(stderr, "Address resolution failed for TCP.\n");
- exit(1);
}
type = tcpip_type;
}
-#ifdef USE_XTIMOSI
else if (!strcmp(mode, "osi"))
{
+#ifdef USE_XTIMOSI
if (!(ap = mosi_strtoaddr(addr)))
{
fprintf(stderr, "Address resolution failed for TCP.\n");
- exit(1);
}
type = mosi_type;
- }
+#else
+ fprintf(stderr, "OSI Transport not allowed by configuration.\n");
#endif
+ }
else
{
fprintf(stderr, "You must specify either 'osi:' or 'tcp:'.\n");
- exit(1);
}
logf(LOG_LOG, "Adding %s %s listener on %s",
control_block.dynamic ? "dynamic" : "static",
if (!(l = cs_create(type, 0, what)))
{
logf(LOG_FATAL|LOG_ERRNO, "Failed to create listener");
- exit(1);
}
if (cs_bind(l, ap, CS_SERVER) < 0)
{
logf(LOG_FATAL|LOG_ERRNO, "Failed to bind to %s", where);
- exit(1);
}
if (!(lst = iochan_create(cs_fileno(l), listener, EVENT_INPUT |
EVENT_EXCEPT)))
{
logf(LOG_FATAL|LOG_ERRNO, "Failed to create IOCHAN-type");
- exit(1);
}
iochan_setdata(lst, l);
+
+ /* Ensure our listener chain is setup properly */
+ lst->next = pListener;
+ pListener = lst;
}
+#ifndef WINDOWS
+/* For windows we don't need to catch the signals */
static void catchchld(int num)
{
while (waitpid(-1, 0, WNOHANG) > 0)
;
signal(SIGCHLD, catchchld);
}
+#endif /* WINDOWS */
statserv_options_block *statserv_getcontrol(void)
{
int statserv_main(int argc, char **argv)
{
- int ret, listeners = 0;
+ int ret, listeners = 0, inetd = 0, r;
char *arg;
int protocol = control_block.default_proto;
+#ifdef WINDOWS
+ /* We need to initialize the thread list */
+ ThreadList_Initialize();
+#endif /* WINDOWS */
+
me = argv[0];
- while ((ret = options("a:szSl:v:u:", argv, argc, &arg)) != -2)
+ while ((ret = options("a:iszSl:v:u:c:w:t:k:", argv, argc, &arg)) != -2)
{
switch (ret)
{
case 0:
- add_listener(arg, protocol);
- listeners++;
+ add_listener(arg, protocol);
+ listeners++;
break;
case 'z': protocol = PROTO_Z3950; break;
case 's': protocol = PROTO_SR; break;
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 [ -a <pdufile> -v <loglevel> -l <logfile> -u <user> -zsS <listener-addr> ... ]\n", me);
- exit(1);
- }
+ fprintf(stderr, "Usage: %s [ -i -a <pdufile> -v <loglevel>"
+ " -l <logfile> -u <user> -c <config> -t <minutes>"
+ " -k <kilobytes>"
+ " -zsS <listener-addr> -w <directory> ... ]\n", me);
+ return(1);
+ }
+ }
+
+#ifdef WINDOWS
+ 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);
+
+#ifndef WINDOWS
+ if (inetd)
+ inetd_connection(protocol);
+ else
+ {
+ if (control_block.dynamic)
+ signal(SIGCHLD, catchchld);
}
- if (control_block.dynamic)
- signal(SIGCHLD, catchchld);
- if (!listeners && *control_block.default_listen)
- add_listener(control_block.default_listen, protocol);
if (*control_block.setuid)
{
struct passwd *pw;
if (!(pw = getpwnam(control_block.setuid)))
{
- logf(LOG_FATAL|LOG_ERRNO, "%s", control_block.setuid);
- exit(1);
+ logf(LOG_FATAL, "%s: Unknown user", control_block.setuid);
+ return(1);
}
if (setuid(pw->pw_uid) < 0)
{
exit(1);
}
}
+#endif /* WINDOWS */
+
logf(LOG_LOG, "Entering event loop.");
-
- return event_loop();
+
+ if (pListener == NULL)
+ return(1);
+ else
+ return event_loop(pListener);
}