/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2010 Index Data
* See the file LICENSE for details.
*/
#include <yaz/comstack.h>
#include <yaz/tcpip.h>
#include <yaz/options.h>
+#include <yaz/errno.h>
#ifdef USE_XTIMOSI
#include <yaz/xmosi.h>
#endif
#include "eventl.h"
#include "session.h"
#include <yaz/statserv.h>
+#include <yaz/daemon.h>
static IOCHAN pListener = NULL;
"", /* diagnostic output to stderr */
"tcp:@:9999", /* default listener port */
PROTO_Z3950, /* default application protocol */
- 15, /* idle timeout (minutes) */
+ 900, /* idle timeout (seconds) */
1024*1024, /* maximum PDU size (approx.) to allow */
"default-config", /* configuration name to pass to backend */
"", /* set user id */
}
#endif
+#if YAZ_HAVE_XML2
static struct gfs_server * gfs_server_new(void)
{
struct gfs_server *n = (struct gfs_server *)
n->directory = 0;
n->docpath = 0;
n->stylesheet = 0;
-#if YAZ_HAVE_XML2
n->retrieval = yaz_retrieval_create();
-#endif
return n;
}
+#endif
+#if YAZ_HAVE_XML2
static struct gfs_listen * gfs_listen_new(const char *id,
const char *address)
{
n->address = nmem_strdup(gfs_nmem, address);
return n;
}
+#endif
static void gfs_server_chdir(struct gfs_server *gfs)
{
return 1;
}
+#if YAZ_HAVE_XML2
static void xml_config_read(void)
{
struct gfs_server **gfsp = &gfs_server_list;
struct gfs_listen **gfslp = &gfs_listen_list;
-#if YAZ_HAVE_XML2
xmlNodePtr ptr = xml_config_get_root();
if (!ptr)
gfsp = &(*gfsp)->next;
}
}
-#endif
*gfsp = 0;
}
+#endif
static void xml_config_open(void)
{
}
}
-int statserv_must_terminate(void)
-{
- return 0;
-}
-
#else /* ! WIN32 */
-static int term_flag = 0;
/* To save having an #ifdef in event_loop we need to
define this empty function
*/
-int statserv_must_terminate(void)
-{
- return term_flag;
-}
-
void statserv_remove(IOCHAN pIOChannel)
{
}
xml_config_close();
}
-void sigterm(int sig)
-{
- term_flag = 1;
-}
-
static void *new_session(void *vp);
static int no_sessions = 0;
static void *new_session(void *vp)
{
- char *a;
+ const char *a;
association *newas;
IOCHAN new_chan;
COMSTACK new_line = (COMSTACK) vp;
COMSTACK line;
IOCHAN chan;
association *assoc;
- char *addr;
+ const char *addr;
if ((line = cs_createbysocket(0, tcpip_type, 0, what)))
{
void statserv_setcontrol(statserv_options_block *block)
{
- chdir(gfs_root_dir);
+ if (gfs_root_dir[0])
+ {
+ if (chdir(gfs_root_dir))
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "chdir %s", gfs_root_dir);
+ }
#ifdef WIN32
if (init_control_tls)
TlsSetValue(current_control_tls, block);
{
}
+static void daemon_handler(void *data)
+{
+ IOCHAN *pListener = data;
+ iochan_event_loop(pListener);
+}
+
static int statserv_sc_main(yaz_sc_t s, int argc, char **argv)
{
char sep;
xml_config_bend_start();
+ if (control_block.inetd)
+ {
#ifdef WIN32
- xml_config_add_listeners();
-
- yaz_log(log_server, "Starting server %s", me);
- if (!pListener && *control_block.default_listen)
- add_listener(control_block.default_listen, 0);
+ ; /* no inetd on Windows */
#else
-/* UNIX */
- if (control_block.inetd)
inetd_connection(control_block.default_proto);
+#endif
+ }
else
{
- static int hand[2];
- if (control_block.background)
- {
- /* create pipe so that parent waits until child has created
- PID (or failed) */
- if (pipe(hand) < 0)
- {
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "pipe");
- return 1;
- }
- switch (fork())
- {
- case 0:
- break;
- case -1:
- return 1;
- default:
- close(hand[1]);
- while(1)
- {
- char dummy[1];
- int res = read(hand[0], dummy, 1);
- if (res < 0 && yaz_errno() != EINTR)
- {
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "read fork handshake");
- break;
- }
- else if (res >= 0)
- break;
- }
- close(hand[0]);
- _exit(0);
- }
- /* child */
- close(hand[0]);
- if (setsid() < 0)
- return 1;
-
- close(0);
- close(1);
- close(2);
- open("/dev/null", O_RDWR);
- dup(0); dup(0);
- }
xml_config_add_listeners();
if (!pListener && *control_block.default_listen)
add_listener(control_block.default_listen, 0);
-
- if (!pListener)
- return 1;
-
- if (*control_block.pid_fname)
- {
- FILE *f = fopen(control_block.pid_fname, "w");
- if (!f)
- {
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "Couldn't create %s",
- control_block.pid_fname);
- exit(0);
- }
- fprintf(f, "%ld", (long) getpid());
- fclose(f);
- }
-
- if (control_block.background)
- close(hand[1]);
-
- yaz_log(log_server, "Starting server %s pid=%ld", programname,
- (long) 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
+#ifndef WIN32
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)))
- {
- yaz_log(YLOG_FATAL, "%s: Unknown user", control_block.setuid);
- return(1);
- }
- if (setuid(pw->pw_uid) < 0)
- {
- yaz_log(YLOG_FATAL|YLOG_ERRNO, "setuid");
- exit(1);
- }
- }
-/* UNIX */
#endif
+ }
if (pListener == NULL)
return 1;
if (s)
yaz_sc_running(s);
yaz_log(YLOG_DEBUG, "Entering event loop.");
- return iochan_event_loop(&pListener);
+
+ yaz_daemon(programname,
+ (control_block.background ? YAZ_DAEMON_FORK : 0),
+ daemon_handler, &pListener,
+ *control_block.pid_fname ? control_block.pid_fname : 0,
+ *control_block.setuid ? control_block.setuid : 0);
+ return 0;
}
static void option_copy(char *dst, const char *src)
fprintf(stderr, "%s: Specify positive timeout for -t.\n", me);
return(1);
}
- control_block.idle_timeout = r;
+ control_block.idle_timeout = strchr(arg, 's') ? r : 60 * r;
break;
case 'k':
if (!arg || !(r = atoi(arg)))
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab