X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprocess.c;h=98f4d33a811d0e9c3d6edd8d1a2a3d3413a7d29b;hb=762db91ef7d3b2eab00c23250ca61c7f814899c7;hp=1093ea8f63049d431b3a9e6a564a1b48179681ad;hpb=d53384c2de6d2824b9adcec111301d86e6b25f8e;p=tinc

diff --git a/src/process.c b/src/process.c
index 1093ea8f..98f4d33a 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,7 +25,9 @@
 #include "control.h"
 #include "device.h"
 #include "edge.h"
+#include "event.h"
 #include "logger.h"
+#include "names.h"
 #include "net.h"
 #include "node.h"
 #include "process.h"
@@ -37,17 +39,12 @@
 bool do_detach = true;
 bool sigalrm = false;
 
-extern char *identname;
 extern char **g_argv;
 extern bool use_logfile;
 
 /* Some functions the less gifted operating systems might lack... */
 
 #ifdef HAVE_MINGW
-extern char *identname;
-extern char *program_name;
-extern char **g_argv;
-
 static SC_HANDLE manager = NULL;
 static SC_HANDLE service = NULL;
 static SERVICE_STATUS status = {0};
@@ -111,6 +108,8 @@ static bool install_service(void) {
 	return true;
 }
 
+static io_t stop_io;
+
 DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 	switch(request) {
 		case SERVICE_CONTROL_INTERROGATE:
@@ -127,16 +126,25 @@ 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;
 }
 
+static void stop_handler(void *data, int flags) {
+	event_exit();
+}
+
 VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
 	extern int main2(int argc, char **argv);
 
+	io_add_event(&stop_io, stop_handler, NULL, WSACreateEvent());
+	if (stop_io.event == FALSE)
+		abort();
+
 	status.dwServiceType = SERVICE_WIN32;
 	status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
 	status.dwWin32ExitCode = 0;
@@ -163,6 +171,9 @@ VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
 		SetServiceStatus(statushandle, &status);
 	}
 
+	if (WSACloseEvent(stop_io.event) == FALSE)
+		abort();
+	io_del(&stop_io);
 	return;
 }
 
@@ -217,72 +228,4 @@ bool detach(void) {
 	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);
-	else
-		xasprintf(&command, "\"%s\"", scriptname);
-
-	int status = system(command);
-
-	free(command);
-	free(scriptname);
 
-	/* Unset environment */
-
-	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);
-		}
-	}
-
-#ifdef WEXITSTATUS
-	if(status != -1) {
-		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;
-		}
-	} else {
-		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
-		return false;
-	}
-#endif
-#endif
-	return true;
-}