X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprocess.c;h=d88ff970f457ea66ae26d35a95713025e659937c;hb=refs%2Fheads%2F1.1-threads;hp=f0e5dd8b20792cae464b75d79645ed91202dc0e4;hpb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;p=tinc

diff --git a/src/process.c b/src/process.c
index f0e5dd8b..d88ff970 100644
--- a/src/process.c
+++ b/src/process.c
@@ -40,7 +40,9 @@ extern char *identname;
 extern char **g_argv;
 extern bool use_logfile;
 
+#ifndef HAVE_MINGW
 sigset_t emptysigset;
+#endif
 
 static void memory_full(int size) {
 	logger(LOG_ERR, "Memory exhausted (couldn't allocate %d bytes), exitting.", size);
@@ -98,13 +100,18 @@ bool install_service(void) {
 			command, NULL, NULL, NULL, NULL, NULL);
 	
 	if(!service) {
-		logger(LOG_ERR, "Could not create %s service: %s", identname, winerror(GetLastError()));
-		return false;
+		DWORD lasterror = GetLastError();
+		logger(LOG_ERR, "Could not create %s service: %s", identname, winerror(lasterror));
+		if(lasterror != ERROR_SERVICE_EXISTS)
+			return false;
 	}
 
-	ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
-
-	logger(LOG_INFO, "%s service installed", identname);
+	if(service) {
+		ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
+		logger(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()));
@@ -159,7 +166,7 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 			return ERROR_CALL_NOT_IMPLEMENTED;
 	}
 
-	event_loopexit(NULL);
+	running = false;
 	status.dwWaitHint = 30000; 
 	status.dwCurrentState = SERVICE_STOP_PENDING; 
 	SetServiceStatus(statushandle, &status);
@@ -256,7 +263,7 @@ bool detach(void) {
 bool execute_script(const char *name, char **envp) {
 #ifdef HAVE_SYSTEM
 	int status, len;
-	char *scriptname, *p;
+	char *scriptname;
 	int i;
 
 #ifndef HAVE_MINGW
@@ -297,7 +304,7 @@ bool execute_script(const char *name, char **envp) {
 	for(i = 0; envp[i]; i++) {
 		char *e = strchr(envp[i], '=');
 		if(e) {
-			p = alloca(e - envp[i] + 1);
+			char p[e - envp[i] + 1];
 			strncpy(p, envp[i], e - envp[i]);
 			p[e - envp[i]] = '\0';
 			putenv(p);
@@ -335,6 +342,14 @@ bool execute_script(const char *name, char **envp) {
 */
 
 #ifndef HAVE_MINGW
+static RETSIGTYPE sigterm_handler(int a) {
+	logger(LOG_NOTICE, "Got %s signal", "TERM");
+	if(running)
+		running = false;
+	else
+		exit(1);
+}
+
 static RETSIGTYPE fatal_signal_square(int a) {
 	logger(LOG_ERR, "Got another fatal signal %d (%s): not restarting.", a,
 		   strsignal(a));
@@ -375,11 +390,15 @@ static struct {
 	int signal;
 	void (*handler)(int);
 } sighandlers[] = {
+	{SIGTERM, sigterm_handler},
+	{SIGQUIT, sigterm_handler},
+	{SIGINT, sigterm_handler},
 	{SIGSEGV, fatal_signal_handler},
 	{SIGBUS, fatal_signal_handler},
 	{SIGILL, fatal_signal_handler},
 	{SIGPIPE, ignore_signal_handler},
 	{SIGCHLD, ignore_signal_handler},
+	{SIGALRM, ignore_signal_handler},
 	{0, NULL}
 };
 #endif