silcd.c
- Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+ Author: Pekka Riikonen <priikone@silcnet.org>
Copyright (C) 1997 - 2001 Pekka Riikonen
static struct option long_opts[] =
{
{ "config-file", 1, NULL, 'f' },
- { "debug", 0, NULL, 'd' },
+ { "debug", 1, NULL, 'd' },
{ "help", 0, NULL, 'h' },
+ { "foreground", 0, NULL, 'F' },
{ "version", 0, NULL,'V' },
/* Key management options */
{ "create-key-pair", 1, NULL, 'C' },
{ "pkcs", 1, NULL, 10 },
{ "bits", 1, NULL, 11 },
+ { "identifier", 1, NULL, 12 },
{ NULL, 0, NULL, 0 }
};
static bool opt_create_keypair = FALSE;
static char *opt_keypath = NULL;
static char *opt_pkcs = "rsa";
+static char *opt_identifier = NULL;
static int opt_bits = 1024;
/* Prints out the usage of silc client */
\n\
Generic Options:\n\
-f --config-file=FILE Alternate configuration file\n\
- -d --debug 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\
-C, --create-key-pair=PATH Create new public key pair\n\
--pkcs=PKCS Set the PKCS of the public key pair\n\
--bits=VALUE Set length of the public key pair\n\
+ --identifier=IDENTIFIER Public key identifier\n\
+\n\
+ The public key identifier may be of the following format:\n\
+\n\
+ UN=<username>, HN=<hostname or IP>, RN=<real name>, E=<email>,\n\
+ O=<organization>, C=<country>\n\
+\n\
+ The UN and HN must be provided, the others are optional. If the\n\
+ --identifier option is not used an identifier will be created for\n\
+ the public key automatically.\n\
+\n\
+ Example identifier: \"UN=foobar, HN=foo.bar.com, RN=Foo T. Bar, \n\
+ E=foo@bar.com, C=FI\"\n\
\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 foreground = FALSE;
char *config_file = NULL;
SilcServer silcd;
+ struct sigaction sa;
silc_debug = FALSE;
/* Parse command line arguments */
if (argc > 1) {
- while ((opt = getopt_long(argc, argv, "cf:dhVC:",
+ while ((opt = getopt_long(argc, argv, "cf:d:hFVC:",
long_opts, &option_index)) != EOF) {
switch(opt)
{
break;
case 'V':
printf("SILCd Secure Internet Live Conferencing daemon, "
- "version %s\n", silc_version);
+ "version %s (base: SILC Toolkit %s)\n",
+ silc_dist_version, silc_version);
printf("(c) 1997 - 2001 Pekka Riikonen "
- "<priikone@poseidon.pspt.fi>\n");
+ "<priikone@silcnet.org>\n");
exit(0);
break;
case 'd':
silc_debug = TRUE;
+ silc_debug_hexdump = TRUE;
+ silc_log_set_debug_string(optarg);
+ foreground = TRUE;
+#ifndef SILC_DEBUG
+ fprintf(stdout,
+ "Run-time debugging is not enabled. To enable it recompile\n"
+ "the server with --enable-debug configuration option.\n");
+#endif
break;
case 'f':
config_file = strdup(optarg);
break;
+ case 'F':
+ foreground = TRUE;
+ break;
/*
* Key management options
if (optarg)
opt_bits = atoi(optarg);
break;
+ case 12:
+ if (optarg)
+ opt_identifier = strdup(optarg);
+ break;
default:
silc_usage();
silc_hash_register_default();
silc_hmac_register_default();
silc_server_create_key_pair(opt_pkcs, opt_bits, opt_keypath,
- NULL, NULL, NULL);
+ opt_identifier, NULL, NULL);
exit(0);
}
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)
goto fail;
- if (silc_debug == FALSE)
- /* Before running the server, fork to background and set
- both user and group no non-root */
+ /* Ignore SIGPIPE */
+ sa.sa_handler = SIG_IGN;
+ sa.sa_flags = 0;
+ sigemptyset(&sa.sa_mask);
+ sigaction(SIGPIPE, &sa, NULL);
+
+ /* Before running the server, fork to background. */
+ if (!foreground)
silc_server_daemonise(silcd);
-
+
+ /* 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);
projects / silc.git / blobdiff