[MERGED] libosmo-sccp[master]: osmo-stp: Fix process termination on SIGINT+SIGTERM

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Sep 1 07:36:19 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: osmo-stp: Fix process termination on SIGINT+SIGTERM
......................................................................


osmo-stp: Fix process termination on SIGINT+SIGTERM

In commit eed8c1bfae1d151e135b574d83ed295d36ad8b44 we introduced
some singal handling code for (among others) SIGINT and SIGTERM.

This code causes the process to hang rather than terminate, as it
only dispatches a signal that nobody handles yet in libosmo-sccp.

Until a proper implementation is made, let's terminate the process
as expected.

Change-Id: Iff79c8ac0b347660333912c9258073a013ea799b
---
M stp/stp_main.c
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/stp/stp_main.c b/stp/stp_main.c
index 8e3282c..a33045a 100644
--- a/stp/stp_main.c
+++ b/stp/stp_main.c
@@ -134,8 +134,11 @@
 	switch (signal) {
 	case SIGINT:
 	case SIGTERM:
+		/* FIXME: handle the signal somewhere else and gracefully shut down
+		 * SIGTRAN links
 		osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL);
-		sleep(1);
+		sleep(1); */
+		exit(0);
 		break;
 	case SIGABRT:
 		osmo_generate_backtrace();

-- 
To view, visit https://gerrit.osmocom.org/3757
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff79c8ac0b347660333912c9258073a013ea799b
Gerrit-PatchSet: 1
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list