Simplify handling of terminating signals in all libcharon wrappers

Closes strongswan/strongswan#182.

diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
index 2bf0fb05e83a760c885162c5b693dbfa38f3bf08..84448373df3ab92c2ba5ff5ad760c9b062a954c4 100644 (file)
--- a/src/charon-cmd/charon-cmd.c
+++ b/src/charon-cmd/charon-cmd.c
@@ -134,14 +134,10 @@ static int run()
                                break;
                        }
                        case SIGINT:
-                       {
-                               DBG1(DBG_DMN, "signal of type SIGINT received. Shutting down");
-                               charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, sig);
-                               return 0;
-                       }
                        case SIGTERM:
                        {
-                               DBG1(DBG_DMN, "signal of type SIGTERM received. Shutting down");
+                               DBG1(DBG_DMN, "%s received, shutting down",
+                                        sig == SIGINT ? "SIGINT" : "SIGTERM");
                                charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, sig);
                                return 0;
                        }

diff --git a/src/charon-nm/charon-nm.c b/src/charon-nm/charon-nm.c
index 1aa975efb6eaf287d1994e8c7d7a8ae7da716f52..1d25186860be547c74779fb7a69ab2da45400263 100644 (file)
--- a/src/charon-nm/charon-nm.c
+++ b/src/charon-nm/charon-nm.c
@@ -94,14 +94,10 @@ static void run()
                switch (sig)
                {
                        case SIGINT:
-                       {
-                               DBG1(DBG_DMN, "signal of type SIGINT received. Shutting down");
-                               charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, sig);
-                               return;
-                       }
                        case SIGTERM:
                        {
-                               DBG1(DBG_DMN, "signal of type SIGTERM received. Shutting down");
+                               DBG1(DBG_DMN, "%s received, shutting down",
+                                        sig == SIGINT ? "SIGINT" : "SIGTERM");
                                charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, sig);
                                return;
                        }

diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c
index c8d5014183c4c5d1522ca1eba54ead7e7e21b600..e75c929dce0dfbbec051f7e683183c748994dd52 100644 (file)
--- a/src/charon-tkm/src/charon-tkm.c
+++ b/src/charon-tkm/src/charon-tkm.c
@@ -118,14 +118,10 @@ static void run()
                switch (sig)
                {
                        case SIGINT:
-                       {
-                               DBG1(DBG_DMN, "signal of type SIGINT received. Shutting down");
-                               charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, sig);
-                               return;
-                       }
                        case SIGTERM:
                        {
-                               DBG1(DBG_DMN, "signal of type SIGTERM received. Shutting down");
+                               DBG1(DBG_DMN, "%s received, shutting down",
+                                        sig == SIGINT ? "SIGINT" : "SIGTERM");
                                charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, sig);
                                return;
                        }

diff --git a/src/charon/charon.c b/src/charon/charon.c
index 1d179bae379776c57c0b9416f8fef590bc66afb9..7a2fe19e1a389c3ce65e657bcaeaf59a0319d81a 100644 (file)
--- a/src/charon/charon.c
+++ b/src/charon/charon.c
@@ -126,14 +126,10 @@ static void run()
                                break;
                        }
                        case SIGINT:
-                       {
-                               DBG1(DBG_DMN, "signal of type SIGINT received. Shutting down");
-                               charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, sig);
-                               return;
-                       }
                        case SIGTERM:
                        {
-                               DBG1(DBG_DMN, "signal of type SIGTERM received. Shutting down");
+                               DBG1(DBG_DMN, "%s received, shutting down",
+                                        sig == SIGINT ? "SIGINT" : "SIGTERM");
                                charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, sig);
                                return;
                        }

diff --git a/src/frontends/osx/charon-xpc/charon-xpc.c b/src/frontends/osx/charon-xpc/charon-xpc.c
index e3063f2ff4dfd02437cdbd2a21d8758b89cb7f50..d6682818b18ff386e8b658813e3d3cdf2a2fbf36 100644 (file)
--- a/src/frontends/osx/charon-xpc/charon-xpc.c
+++ b/src/frontends/osx/charon-xpc/charon-xpc.c
@@ -92,11 +92,9 @@ static int run()
                switch (sig)
                {
                        case SIGINT:
-                               DBG1(DBG_DMN, "signal of type SIGINT received. Shutting down");
-                               charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, sig);
-                               return 0;
                        case SIGTERM:
-                               DBG1(DBG_DMN, "signal of type SIGTERM received. Shutting down");
+                               DBG1(DBG_DMN, "%s received, shutting down",
+                                        sig == SIGINT ? "SIGINT" : "SIGTERM");
                                charon->bus->alert(charon->bus, ALERT_SHUTDOWN_SIGNAL, sig);
                                return 0;
                }