X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=226f4f5e9911ac23e3deb0694bb7d8ae94cd72e2;hb=c46bdbde18629f0a0613c776c13a79fea0ec6093;hp=9f83a3ca572b888b20fde0add470ceb913b94c6c;hpb=e024b7a2c50e23311834e6d180e5acc72783b339;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index 9f83a3ca..226f4f5e 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -49,6 +49,7 @@
 #include "control.h"
 #include "crypto.h"
 #include "device.h"
+#include "event.h"
 #include "logger.h"
 #include "names.h"
 #include "net.h"
@@ -84,6 +85,9 @@ static const char *switchuser = NULL;
 /* If nonzero, write log entries to a separate file. */
 bool use_logfile = false;
 
+/* If nonzero, use syslog instead of stderr in no-detach mode. */
+bool use_syslog = false;
+
 char **g_argv;                  /* a copy of the cmdline arguments */
 
 static int status = 1;
@@ -100,6 +104,7 @@ static struct option const long_options[] = {
 	{"chroot", no_argument, NULL, 'R'},
 	{"user", required_argument, NULL, 'U'},
 	{"logfile", optional_argument, NULL, 4},
+	{"syslog", no_argument, NULL, 's'},
 	{"pidfile", required_argument, NULL, 5},
 	{"option", required_argument, NULL, 'o'},
 	{NULL, 0, NULL, 0}
@@ -124,6 +129,7 @@ static void usage(bool status) {
 				"  -L, --mlock                   Lock tinc into main memory.\n"
 #endif
 				"      --logfile[=FILENAME]      Write log entries to a logfile.\n"
+				"  -s  --syslog                  Use syslog instead of stderr with --no-detach.\n"
 				"      --pidfile=FILENAME        Write PID and control socket cookie to FILENAME.\n"
 				"      --bypass-security         Disables meta protocol security, for debugging.\n"
 				"  -o, --option[HOST.]KEY=VALUE  Set global/host configuration value.\n"
@@ -145,7 +151,7 @@ static bool parse_options(int argc, char **argv) {
 
 	cmdline_conf = list_alloc((list_action_t)free_config);
 
-	while((r = getopt_long(argc, argv, "c:DLd::n:o:RU:", long_options, &option_index)) != EOF) {
+	while((r = getopt_long(argc, argv, "c:DLd::n:so:RU:", long_options, &option_index)) != EOF) {
 		switch (r) {
 			case 0:   /* long option */
 				break;
@@ -180,6 +186,11 @@ static bool parse_options(int argc, char **argv) {
 				netname = xstrdup(optarg);
 				break;
 
+			case 's': /* syslog */
+				use_logfile = false;
+				use_syslog = true;
+				break;
+
 			case 'o': /* option */
 				cfg = parse_config_line(optarg, NULL, ++lineno);
 				if (!cfg)
@@ -215,6 +226,7 @@ static bool parse_options(int argc, char **argv) {
 				break;
 
 			case 4:   /* write log entries to a file */
+				use_syslog = false;
 				use_logfile = true;
 				if(!optarg && optind < argc && *argv[optind] != '-')
 					optarg = argv[optind++];
@@ -303,6 +315,17 @@ static bool drop_privs(void) {
 
 #ifdef HAVE_MINGW
 # define setpriority(level) !SetPriorityClass(GetCurrentProcess(), (level))
+
+static void stop_handler(void *data, int flags) {
+	event_exit();
+}
+
+static BOOL WINAPI console_ctrl_handler(DWORD type) {
+	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got console shutdown request");
+	if (WSASetEvent(stop_io.event) == FALSE)
+		abort();
+	return TRUE;
+}
 #else
 # define NORMAL_PRIORITY_CLASS 0
 # define BELOW_NORMAL_PRIORITY_CLASS 10
@@ -371,10 +394,21 @@ int main(int argc, char **argv) {
 #endif
 
 #ifdef HAVE_MINGW
-	if(!do_detach || !init_service())
-		return main2(argc, argv);
-	else
-		return 1;
+	io_add_event(&stop_io, stop_handler, NULL, WSACreateEvent());
+	if (stop_io.event == FALSE)
+		abort();
+
+	int result;
+	if(!do_detach || !init_service()) {
+		SetConsoleCtrlHandler(console_ctrl_handler, TRUE);
+		result = main2(argc, argv);
+	} else
+		result = 1;
+
+	if (WSACloseEvent(stop_io.event) == FALSE)
+		abort();
+	io_del(&stop_io);
+	return result;
 }
 
 int main2(int argc, char **argv) {