sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-07 00:01:49 -04:00
Code Issues Projects Releases Wiki Activity

charon-svc: Check if daemon has been initialized before invoking shutdown alert

Browse Source
This commit is contained in:
Martin Willi 2014-05-28 15:55:34 +02:00
parent f59e2b7bb3
commit ef7bfadabb
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/charon-svc/charon-svc.c
View File

@ -170,7 +170,11 @@ static BOOL console_handler(DWORD dwCtrlType)
case CTRL_BREAK_EVENT: case CTRL_BREAK_EVENT:
case CTRL_CLOSE_EVENT: case CTRL_CLOSE_EVENT:
DBG1(DBG_DMN, "application is stopping, cleaning up"); DBG1(DBG_DMN, "application is stopping, cleaning up");
charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, dwCtrlType); if (status.dwCurrentState == SERVICE_RUNNING)
{
charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL,
dwCtrlType);
}
/* signal main thread to clean up */ /* signal main thread to clean up */
SetEvent(event); SetEvent(event);
return TRUE; return TRUE;
@ -204,7 +208,11 @@ static DWORD service_handler(DWORD dwControl, DWORD dwEventType,
case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_STOP:
case SERVICE_CONTROL_SHUTDOWN: case SERVICE_CONTROL_SHUTDOWN:
DBG1(DBG_DMN, "service is stopping, cleaning up"); DBG1(DBG_DMN, "service is stopping, cleaning up");
charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, dwControl); if (status.dwCurrentState == SERVICE_RUNNING)
{
charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL,
dwControl);
}
/* signal main thread to clean up */ /* signal main thread to clean up */
SetEvent(event); SetEvent(event);
return NO_ERROR; return NO_ERROR;