X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprocess.c;h=680d3179297e3bfbdf5032a87d54992391f57d3d;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hp=0584da675816b9c38fededdb081e07cdf826c49f;hpb=3b237afbda86bc95703ed25386cc9a26695d4602;p=tinc

diff --git a/src/process.c b/src/process.c
index 0584da67..680d3179 100644
--- a/src/process.c
+++ b/src/process.c
@@ -53,15 +53,13 @@ static SC_HANDLE service = NULL;
 static SERVICE_STATUS status = {0};
 static SERVICE_STATUS_HANDLE statushandle = 0;
 
-bool install_service(void) {
+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(LOG_ERR, "Could not open service manager: %s", winerror(GetLastError()));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open service manager: %s", winerror(GetLastError()));
 		return false;
 	}
 
@@ -74,13 +72,13 @@ bool install_service(void) {
 
 	strncat(command, "\"", sizeof command - strlen(command));
 
-	for(argp = g_argv + 1; *argp; argp++) {
-		space = strchr(*argp, ' ');
+	for(char **argp = g_argv + 1; *argp; argp++) {
+		char &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)
@@ -90,54 +88,25 @@ bool install_service(void) {
 	service = CreateService(manager, identname, identname,
 			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(LOG_ERR, "Could not create %s service: %s", identname, winerror(lasterror));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not create %s service: %s", identname, winerror(lasterror));
 		if(lasterror != ERROR_SERVICE_EXISTS)
 			return false;
 	}
 
 	if(service) {
 		ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
-		logger(LOG_INFO, "%s service installed", identname);
+		logger(DEBUG_ALWAYS, LOG_INFO, "%s service installed", identname);
 	} else {
 		service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
 	}
 
 	if(!StartService(service, 0, NULL))
-		logger(LOG_WARNING, "Could not start %s service: %s", identname, winerror(GetLastError()));
-	else
-		logger(LOG_INFO, "%s service started", identname);
-
-	return true;
-}
-
-bool remove_service(void) {
-	manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
-	if(!manager) {
-		logger(LOG_ERR, "Could not open service manager: %s", winerror(GetLastError()));
-		return false;
-	}
-
-	service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
-
-	if(!service) {
-		logger(LOG_ERR, "Could not open %s service: %s", identname, winerror(GetLastError()));
-		return false;
-	}
-
-	if(!ControlService(service, SERVICE_CONTROL_STOP, &status))
-		logger(LOG_ERR, "Could not stop %s service: %s", identname, winerror(GetLastError()));
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Could not start %s service: %s", identname, winerror(GetLastError()));
 	else
-		logger(LOG_INFO, "%s service stopped", identname);
-
-	if(!DeleteService(service)) {
-		logger(LOG_ERR, "Could not remove %s service: %s", identname, winerror(GetLastError()));
-		return false;
-	}
-
-	logger(LOG_INFO, "%s service removed", identname);
+		logger(DEBUG_ALWAYS, LOG_INFO, "%s service started", identname);
 
 	return true;
 }
@@ -148,19 +117,19 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 			SetServiceStatus(statushandle, &status);
 			return NO_ERROR;
 		case SERVICE_CONTROL_STOP:
-			logger(LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_STOP");
+			logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_STOP");
 			break;
 		case SERVICE_CONTROL_SHUTDOWN:
-			logger(LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
+			logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
 			break;
 		default:
-			logger(LOG_WARNING, "Got unexpected request %d", request);
+			logger(DEBUG_ALWAYS, LOG_WARNING, "Got unexpected request %d", request);
 			return ERROR_CALL_NOT_IMPLEMENTED;
 	}
 
 	event_loopexit(NULL);
-	status.dwWaitHint = 30000; 
-	status.dwCurrentState = SERVICE_STOP_PENDING; 
+	status.dwWaitHint = 30000;
+	status.dwCurrentState = SERVICE_STOP_PENDING;
 	SetServiceStatus(statushandle, &status);
 	return NO_ERROR;
 }
@@ -170,31 +139,31 @@ 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) {
-		logger(LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
+		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);
 
 		status.dwWaitHint = 0;
-		status.dwCurrentState = SERVICE_STOPPED; 
-		//status.dwWin32ExitCode = err; 
+		status.dwCurrentState = SERVICE_STOPPED;
+		//status.dwWin32ExitCode = err;
 		SetServiceStatus(statushandle, &status);
 	}
 
@@ -212,7 +181,7 @@ bool init_service(void) {
 			return false;
 		}
 		else
-			logger(LOG_ERR, "System call `%s' failed: %s", "StartServiceCtrlDispatcher", winerror(GetLastError()));
+			logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "StartServiceCtrlDispatcher", winerror(GetLastError()));
 	}
 
 	return true;
@@ -241,13 +210,13 @@ bool detach(void) {
 		}
 #else
 		if(!statushandle)
-			exit(install_service());
+			exit(!install_service());
 #endif
 	}
 
 	openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
 
-	logger(LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
+	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
 			   VERSION, __DATE__, __TIME__, debug_level);
 
 	return true;
@@ -255,46 +224,40 @@ bool detach(void) {
 
 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/%s\"", confbase, name);
-#else
-	len = xasprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
-#endif
-	if(len < 0)
-		return false;
+	char *command;
 
-	scriptname[len - 1] = '\0';
+	xasprintf(&scriptname, "%s" SLASH "%s%s", confbase, name, scriptextension);
 
-#ifndef HAVE_TUNEMU
 	/* First check if there is a script */
 
-	if(access(scriptname + 1, F_OK)) {
+	if(access(scriptname, F_OK)) {
 		free(scriptname);
 		return true;
 	}
-#endif
 
-	ifdebug(STATUS) logger(LOG_INFO, "Executing script %s", name);
+	logger(DEBUG_STATUS, LOG_INFO, "Executing script %s", name);
 
 #ifdef HAVE_PUTENV
 	/* Set environment */
-	
-	for(i = 0; envp[i]; i++)
+
+	for(int i = 0; envp[i]; i++)
 		putenv(envp[i]);
 #endif
 
-	scriptname[len - 1] = '\"';
-	status = system(scriptname);
+	if(scriptinterpreter)
+		xasprintf(&command, "%s \"%s\"", scriptinterpreter, scriptname);
+	else
+		xasprintf(&command, "\"%s\"", scriptname);
+
+	int status = system(command);
 
+	free(command);
 	free(scriptname);
 
 	/* Unset environment */
 
-	for(i = 0; envp[i]; i++) {
+	for(int i = 0; envp[i]; i++) {
 		char *e = strchr(envp[i], '=');
 		if(e) {
 			char p[e - envp[i] + 1];
@@ -306,22 +269,22 @@ bool execute_script(const char *name, char **envp) {
 
 #ifdef WEXITSTATUS
 	if(status != -1) {
-		if(WIFEXITED(status)) {	/* Child exited by itself */
+		if(WIFEXITED(status)) {          /* Child exited by itself */
 			if(WEXITSTATUS(status)) {
-				logger(LOG_ERR, "Script %s exited with non-zero status %d",
+				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(LOG_ERR, "Script %s was killed by signal %d (%s)",
+		} 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(LOG_ERR, "Script %s terminated abnormally", name);
+		} else {                         /* Something strange happened */
+			logger(DEBUG_ALWAYS, LOG_ERR, "Script %s terminated abnormally", name);
 			return false;
 		}
 	} else {
-		logger(LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
 		return false;
 	}
 #endif