X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprocess.c;h=b6d4e124660aa66ee2452459c3411a49c641aee3;hb=d6b45d005530496e48325a6174ecdd889a17bfc1;hp=0e33f2643b68bee71b2159088995d04824408684;hpb=248d300f1be0d5f2aae39202041699ab2b46c56b;p=tinc

diff --git a/src/process.c b/src/process.c
index 0e33f264..b6d4e124 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-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2018 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,29 +25,28 @@
 #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"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "version.h"
 
 /* If zero, don't detach from the terminal. */
 bool do_detach = true;
 bool sigalrm = false;
 
-extern char *identname;
 extern char **g_argv;
 extern bool use_logfile;
+extern bool use_syslog;
 
 /* 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};
@@ -55,47 +54,47 @@ static SERVICE_STATUS_HANDLE statushandle = 0;
 
 static bool install_service(void) {
 	char command[4096] = "\"";
-	char **argp;
-	bool space;
 	SERVICE_DESCRIPTION description = {"Virtual Private Network daemon"};
 
 	manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+
 	if(!manager) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open service manager: %s", winerror(GetLastError()));
 		return false;
 	}
 
-	if(!strchr(program_name, '\\')) {
-		GetCurrentDirectory(sizeof command - 1, command + 1);
-		strncat(command, "\\", sizeof command - strlen(command));
-	}
+	HMODULE module = GetModuleHandle(NULL);
+	GetModuleFileName(module, command + 1, sizeof(command) - 1);
+	command[sizeof(command) - 1] = 0;
 
-	strncat(command, program_name, sizeof command - strlen(command));
+	strncat(command, "\"", sizeof(command) - strlen(command));
 
-	strncat(command, "\"", sizeof command - strlen(command));
+	for(char **argp = g_argv + 1; *argp; argp++) {
+		char *space = strchr(*argp, ' ');
+		strncat(command, " ", sizeof(command) - strlen(command));
 
-	for(argp = g_argv + 1; *argp; argp++) {
-		space = strchr(*argp, ' ');
-		strncat(command, " ", sizeof command - strlen(command));
-		
-		if(space)
-			strncat(command, "\"", sizeof command - strlen(command));
-		
-		strncat(command, *argp, sizeof command - strlen(command));
+		if(space) {
+			strncat(command, "\"", sizeof(command) - strlen(command));
+		}
+
+		strncat(command, *argp, sizeof(command) - strlen(command));
 
-		if(space)
-			strncat(command, "\"", sizeof command - strlen(command));
+		if(space) {
+			strncat(command, "\"", sizeof(command) - strlen(command));
+		}
 	}
 
 	service = CreateService(manager, identname, identname,
-			SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
-			command, NULL, NULL, NULL, NULL, NULL);
-	
+	                        SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
+	                        command, NULL, NULL, NULL, NULL, NULL);
+
 	if(!service) {
 		DWORD lasterror = GetLastError();
 		logger(DEBUG_ALWAYS, LOG_ERR, "Could not create %s service: %s", identname, winerror(lasterror));
-		if(lasterror != ERROR_SERVICE_EXISTS)
+
+		if(lasterror != ERROR_SERVICE_EXISTS) {
 			return false;
+		}
 	}
 
 	if(service) {
@@ -105,67 +104,77 @@ static bool install_service(void) {
 		service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
 	}
 
-	if(!StartService(service, 0, NULL))
+	if(!StartService(service, 0, NULL)) {
 		logger(DEBUG_ALWAYS, LOG_WARNING, "Could not start %s service: %s", identname, winerror(GetLastError()));
-	else
+	} else {
 		logger(DEBUG_ALWAYS, LOG_INFO, "%s service started", identname);
+	}
 
 	return true;
 }
 
-DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
+io_t stop_io;
+
+DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID data, LPVOID context) {
+	(void)type;
+	(void)data;
+	(void)context;
+
 	switch(request) {
-		case SERVICE_CONTROL_INTERROGATE:
-			SetServiceStatus(statushandle, &status);
-			return NO_ERROR;
-		case SERVICE_CONTROL_STOP:
-			logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_STOP");
-			break;
-		case SERVICE_CONTROL_SHUTDOWN:
-			logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
-			break;
-		default:
-			logger(DEBUG_ALWAYS, LOG_WARNING, "Got unexpected request %d", request);
-			return ERROR_CALL_NOT_IMPLEMENTED;
+	case SERVICE_CONTROL_INTERROGATE:
+		SetServiceStatus(statushandle, &status);
+		return NO_ERROR;
+
+	case SERVICE_CONTROL_STOP:
+		logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_STOP");
+		break;
+
+	case SERVICE_CONTROL_SHUTDOWN:
+		logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
+		break;
+
+	default:
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Got unexpected request %d", (int)request);
+		return ERROR_CALL_NOT_IMPLEMENTED;
 	}
 
-	event_loopexit(NULL);
-	status.dwWaitHint = 30000; 
-	status.dwCurrentState = SERVICE_STOP_PENDING; 
+	status.dwWaitHint = 1000;
+	status.dwCurrentState = SERVICE_STOP_PENDING;
 	SetServiceStatus(statushandle, &status);
+
+	if(WSASetEvent(stop_io.event) == FALSE) {
+		abort();
+	}
+
 	return NO_ERROR;
 }
 
-VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
-	int err = 1;
+VOID WINAPI run_service(DWORD argc, LPTSTR *argv) {
 	extern int main2(int argc, char **argv);
 
-
-	status.dwServiceType = SERVICE_WIN32; 
+	status.dwServiceType = SERVICE_WIN32;
 	status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
-	status.dwWin32ExitCode = 0; 
-	status.dwServiceSpecificExitCode = 0; 
-	status.dwCheckPoint = 0; 
+	status.dwWin32ExitCode = 0;
+	status.dwServiceSpecificExitCode = 0;
+	status.dwCheckPoint = 0;
 
-	statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL); 
+	statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL);
 
-	if (!statushandle) {
+	if(!statushandle) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
-		err = 1;
 	} else {
-		status.dwWaitHint = 30000; 
-		status.dwCurrentState = SERVICE_START_PENDING; 
+		status.dwWaitHint = 30000;
+		status.dwCurrentState = SERVICE_START_PENDING;
 		SetServiceStatus(statushandle, &status);
 
-		status.dwWaitHint = 0; 
+		status.dwWaitHint = 0;
 		status.dwCurrentState = SERVICE_RUNNING;
 		SetServiceStatus(statushandle, &status);
 
-		err = main2(argc, argv);
+		main2(argc, argv);
 
 		status.dwWaitHint = 0;
-		status.dwCurrentState = SERVICE_STOPPED; 
-		//status.dwWin32ExitCode = err; 
+		status.dwCurrentState = SERVICE_STOPPED;
 		SetServiceStatus(statushandle, &status);
 	}
 
@@ -181,9 +190,9 @@ bool init_service(void) {
 	if(!StartServiceCtrlDispatcher(services)) {
 		if(GetLastError() == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) {
 			return false;
-		}
-		else
+		} else {
 			logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "StartServiceCtrlDispatcher", winerror(GetLastError()));
+		}
 	}
 
 	return true;
@@ -194,6 +203,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);
@@ -205,97 +216,33 @@ bool detach(void) {
 
 	if(do_detach) {
 #ifndef HAVE_MINGW
-		if(daemon(0, 0)) {
-			fprintf(stderr, "Couldn't detach from terminal: %s",
-					strerror(errno));
+
+		if(daemon(1, 0)) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Couldn't detach from terminal: %s", strerror(errno));
 			return false;
 		}
-#else
-		if(!statushandle)
-			exit(!install_service());
-#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
-	int status, len;
-	char *scriptname;
-	int i;
-
-#ifndef HAVE_MINGW
-	len = xasprintf(&scriptname, "\"%s" SLASH "%s\"", confbase, name);
 #else
-	len = xasprintf(&scriptname, "\"%s" SLASH "%s.bat\"", confbase, name);
-#endif
-	if(len < 0)
-		return false;
-
-	scriptname[len - 1] = '\0';
-
-#ifndef HAVE_TUNEMU
-	/* First check if there is a script */
-
-	if(access(scriptname + 1, F_OK)) {
-		free(scriptname);
-		return true;
-	}
-#endif
 
-	logger(DEBUG_STATUS, LOG_INFO, "Executing script %s", name);
+		if(!statushandle) {
+			exit(!install_service());
+		}
 
-#ifdef HAVE_PUTENV
-	/* Set environment */
-	
-	for(i = 0; envp[i]; i++)
-		putenv(envp[i]);
 #endif
-
-	scriptname[len - 1] = '\"';
-	status = system(scriptname);
-
-	free(scriptname);
-
-	/* Unset environment */
-
-	for(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;
-		}
+	if(use_logfile) {
+		logmode = LOGMODE_FILE;
+	} else if(use_syslog || do_detach) {
+		logmode = LOGMODE_SYSLOG;
 	} else {
-		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
-		return false;
+		logmode = LOGMODE_STDERR;
 	}
-#endif
-#endif
+
+	openlogger(identname, logmode);
+
+	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
+	       BUILD_VERSION, BUILD_DATE, BUILD_TIME, debug_level);
+
 	return true;
 }