{ "config-file", 1, NULL, 'f' },
{ "debug", 1, NULL, 'd' },
{ "help", 0, NULL, 'h' },
+ { "foreground", 0, NULL, 'F' },
{ "version", 0, NULL,'V' },
/* Key management options */
\n\
Generic Options:\n\
-f --config-file=FILE Alternate configuration file\n\
- -d --debug=string Enable debugging (no daemon)\n\
+ -d --debug=string Enable debugging (Implies --foreground)\n\
-h --help Display this message\n\
+ -F --foreground Dont fork\n\
-V --version Display version\n\
\n\
Key Management Options:\n\
exit(0);
}
+/* Dies if a *valid* pid file exists already */
+
+static void silc_checkpid(SilcServer silcd)
+{
+ if (silcd->config->pidfile && silcd->config->pidfile->pid_file) {
+ int oldpid;
+ char *buf;
+ uint32 buf_len;
+
+ SILC_LOG_DEBUG(("Checking for another silcd running"));
+ buf = silc_file_readfile(silcd->config->pidfile->pid_file, &buf_len);
+ if (!buf)
+ return;
+ oldpid = atoi(buf);
+ silc_free(buf);
+ if (oldpid <= 0)
+ return;
+ kill(oldpid, SIGCHLD); /* this signal does nothing, check if alive */
+ if (errno != ESRCH) {
+ fprintf(stderr, "\nI detected another daemon running with the same pid file.\n");
+ fprintf(stderr, "Please change the config file, or erase the %s\n",
+ silcd->config->pidfile->pid_file);
+ exit(1);
+ }
+ }
+}
+
int main(int argc, char **argv)
{
- int ret;
- int opt, option_index;
+ int ret, opt, option_index;
char *config_file = NULL;
+ bool foreground = FALSE;
SilcServer silcd;
struct sigaction sa;
- char pid[10];
-
- silc_debug = FALSE;
/* Parse command line arguments */
if (argc > 1) {
- while ((opt = getopt_long(argc, argv, "cf:d:hVC:",
+ while ((opt = getopt_long(argc, argv, "cf:d:hFVC:",
long_opts, &option_index)) != EOF) {
switch(opt)
{
exit(0);
break;
case 'd':
+#ifdef SILC_DEBUG
silc_debug = TRUE;
silc_debug_hexdump = TRUE;
silc_log_set_debug_string(optarg);
-#ifndef SILC_DEBUG
+ foreground = TRUE;
+ silc_log_quick = TRUE;
+#else
fprintf(stdout,
"Run-time debugging is not enabled. To enable it recompile\n"
"the server with --enable-debug configuration option.\n");
case 'f':
config_file = strdup(optarg);
break;
+ case 'F':
+ foreground = TRUE;
+ break;
/*
* Key management options
if (silcd->config == NULL)
goto fail;
+ /* Check for another silcd running */
+ silc_checkpid(silcd);
+
/* Initialize the server */
ret = silc_server_init(silcd);
if (ret == FALSE)
sigemptyset(&sa.sa_mask);
sigaction(SIGPIPE, &sa, NULL);
- if (silc_debug == FALSE)
- /* Before running the server, fork to background and set
- both user and group no non-root */
+ /* Before running the server, fork to background. */
+ if (!foreground)
silc_server_daemonise(silcd);
- /* Set /var/run/silcd.pid */
- unlink(SILC_SERVER_PID_FILE);
- memset(pid, 0, sizeof(pid));
- snprintf(pid, sizeof(pid) - 1, "%d\n", getpid());
- silc_file_writefile(SILC_SERVER_PID_FILE, pid, strlen(pid));
-
+ /* If set, write pid to file */
+ if (silcd->config->pidfile && silcd->config->pidfile->pid_file) {
+ char buf[10];
+ unlink(silcd->config->pidfile->pid_file);
+ snprintf(buf, sizeof(buf) - 1, "%d\n", getpid());
+ silc_file_writefile(silcd->config->pidfile->pid_file, buf, strlen(buf));
+ }
+
+ /* Drop root. */
+ silc_server_drop(silcd);
+
/* Run the server. When this returns the server has been stopped
and we will exit. */
silc_server_run(silcd);