/*
- * Copyright (c) 1995-1998, Index Data
+ * Copyright (c) 1995-2001, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* NT server based on threads by
- * Chas Woodfield, Fretwell Downing Datasystems.
+ * Chas Woodfield, Fretwell Downing Informatics.
*
* $Log: statserv.c,v $
- * Revision 1.49 1998-02-27 14:04:55 adam
+ * Revision 1.75 2001-10-04 00:37:58 adam
+ * Fixes for GNU threads (not working yet).
+ *
+ * Revision 1.74 2001/10/03 23:55:18 adam
+ * GNU threads support.
+ *
+ * Revision 1.73 2001/06/28 09:27:06 adam
+ * Number of started sessions logged.
+ *
+ * Revision 1.72 2001/03/25 21:55:13 adam
+ * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate.
+ *
+ * Revision 1.71 2001/03/21 12:43:36 adam
+ * Implemented cs_create_host. Better error reporting for SSL comstack.
+ *
+ * Revision 1.70 2001/02/01 08:52:26 adam
+ * Fixed bug regarding inetd mode.
+ *
+ * Revision 1.69 2000/12/01 17:56:41 adam
+ * on WIN32 function statserv_closedown closes socket(s) to provoke close.
+ *
+ * Revision 1.68 2000/11/29 14:22:47 adam
+ * Implemented XML/SGML attributes for data1 so that d1_read reads them
+ * and d1_write generates proper attributes for XML/SGML records. Added
+ * register locking for threaded version.
+ *
+ * Revision 1.67 2000/11/23 10:58:32 adam
+ * SSL comstack support. Separate POSIX thread support library.
+ *
+ * Revision 1.66 2000/10/06 12:00:28 adam
+ * Fixed Handle leak for WIN32.
+ *
+ * Revision 1.65 2000/09/04 08:58:15 adam
+ * Added prefix yaz_ for most logging utility functions.
+ *
+ * Revision 1.64 2000/04/05 07:39:55 adam
+ * Added shared library support (libtool).
+ *
+ * Revision 1.63 2000/03/20 19:06:25 adam
+ * Added Segment request for fronend server. Work on admin for client.
+ *
+ * Revision 1.62 2000/03/17 12:47:02 adam
+ * Minor changes to admin client.
+ *
+ * Revision 1.61 2000/03/15 12:59:49 adam
+ * Added handle member to statserv_control.
+ *
+ * Revision 1.60 2000/03/14 09:06:11 adam
+ * Added POSIX threads support for frontend server.
+ *
+ * Revision 1.59 1999/11/30 13:47:12 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * 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
*
*/
-#include <yconfig.h>
#include <stdio.h>
#include <string.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <process.h>
#include <winsock.h>
#include <direct.h>
#include "service.h"
#else
+
+#ifdef _REENTRANT
+#if HAVE_PTHREAD_H
+#include <pthread.h>
+#elif HAVE_PTH_H
+#include <pth.h>
+#endif
+#endif
+
#include <unistd.h>
#include <pwd.h>
#endif
#include <signal.h>
#include <errno.h>
-#include <options.h>
-#include <comstack.h>
-#include <tcpip.h>
+#include <yaz/comstack.h>
+#include <yaz/tcpip.h>
+#include <yaz/options.h>
#ifdef USE_XTIMOSI
-#include <xmosi.h>
+#include <yaz/xmosi.h>
#endif
-#include <log.h>
+#include <yaz/log.h>
#include "eventl.h"
#include "session.h"
-#include <statserv.h>
+#include <yaz/statserv.h>
static IOCHAN pListener = NULL;
int check_options(int argc, char **argv);
statserv_options_block control_block = {
1, /* dynamic mode */
+ 0, /* threaded mode */
+ 0, /* one shot (single session) */
LOG_DEFAULT_LEVEL, /* log level */
"", /* no PDUs */
"", /* diagnostic output to stderr */
1024*1024, /* maximum PDU size (approx.) to allow */
"default-config", /* configuration name to pass to backend */
"", /* set user id */
- NULL, /* pre init handler */
+ 0, /* bend_start handler */
+ 0, /* bend_stop handler */
check_options, /* Default routine, for checking the run-time arguments */
- 0 /* default value for inet deamon */
-
-#ifdef WINDOWS
+ check_ip_tcpd,
+ "",
+ 0, /* default value for inet deamon */
+ 0, /* handle (for service, etc) */
+ 0, /* bend_init handle */
+ 0 /* bend_close handle */
+#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;
}
}
+/* WIN32 statserv_closedown */
void statserv_closedown()
{
/* Shouldn't do anything if we are not initialized */
{
/* Just destroy the IOCHAN, that should do the trick */
iochan_destroy(pCurrentThread->pIOChannel);
+ closesocket(pCurrentThread->pIOChannel->fd);
/* Keep a running count of our handles */
iHandles++;
/* Now we can really do something */
if (iHandles > 0)
{
+ logf (LOG_LOG, "waiting for %d to die", iHandles);
/* This will now wait, until all the threads close */
WaitForMultipleObjects(iHandles, pThreadHandles, TRUE, INFINITE);
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);
}
}
-int __stdcall event_loop_thread (IOCHAN iochan)
+void event_loop_thread (IOCHAN iochan)
{
- return event_loop (&iochan);
+ event_loop (&iochan);
}
-static void listener(IOCHAN h, int event)
+/* WIN32 listener */
+static void listener(IOCHAN h, int event)
{
COMSTACK line = (COMSTACK) iochan_getdata(h);
association *newas;
int res;
- HANDLE NewHandle;
+ HANDLE newHandle;
if (event == EVENT_INPUT)
{
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 */
}
else if (event == EVENT_OUTPUT)
{
- COMSTACK new_line;
+ COMSTACK new_line = cs_accept(line);
IOCHAN new_chan;
char *a = NULL;
- DWORD ThreadId;
- if (!(new_line = cs_accept(line)))
+ if (!new_line)
{
- logf(LOG_FATAL, "Accept failed.");
- iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset listener */
+ yaz_log(LOG_FATAL, "Accept failed.");
+ iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT);
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)))
{
- 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);
+ newas->cs_get_mask = EVENT_INPUT;
+ newas->cs_put_mask = 0;
+ newas->cs_accept_mask = 0;
+
+ 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");
- a = cs_addrstr(new_line);
- logf(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 */
- NewHandle = (HANDLE)_beginthreadex(NULL, 0, event_loop_thread,
- new_chan, 0, &ThreadId);
- if (NewHandle == (HANDLE)-1)
+ newHandle = (HANDLE) _beginthread(event_loop_thread, 0, new_chan);
+ 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);
+ statserv_add(newHandle, new_chan);
- logf(LOG_DEBUG, "Created new thread, iochan %p", new_chan);
+ yaz_log(LOG_DEBUG, "Created new thread, id = %ld iochan %p",(long) newHandle, 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)
void statserv_closedown()
{
IOCHAN p;
+
+ if (control_block.bend_stop)
+ (*control_block.bend_stop)(&control_block);
+
for (p = pListener; p; p = p->next)
iochan_destroy(p);
}
+void sigterm(int sig)
+{
+ statserv_closedown();
+ exit (0);
+}
+
+static void *new_session (void *vp);
+static int no_sessions = 0;
+
+/* UNIX listener */
static void listener(IOCHAN h, int event)
{
COMSTACK line = (COMSTACK) iochan_getdata(h);
- association *newas;
static int hand[2];
static int child = 0;
int res;
{
int res;
+ ++no_sessions;
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;
}
}
}
sprintf(nbuf, "%s(%d)", me, getpid());
- log_init(control_block.loglevel, nbuf, 0);
+ yaz_log_init(control_block.loglevel, nbuf, 0);
}
else /* parent */
{
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 */
}
/* in dynamic mode, only the child ever comes down here */
else if (event == EVENT_OUTPUT)
{
- COMSTACK new_line;
- IOCHAN new_chan;
- char *a;
+ COMSTACK new_line = cs_accept(line);
- if (!(new_line = cs_accept(line)))
+ if (!new_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;
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)))
+ ++no_sessions;
+ }
+#ifdef _REENTRANT
+#if HAVE_PTHREAD_H
+ if (control_block.threads)
{
- logf(LOG_FATAL, "Failed to create iochan");
- iochan_destroy(h);
- return;
+ pthread_t child_thread;
+ pthread_create (&child_thread, 0, new_session, new_line);
+ pthread_detach (child_thread);
}
- new_chan->next = pListener;
- pListener = new_chan;
- if (!(newas = create_association(new_chan, new_line)))
+ else
+ new_session(new_line);
+#elif HAVE_PTH_H
+ if (control_block.threads)
{
- logf(LOG_FATAL, "Failed to create new assoc.");
- iochan_destroy(h);
- return;
+ pth_attr_t attr;
+ pth_t child_thread;
+
+ attr = pth_attr_new ();
+ pth_attr_set (attr, PTH_ATTR_JOINABLE, FALSE);
+ pth_attr_set (attr, PTH_ATTR_STACK_SIZE, 32*1024);
+ pth_attr_set (attr, PTH_ATTR_NAME, "session");
+ yaz_log (LOG_LOG, "pth_spawn");
+ child_thread = pth_spawn (attr, new_session, new_line);
+#if 0
+ pth_attr_destroy (attr);
+#endif
}
- 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]");
+ else
+ new_session(new_line);
+#endif
+
+#else
+ new_session(new_line);
+#endif
}
else
{
- logf(LOG_FATAL, "Bad event on listener.");
+ yaz_log(LOG_FATAL, "Bad event on listener.");
iochan_destroy(h);
return;
}
}
-#endif /* WINDOWS */
+static void *new_session (void *vp)
+{
+ char *a;
+ association *newas;
+ IOCHAN new_chan;
+ COMSTACK new_line = (COMSTACK) vp;
+
+ unsigned cs_get_mask, cs_accept_mask, mask =
+ ((new_line->io_pending & CS_WANT_WRITE) ? EVENT_OUTPUT : 0) |
+ ((new_line->io_pending & CS_WANT_READ) ? EVENT_INPUT : 0);
+
+ if (mask)
+ {
+ cs_accept_mask = mask; /* accept didn't complete */
+ cs_get_mask = 0;
+ }
+ else
+ {
+ cs_accept_mask = 0; /* accept completed. */
+ cs_get_mask = mask = EVENT_INPUT;
+ }
+
+ if (!(new_chan = iochan_create(cs_fileno(new_line), ir_session, mask)))
+ {
+ yaz_log(LOG_FATAL, "Failed to create iochan");
+ return 0;
+ }
+ if (!(newas = create_association(new_chan, new_line)))
+ {
+ yaz_log(LOG_FATAL, "Failed to create new assoc.");
+ return 0;
+ }
+ newas->cs_accept_mask = cs_accept_mask;
+ newas->cs_get_mask = cs_get_mask;
+
+ iochan_setdata(new_chan, newas);
+ iochan_settimeout(new_chan, control_block.idle_timeout * 60);
+ a = cs_addrstr(new_line);
+ yaz_log(LOG_LOG, "Starting session %d from %s", no_sessions, a ? a : "[Unknown]");
+
+ if (control_block.threads)
+ {
+ event_loop(&new_chan);
+ }
+ else
+ {
+ new_chan->next = pListener;
+ pListener = new_chan;
+ }
+ return 0;
+}
+
+#endif /* WIN32 */
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]");
+ assoc->cs_get_mask = EVENT_INPUT;
}
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");
}
}
static void add_listener(char *where, int what)
{
COMSTACK l;
- CS_TYPE type;
- char mode[100], addr[100];
void *ap;
IOCHAN lst = NULL;
+ const char *mode;
- if (!where || sscanf(where, "%[^:]:%s", mode, addr) != 2)
- {
- logf (LOG_WARN, "%s: Address format: ('tcp'|'osi')':'<address>", me);
- return;
- }
- if (!strcmp(mode, "tcp"))
- type = tcpip_type;
- else if (!strcmp(mode, "osi"))
- {
-#ifdef USE_XTIMOSI
- type = mosi_type;
-#else
- logf (LOG_WARN, "OSI Transport not allowed by configuration.");
- return;
-#endif
- }
+ if (control_block.dynamic)
+ mode = "dynamic";
+ else if (control_block.threads)
+ mode = "threaded";
else
+ mode = "static";
+
+ yaz_log(LOG_LOG, "Adding %s %s listener on %s", mode,
+ what == PROTO_SR ? "SR" : "Z3950", where);
+
+ l = cs_create_host(where, 0, &ap);
+ if (!l)
{
- logf (LOG_WARN, "You must specify either 'osi:' or 'tcp:'");
+ yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to listen on %s", where);
return;
}
- logf(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");
- }
- ap = cs_straddr (l, addr);
- if (!ap)
+ if (cs_bind(l, ap, CS_SERVER) < 0)
{
- fprintf(stderr, "Address resolution failed.\n");
+ yaz_log(LOG_FATAL|LOG_ERRNO, "Failed to bind to %s", where);
cs_close (l);
return;
}
- if (cs_bind(l, ap, CS_SERVER) < 0)
- {
- logf(LOG_FATAL|LOG_ERRNO, "Failed to bind to %s", where);
- }
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);
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 */
-
-#ifdef WINDOWS
+#endif /* WIN32 */
+
+#ifdef WIN32
if ((me = strrchr (argv[0], '\\')))
me++;
else
#endif
if (control_block.options_func(argc, argv))
return(1);
-
-#ifndef WINDOWS
+
+ if (control_block.bend_start)
+ (*control_block.bend_start)(&control_block);
+#ifdef WIN32
+ logf (LOG_LOG, "Starting server %s", me);
+#else
if (control_block.inetd)
inetd_connection(control_block.default_proto);
else
{
- if (control_block.pre_init)
- (*control_block.pre_init)(&control_block);
+ logf (LOG_LOG, "Starting server %s pid=%d", me, getpid());
+#if 0
+ sigset_t sigs_to_block;
+
+ sigemptyset(&sigs_to_block);
+ sigaddset (&sigs_to_block, SIGTERM);
+ pthread_sigmask (SIG_BLOCK, &sigs_to_block, 0);
+ /* missing... */
+#endif
if (control_block.dynamic)
signal(SIGCHLD, catchchld);
}
+ signal (SIGPIPE, SIG_IGN);
+ signal (SIGTERM, sigterm);
if (*control_block.setuid)
{
struct passwd *pw;
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 */
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
+ {
+ yaz_log(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("1a:iszSTl: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.dynamic = 0;
break;
+ case 'T':
+#if _REENTRANT
+ control_block.dynamic = 0;
+ control_block.threads = 1;
+#else
+ fprintf(stderr, "%s: Threaded mode not available.\n", me);
+ return 1;
+#endif
+ break;
case 'l':
strcpy(control_block.logfile, arg ? arg : "");
- log_init(control_block.loglevel, me, control_block.logfile);
+ yaz_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);
+ control_block.loglevel = yaz_log_mask_str(arg);
+ yaz_log_init(control_block.loglevel, me, control_block.logfile);
break;
case 'a':
strcpy(control_block.apdufile, arg ? arg : "");
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;
if (chdir(arg))
{
perror(arg);
- return(1);
+ return 1;
}
break;
default:
- fprintf(stderr, "Usage: %s [ -i -a <pdufile> -v <loglevel>"
+ fprintf(stderr, "Usage: %s [ -a <pdufile> -v <loglevel>"
" -l <logfile> -u <user> -c <config> -t <minutes>"
- " -k <kilobytes>"
- " -zsS <listener-addr> -w <directory> ... ]\n", me);
- return(1);
+ " -k <kilobytes> -d <daemon>"
+ " -zsiST -w <directory> <listender-addr>... ]\n", me);
+ return 1;
}
}
return 0;
}
-#ifdef WINDOWS
+#ifdef WIN32
typedef struct _Args
{
char **argv;
/* list of service dependencies - "dep1\0dep2\0\0" */
#define SZDEPENDENCIES ""
-int statserv_main(int argc, char **argv)
+int statserv_main(int argc, char **argv,
+ bend_initresult *(*bend_init)(bend_initrequest *r),
+ void (*bend_close)(void *handle))
{
statserv_options_block *cb = statserv_getcontrol();
+ cb->bend_init = bend_init;
+ cb->bend_close = bend_close;
+
+ statserv_setcontrol(cb);
+
/* Lets setup the Arg structure */
ArgDetails.argc = argc;
ArgDetails.argv = argv;
statserv_closedown();
}
#else
-int statserv_main(int argc, char **argv)
+int statserv_main(int argc, char **argv,
+ bend_initresult *(*bend_init)(bend_initrequest *r),
+ void (*bend_close)(void *handle))
{
- int ret = statserv_start (argc, argv);
+ int ret;
+ statserv_options_block *cb = statserv_getcontrol();
+
+ cb->bend_init = bend_init;
+ cb->bend_close = bend_close;
+
+ statserv_setcontrol(cb);
+ ret = statserv_start (argc, argv);
statserv_closedown ();
return ret;
}
projects / yaz-moved-to-github.git / blobdiff