X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=5d78c2954b4604fc447668470e7b72a175d4f451;hp=cbb190a5a9abea30241af0dce8769b602a02d37a;hb=af9ee7ff003fb448b783ccf39347907adc239cb2;hpb=3847b78ba5900fe4311e9ef62474e32e1a6750e5

diff --git a/src/process.c b/src/process.c
index cbb190a5..5d78c295 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;
@@ -41,6 +42,7 @@ bool sigalrm = false;
 
 extern char **g_argv;
 extern bool use_logfile;
+extern bool use_syslog;
 
 /* Some functions the less gifted operating systems might lack... */
 
@@ -108,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:
@@ -124,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;
 }
 
@@ -185,6 +190,8 @@ bool init_service(void) {
   Detach from current terminal
 */
 bool detach(void) {
+	logmode_t logmode;
+
 #ifndef HAVE_MINGW
 	signal(SIGPIPE, SIG_IGN);
 	signal(SIGUSR1, SIG_IGN);
@@ -196,7 +203,7 @@ bool detach(void) {
 
 	if(do_detach) {
 #ifndef HAVE_MINGW
-		if(daemon(0, 0)) {
+		if(daemon(1, 0)) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Couldn't detach from terminal: %s", strerror(errno));
 			return false;
 		}
@@ -206,80 +213,17 @@ bool detach(void) {
 #endif
 	}
 
-	openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
-
-	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
-			   VERSION, __DATE__, __TIME__, debug_level);
-
-	return true;
-}
-
-bool execute_script(const char *name, char **envp) {
-#ifdef HAVE_SYSTEM
-	char *scriptname;
-	char *command;
-
-	xasprintf(&scriptname, "%s" SLASH "%s%s", confbase, name, scriptextension);
-
-	/* First check if there is a script */
-
-	if(access(scriptname, F_OK)) {
-		free(scriptname);
-		return true;
-	}
-
-	logger(DEBUG_STATUS, LOG_INFO, "Executing script %s", name);
-
-#ifdef HAVE_PUTENV
-	/* Set environment */
-
-	for(int i = 0; envp[i]; i++)
-		putenv(envp[i]);
-#endif
-
-	if(scriptinterpreter)
-		xasprintf(&command, "%s \"%s\"", scriptinterpreter, scriptname);
+	if(use_logfile)
+		logmode = LOGMODE_FILE;
+	else if(use_syslog || do_detach)
+		logmode = LOGMODE_SYSLOG;
 	else
-		xasprintf(&command, "\"%s\"", scriptname);
-
-	int status = system(command);
-
-	free(command);
-	free(scriptname);
+		logmode = LOGMODE_STDERR;
 
-	/* Unset environment */
+	openlogger(identname, logmode);
 
-	for(int i = 0; envp[i]; i++) {
-		char *e = strchr(envp[i], '=');
-		if(e) {
-			char p[e - envp[i] + 1];
-			strncpy(p, envp[i], e - envp[i]);
-			p[e - envp[i]] = '\0';
-			putenv(p);
-		}
-	}
+	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
+			   BUILD_VERSION, BUILD_DATE, BUILD_TIME, debug_level);
 
-	if(status != -1) {
-#ifdef WEXITSTATUS
-		if(WIFEXITED(status)) {          /* Child exited by itself */
-			if(WEXITSTATUS(status)) {
-				logger(DEBUG_ALWAYS, LOG_ERR, "Script %s exited with non-zero status %d",
-					   name, WEXITSTATUS(status));
-				return false;
-			}
-		} else if(WIFSIGNALED(status)) { /* Child was killed by a signal */
-			logger(DEBUG_ALWAYS, LOG_ERR, "Script %s was killed by signal %d (%s)",
-				   name, WTERMSIG(status), strsignal(WTERMSIG(status)));
-			return false;
-		} else {                         /* Something strange happened */
-			logger(DEBUG_ALWAYS, LOG_ERR, "Script %s terminated abnormally", name);
-			return false;
-		}
-#endif
-	} else {
-		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
-		return false;
-	}
-#endif
 	return true;
 }