X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=cbc816be5b5667c2100e07f671929cffe7d2c8fc;hp=86953adccf60cc05c09e36e435612696cd1776c7;hb=d4410d0cce40929db9a0ce7042ef962f1867234d;hpb=19d16e40ccfb39461eda5336f4e754e10a640aba

diff --git a/src/process.c b/src/process.c
index 86953adc..cbc816be 100644
--- a/src/process.c
+++ b/src/process.c
@@ -34,6 +34,7 @@
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "version.h"
 
 /* If zero, don't detach from the terminal. */
 bool do_detach = true;
@@ -109,6 +110,8 @@ static bool install_service(void) {
 	return true;
 }
 
+io_t stop_io;
+
 DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 	switch(request) {
 		case SERVICE_CONTROL_INTERROGATE:
@@ -125,10 +128,11 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 			return ERROR_CALL_NOT_IMPLEMENTED;
 	}
 
-	event_exit();
-	status.dwWaitHint = 30000;
+	status.dwWaitHint = 1000;
 	status.dwCurrentState = SERVICE_STOP_PENDING;
 	SetServiceStatus(statushandle, &status);
+	if (WSASetEvent(stop_io.event) == FALSE)
+		abort();
 	return NO_ERROR;
 }
 
@@ -209,13 +213,17 @@ bool detach(void) {
 #endif
 	}
 
-	logmode = use_logfile?LOGMODE_FILE:LOGMODE_SYSLOG;
-	if(do_detach && !use_syslog)
+	if(use_logfile)
+		logmode = LOGMODE_FILE;
+	else if(use_syslog || do_detach)
+		logmode = LOGMODE_SYSLOG;
+	else
 		logmode = LOGMODE_STDERR;
+
 	openlogger(identname, logmode);
 
 	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
-			   VERSION, __DATE__, __TIME__, debug_level);
+			   BUILD_VERSION, BUILD_DATE, BUILD_TIME, debug_level);
 
 	return true;
 }