X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=secnet.c;h=20f9999ed43834eb21d599ddb958a78162287d54;hp=ab562f1e8e6f0891c16ea84d68910d2a96917d6e;hb=794f2398b8fe84bf398bb10d6eeca6fe6737f65f;hpb=9d3a4132788b198345116624761c12ed7bc936b6

diff --git a/secnet.c b/secnet.c
index ab562f1..20f9999 100644
--- a/secnet.c
+++ b/secnet.c
@@ -18,17 +18,29 @@ extern char version[];
 
 #include "util.h"
 #include "conffile.h"
+#include "process.h"
 
-/* Command-line options (possibly config-file options too) */
+/* XXX should be from autoconf */
 static char *configfile="/etc/secnet/secnet.conf";
+static char *sites_key="sites";
 bool_t just_check_config=False;
 static char *userid=NULL;
 static uid_t uid=0;
-static bool_t background=True;
+bool_t background=True;
 static char *pidfile=NULL;
 bool_t require_root_privileges=False;
 string_t require_root_privileges_explanation=NULL;
 
+static pid_t secnet_pid;
+
+/* from log.c */
+extern uint32_t message_level;
+extern bool_t secnet_is_daemon;
+extern struct log_if *system_log;
+
+/* from process.c */
+extern void start_signal_handling(void);
+
 /* Structures dealing with poll() call */
 struct poll_interest {
     beforepoll_fn *before;
@@ -62,10 +74,11 @@ static void parse_options(int argc, char **argv)
 	    {"debug", 1, 0, 'd'},
 	    {"config", 1, 0, 'c'},
 	    {"just-check-config", 0, 0, 'j'},
+	    {"sites-key", 1, 0, 's'},
 	    {0,0,0,0}
 	};
 
-	c=getopt_long(argc, argv, "vwdnjc:ft:",
+	c=getopt_long(argc, argv, "vwdnjc:ft:s:",
 		      long_options, &option_index);
 	if (c==-1)
 	    break;
@@ -79,11 +92,15 @@ static void parse_options(int argc, char **argv)
 		    "  -w, --nowarnings        suppress warnings\n"
 		    "  -v, --verbose           output extra diagnostics\n"
 		    "  -c, --config=filename   specify a configuration file\n"
-		    "  -j, --just-check-config stop after reading configfile\n"
+		    "  -j, --just-check-config stop after reading "
+		    "configuration file\n"
+		    "  -s, --sites-key=name    configuration key that "
+		    "specifies active sites\n"
 		    "  -n, --nodetach          do not run in background\n"
 		    "  -d, --debug=item,...    set debug options\n"
 		    "      --help              display this help and exit\n"
-		    "      --version           output version information and exit\n"
+		    "      --version           output version information "
+		    "and exit\n"
 		);
 	    exit(0);
 	    break;
@@ -95,21 +112,26 @@ static void parse_options(int argc, char **argv)
 	    break;
 
 	case 'v':
-	    message_level|=M_INFO|M_WARNING|M_ERROR|M_FATAL;
+	    message_level|=M_INFO|M_NOTICE|M_WARNING|M_ERR|M_SECURITY|
+		M_FATAL;
 	    break;
 
-	case 'n':
-	    background=False;
+	case 'w':
+	    message_level&=(~M_WARNING);
 	    break;
 
 	case 'd':
-	    message_level|=M_DEBUG_CONFIG|M_DEBUG_PHASE;
+	    message_level|=M_DEBUG_CONFIG|M_DEBUG_PHASE|M_DEBUG;
 	    break;
 
 	case 'f':
 	    message_level=M_FATAL;
 	    break;
 
+	case 'n':
+	    background=False;
+	    break;
+
 	case 'c':
 	    if (optarg)
 		configfile=safe_strdup(optarg,"config_filename");
@@ -121,16 +143,23 @@ static void parse_options(int argc, char **argv)
 	    just_check_config=True;
 	    break;
 
+	case 's':
+	    if (optarg)
+		sites_key=safe_strdup(optarg,"sites-key");
+	    else
+		fatal("secnet: no sites key specified");
+	    break;
+
 	case '?':
 	    break;
 
 	default:
-	    Message(M_WARNING,"secnet: Unknown getopt code %c\n",c);
+	    Message(M_ERR,"secnet: Unknown getopt code %c\n",c);
 	}
     }
 
     if (argc-optind != 0) {
-	Message(M_WARNING,"secnet: You gave extra command line parameters, "
+	Message(M_ERR,"secnet: You gave extra command line parameters, "
 		"which were ignored.\n");
     }
 }
@@ -140,7 +169,6 @@ static void setup(dict_t *config)
     list_t *l;
     item_t *site;
     dict_t *system;
-    struct log_if *log;
     struct passwd *pw;
     struct cloc loc;
     int i;
@@ -158,8 +186,7 @@ static void setup(dict_t *config)
     if (!l) {
 	fatal("configuration does not include a system/log facility\n");
     }
-    log=init_log(l);
-    log->log(log->st,LOG_DEBUG,"%s: logging started",version);
+    system_log=init_log(l);
 
     /* Who are we supposed to run as? */
     userid=dict_read_string(system,"userid",False,"system",loc);
@@ -188,10 +215,10 @@ static void setup(dict_t *config)
     }
 
     /* Go along site list, starting sites */
-    l=dict_lookup(config,"sites");
+    l=dict_lookup(config,sites_key);
     if (!l) {
-	Message(M_WARNING,"secnet: configuration did not define any "
-		"remote sites\n");
+	Message(M_WARNING,"secnet: configuration key \"%s\" is missing; no "
+		"remote sites are defined\n",sites_key);
     } else {
 	i=0;
 	while ((site=list_elem(l, i++))) {
@@ -248,7 +275,9 @@ static void run(void)
 	fatal("run: couldn't alloca\n");
     }
 
-    while (!finished) {
+    Message(M_NOTICE,"%s [%d]: starting\n",version,secnet_pid);
+
+    do {
 	if (gettimeofday(&tv_now, NULL)!=0) {
 	    fatal_perror("main loop: gettimeofday");
 	}
@@ -277,6 +306,7 @@ static void run(void)
 	    i->nfds=nfds;
 	}
 	do {
+	    if (finished) break;
 	    rv=poll(fds, idx, timeout);
 	    if (rv<0) {
 		if (errno!=EINTR) {
@@ -284,7 +314,7 @@ static void run(void)
 		}
 	    }
 	} while (rv<0);
-    }
+    } while (!finished);
 }
 
 static void droppriv(void)
@@ -294,20 +324,26 @@ static void droppriv(void)
 
     add_hook(PHASE_SHUTDOWN,system_phase_hook,NULL);
 
-    /* Background now, if we're supposed to: we may be unable to write the
-       pidfile if we don't. */
-    if (background) {
-	/* Open the pidfile before forking - that way the parent can tell
-	   whether it succeeds */
-	if (pidfile) {
-	    pf=fopen(pidfile,"w");
-	    if (!pf) {
-		fatal_perror("cannot open pidfile \"%s\"",pidfile);
-	    }
-	} else {
-	    Message(M_WARNING,"secnet: no pidfile configured, but "
-		    "backgrounding anyway\n");
+    /* Open the pidfile for writing now: we may be unable to do so
+       once we drop privileges. */
+    if (pidfile) {
+	pf=fopen(pidfile,"w");
+	if (!pf) {
+	    fatal_perror("cannot open pidfile \"%s\"",pidfile);
 	}
+    }
+    if (!background && pf) {
+	fprintf(pf,"%d\n",getpid());
+	fclose(pf);
+    }
+
+    /* Now drop privileges */
+    if (uid!=0) {
+	if (setuid(uid)!=0) {
+	    fatal_perror("can't set uid to \"%s\"",userid);
+	}
+    }
+    if (background) {
 	p=fork();
 	if (p>0) {
 	    if (pf) {
@@ -319,28 +355,30 @@ static void droppriv(void)
 	} else if (p==0) {
 	    /* Child process - all done, just carry on */
 	    if (pf) fclose(pf);
+	    /* Close stdin, stdout and stderr; we don't need them any more */
+	    close(0);
+	    close(1);
+	    close(2);
+	    secnet_is_daemon=True;
 	} else {
 	    /* Error */
 	    fatal_perror("cannot fork");
 	    exit(1);
 	}
-    } else {
-	if (pidfile) {
-	    pf=fopen(pidfile,"w");
-	    if (!pf) {
-		fatal_perror("cannot open pidfile \"%s\"",pidfile);
-	    }
-	    fprintf(pf,"%d\n",getpid());
-	    fclose(pf);
-	}
     }
+    secnet_pid=getpid();
+}
 
-    /* Drop privilege now, if configured to do so */
-    if (uid!=0) {
-	if (setuid(uid)!=0) {
-	    fatal_perror("can't set uid to \"%s\"",userid);
-	}
-    }
+static signal_notify_fn finish,ignore_hup;
+static void finish(void *st, int signum)
+{
+    finished=True;
+    Message(M_NOTICE,"%s [%d]: received %s\n",version,secnet_pid,(string_t)st);
+}
+static void ignore_hup(void *st, int signum)
+{
+    Message(M_INFO,"%s [%d]: received SIGHUP\n",version,secnet_pid);
+    return;
 }
 
 int main(int argc, char **argv)
@@ -367,11 +405,15 @@ int main(int argc, char **argv)
     enter_phase(PHASE_DROPPRIV);
     droppriv();
 
+    start_signal_handling();
+    request_signal_notification(SIGTERM,finish,"SIGTERM");
+    if (!background) request_signal_notification(SIGINT,finish,"SIGINT");
+    request_signal_notification(SIGHUP,ignore_hup,NULL);
     enter_phase(PHASE_RUN);
     run();
 
     enter_phase(PHASE_SHUTDOWN);
+    Message(M_NOTICE,"%s [%d]: finished\n",version,secnet_pid);
 
     return 0;
 }
-