X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprocess.c;h=546570aa59f4dc3066ff1b26cfbd99ea646fe661;hb=1cbddbd573d786f6b2bf9812dda89d1ea5b7e021;hp=1b5f00db096dde052b1e19b8f8dab6cbaa59b6b4;hpb=ce976717ea9756aa985699547fdbf132b694748d;p=meshlink

diff --git a/src/process.c b/src/process.c
index 1b5f00db..546570aa 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-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2007 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
@@ -24,11 +24,11 @@
 
 #include "conf.h"
 #include "connection.h"
+#include "control.h"
 #include "device.h"
 #include "edge.h"
 #include "logger.h"
 #include "node.h"
-#include "pidfile.h"
 #include "process.h"
 #include "subnet.h"
 #include "utils.h"
@@ -39,7 +39,6 @@ bool do_detach = true;
 bool sigalrm = false;
 
 extern char *identname;
-extern char *pidfilename;
 extern char **g_argv;
 extern bool use_logfile;
 
@@ -149,6 +148,9 @@ bool remove_service(void) {
 
 DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 	switch(request) {
+		case SERVICE_CONTROL_INTERROGATE:
+			SetServiceStatus(statushandle, &status);
+			return NO_ERROR;
 		case SERVICE_CONTROL_STOP:
 			logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_STOP");
 			break;
@@ -221,92 +223,15 @@ bool init_service(void) {
 }
 #endif
 
-#ifndef HAVE_MINGW
-/*
-  check for an existing tinc for this net, and write pid to pidfile
-*/
-static bool write_pidfile(void) {
-	pid_t pid;
-
-	cp();
-
-	pid = check_pid(pidfilename);
-
-	if(pid) {
-		if(netname)
-			fprintf(stderr, _("A tincd is already running for net `%s' with pid %ld.\n"),
-					netname, (long)pid);
-		else
-			fprintf(stderr, _("A tincd is already running with pid %ld.\n"), (long)pid);
-		return false;
-	}
-
-	/* if it's locked, write-protected, or whatever */
-	if(!write_pid(pidfilename)) {
-		fprintf(stderr, _("Could write pid file %s: %s\n"), pidfilename, strerror(errno));
-		return false;
-	}
-
-	return true;
-}
-#endif
-
-/*
-  kill older tincd for this net
-*/
-bool kill_other(int signal) {
-#ifndef HAVE_MINGW
-	pid_t pid;
-
-	cp();
-
-	pid = read_pid(pidfilename);
-
-	if(!pid) {
-		if(netname)
-			fprintf(stderr, _("No other tincd is running for net `%s'.\n"),
-					netname);
-		else
-			fprintf(stderr, _("No other tincd is running.\n"));
-		return false;
-	}
-
-	errno = 0;					/* No error, sometimes errno is only changed on error */
-
-	/* ESRCH is returned when no process with that pid is found */
-	if(kill(pid, signal) && errno == ESRCH) {
-		if(netname)
-			fprintf(stderr, _("The tincd for net `%s' is no longer running. "),
-					netname);
-		else
-			fprintf(stderr, _("The tincd is no longer running. "));
-
-		fprintf(stderr, _("Removing stale lock file.\n"));
-		remove_pid(pidfilename);
-	}
-
-	return true;
-#else
-	return remove_service();
-#endif
-}
-
 /*
-  Detach from current terminal, write pidfile, kill parent
+  Detach from current terminal
 */
 bool detach(void) {
 	cp();
 
 	setup_signals();
 
-	/* First check if we can open a fresh new pidfile */
-
 #ifndef HAVE_MINGW
-	if(!write_pidfile())
-		return false;
-
-	/* If we succeeded in doing that, detach */
-
 	closelogger();
 #endif
 
@@ -317,13 +242,6 @@ bool detach(void) {
 					strerror(errno));
 			return false;
 		}
-
-		/* Now UPDATE the pid in the pidfile, because we changed it... */
-
-		if(!write_pid(pidfilename)) {
-			fprintf(stderr, _("Could not write pid file %s: %s\n"), pidfilename, strerror(errno));
-			return false;
-		}
 #else
 		if(!statushandle)
 			exit(install_service());
@@ -343,28 +261,29 @@ bool detach(void) {
 bool execute_script(const char *name, char **envp) {
 #ifdef HAVE_SYSTEM
 	int status, len;
-	struct stat s;
 	char *scriptname, *p;
 	int i;
 
 	cp();
 
 #ifndef HAVE_MINGW
-	len = asprintf(&scriptname, "\"%s/%s\"", confbase, name);
+	len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name);
 #else
-	len = asprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
+	len = xasprintf(&scriptname, "\"%s/%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(stat(scriptname + 1, &s)) {
+	if(access(scriptname + 1, F_OK)) {
 		free(scriptname);
 		return true;
 	}
+#endif
 
 	ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
 
@@ -445,7 +364,7 @@ static RETSIGTYPE fatal_signal_handler(int a) {
 
 		close_network_connections();
 		sleep(5);
-		remove_pid(pidfilename);
+		exit_control();
 		execvp(g_argv[0], g_argv);
 	} else {
 		logger(LOG_NOTICE, _("Not restarting."));
@@ -487,7 +406,7 @@ void setup_signals(void) {
 
 	/* Set a default signal handler for every signal, errors will be
 	   ignored. */
-	for(i = 0; i < NSIG; i++) {
+	for(i = 1; i < NSIG; i++) {
 		if(!do_detach)
 			act.sa_handler = SIG_DFL;
 		else