summaryrefslogtreecommitdiff
path: root/src/charon/charon.c
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2015-11-26 15:26:42 +0100
committerYves-Alexis Perez <corsac@debian.org>2015-11-26 15:26:42 +0100
commitf42f239a632306ed082f6fde878977248eea85cf (patch)
tree6b6f55133d62cd206d1ad487c28215386bfae75c /src/charon/charon.c
parent6f35bf8f3833c3530d0ccec0f68bee97d0f00ebe (diff)
downloadvyos-strongswan-f42f239a632306ed082f6fde878977248eea85cf.tar.gz
vyos-strongswan-f42f239a632306ed082f6fde878977248eea85cf.zip
Imported Upstream version 5.3.5
Diffstat (limited to 'src/charon/charon.c')
-rw-r--r--src/charon/charon.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/charon/charon.c b/src/charon/charon.c
index f03b6e1ba..4c2a9a477 100644
--- a/src/charon/charon.c
+++ b/src/charon/charon.c
@@ -98,7 +98,7 @@ static void run()
{
sigset_t set;
- /* handle SIGINT, SIGHUP ans SIGTERM in this handler */
+ /* handle SIGINT, SIGHUP and SIGTERM in this handler */
sigemptyset(&set);
sigaddset(&set, SIGINT);
sigaddset(&set, SIGHUP);
@@ -112,6 +112,10 @@ static void run()
sig = sigwaitinfo(&set, NULL);
if (sig == -1)
{
+ if (errno == EINTR)
+ { /* ignore signals we didn't wait for */
+ continue;
+ }
DBG1(DBG_DMN, "waiting for signal failed: %s", strerror(errno));
return;
}
@@ -144,11 +148,6 @@ static void run()
charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, sig);
return;
}
- default:
- {
- DBG1(DBG_DMN, "unknown signal %d received. Ignored", sig);
- break;
- }
}
}
}