j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Remove last references to the global variable "running".

Browse source
This commit is contained in:
Guus Sliepen 2007-05-18 09:51:54 +00:00
parent 3909b8e51b
commit 760dd966ef
2 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/net.c
View file

@ -39,8 +39,6 @@
#include "subnet.h"
#include "xalloc.h"
volatile bool running = false;
/* Purge edges and subnets of unreachable nodes. Use carefully. */
static void purge(void)
@ -278,13 +276,8 @@ void handle_meta_connection_data(int fd, short events, void *data)
}
}
static void dummy(int a, short b, void *c)
{
}
static void sigterm_handler(int signal, short events, void *data) {
logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
running = false;
event_loopexit(NULL);
}

19
src/process.c
View file

@ -42,7 +42,6 @@ extern char *identname;
extern char *pidfilename;
extern char **g_argv;
extern bool use_logfile;
extern volatile bool running;
sigset_t emptysigset;
@ -164,19 +163,11 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
return ERROR_CALL_NOT_IMPLEMENTED;
}
if(running) {
running = false;
status.dwWaitHint = 30000;
status.dwCurrentState = SERVICE_STOP_PENDING;
SetServiceStatus(statushandle, &status);
return NO_ERROR;
} else {
status.dwWaitHint = 0;
status.dwCurrentState = SERVICE_STOPPED;
SetServiceStatus(statushandle, &status);
exit(1);
}
event_loopexit(NULL);
status.dwWaitHint = 30000;
status.dwCurrentState = SERVICE_STOP_PENDING;
SetServiceStatus(statushandle, &status);
return NO_ERROR;
}
VOID WINAPI run_service(DWORD argc, LPTSTR* argv)