nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge patch from Matt Edman for bug 162 (service never stops)

Browse Source 
svn:r4578
This commit is contained in:
Nick Mathewson 2005-07-15 19:09:36 +00:00
parent 545c2c6c87
commit 441e02d4ac
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/or/main.c
View File

@ -1472,6 +1472,8 @@ nt_service_is_stopped(void)
service_status.dwCurrentState = SERVICE_STOPPED; service_status.dwCurrentState = SERVICE_STOPPED;
SetServiceStatus(hStatus, &service_status); SetServiceStatus(hStatus, &service_status);
return 1; return 1;
} else if (service_status.dwCurrentState == SERVICE_STOPPED) {
return 1;
} }
return 0; return 0;
} }
@ -1480,11 +1482,16 @@ nt_service_is_stopped(void)
void void
nt_service_control(DWORD request) nt_service_control(DWORD request)
{ {
static struct timeval exit_now;
exit_now.tv_sec = 0;
exit_now.tv_usec = 0;
switch (request) { switch (request) {
case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_STOP:
case SERVICE_CONTROL_SHUTDOWN: case SERVICE_CONTROL_SHUTDOWN:
log(LOG_ERR, "Got stop/shutdown request; shutting down cleanly."); log(LOG_ERR, "Got stop/shutdown request; shutting down cleanly.");
service_status.dwCurrentState = SERVICE_STOP_PENDING; service_status.dwCurrentState = SERVICE_STOP_PENDING;
event_loopexit(&exit_now);
return; return;
} }
SetServiceStatus(hStatus, &service_status); SetServiceStatus(hStatus, &service_status);