<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12048">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">SS/USSD: make NCSS session timeout configurable<br><br>It may happen that either the MS or an ESME would become<br>unresponsive, e.g. due to a bug, or a dropped message.<br>This is why we have SS session timeout, that prevents<br>keeping 'stalled' sessions forever.<br><br>Let's introduce a VTY option, which can be used to configure<br>this timer (by default it's set to 30 seconds):<br><br>hlr<br> ...<br> ! Use 0 to disable this timer<br> ncss-guard-timeout 30<br><br>Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d<br>Related: OS#3717<br>---<br>M src/hlr.c<br>M src/hlr.h<br>M src/hlr_ussd.c<br>M src/hlr_ussd.h<br>M src/hlr_vty.c<br>M tests/test_nodes.vty<br>6 files changed, 29 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr.c b/src/hlr.c</span><br><span>index 14945b6..4873a66 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -611,6 +611,9 @@</span><br><span> INIT_LLIST_HEAD(&g_hlr->ss_sessions);</span><br><span> INIT_LLIST_HEAD(&g_hlr->ussd_routes);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Init default (call independent) SS session guard timeout value */</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->ncss_guard_timeout = NCSS_GUARD_TIMEOUT_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rc = osmo_init_logging2(hlr_ctx, &hlr_log_info);</span><br><span> if (rc < 0) {</span><br><span> fprintf(stderr, "Error initializing logging\n");</span><br><span>diff --git a/src/hlr.h b/src/hlr.h</span><br><span>index 315c3dd..e9cc747 100644</span><br><span>--- a/src/hlr.h</span><br><span>+++ b/src/hlr.h</span><br><span>@@ -45,6 +45,9 @@</span><br><span> struct hlr_euse *euse_default;</span><br><span> struct llist_head iuse_list;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* NCSS (call independent) session guard timeout value */</span><br><span style="color: hsl(120, 100%, 40%);">+ int ncss_guard_timeout;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct llist_head ussd_routes;</span><br><span> </span><br><span> struct llist_head ss_sessions;</span><br><span>diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c</span><br><span>index b7aaba4..16a197c 100644</span><br><span>--- a/src/hlr_ussd.c</span><br><span>+++ b/src/hlr_ussd.c</span><br><span>@@ -209,10 +209,11 @@</span><br><span> OSMO_STRLCPY_ARRAY(ss->imsi, imsi);</span><br><span> ss->session_id = session_id;</span><br><span> osmo_timer_setup(&ss->timeout, ss_session_timeout, ss);</span><br><span style="color: hsl(0, 100%, 40%);">- /* NOTE: The timeout is currently global and not refreshed with subsequent messages</span><br><span style="color: hsl(0, 100%, 40%);">- * within the SS/USSD session. So 30s after the initial SS message, the session will</span><br><span style="color: hsl(0, 100%, 40%);">- * timeout! */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_timer_schedule(&ss->timeout, 30, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NOTE: The timeout is currently not refreshed with subsequent messages</span><br><span style="color: hsl(120, 100%, 40%);">+ * within the SS/USSD session. So X seconds after the initial SS message,</span><br><span style="color: hsl(120, 100%, 40%);">+ * the session will timeout! */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_hlr->ncss_guard_timeout > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&ss->timeout, g_hlr->ncss_guard_timeout, 0);</span><br><span> </span><br><span> llist_add_tail(&ss->list, &hlr->ss_sessions);</span><br><span> return ss;</span><br><span>diff --git a/src/hlr_ussd.h b/src/hlr_ussd.h</span><br><span>index 0414924..393ca6c 100644</span><br><span>--- a/src/hlr_ussd.h</span><br><span>+++ b/src/hlr_ussd.h</span><br><span>@@ -7,6 +7,8 @@</span><br><span> </span><br><span> #include "gsup_server.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define NCSS_GUARD_TIMEOUT_DEFAULT 30</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct hlr_ussd_route {</span><br><span> /* g_hlr.routes */</span><br><span> struct llist_head list;</span><br><span>diff --git a/src/hlr_vty.c b/src/hlr_vty.c</span><br><span>index 2d9b929..6706aa4 100644</span><br><span>--- a/src/hlr_vty.c</span><br><span>+++ b/src/hlr_vty.c</span><br><span>@@ -35,6 +35,7 @@</span><br><span> #include "hlr.h"</span><br><span> #include "hlr_vty.h"</span><br><span> #include "hlr_vty_subscr.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "hlr_ussd.h"</span><br><span> #include "gsup_server.h"</span><br><span> </span><br><span> struct cmd_node hlr_node = {</span><br><span>@@ -288,9 +289,22 @@</span><br><span> if (g_hlr->euse_default)</span><br><span> vty_out(vty, " ussd default-route external %s%s", g_hlr->euse_default->name, VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_hlr->ncss_guard_timeout != NCSS_GUARD_TIMEOUT_DEFAULT)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ncss-guard-timeout %i%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->ncss_guard_timeout, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_ncss_guard_timeout, cfg_ncss_guard_timeout_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ncss-guard-timeout <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set guard timer for NCSS (call independent SS) session activity\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Guard timer value (sec.), or 0 to disable")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->ncss_guard_timeout = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /***********************************************************************</span><br><span> * Common Code</span><br><span> ***********************************************************************/</span><br><span>@@ -353,6 +367,7 @@</span><br><span> install_element(HLR_NODE, &cfg_ussd_no_route_pfx_cmd);</span><br><span> install_element(HLR_NODE, &cfg_ussd_defaultroute_cmd);</span><br><span> install_element(HLR_NODE, &cfg_ussd_no_defaultroute_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(HLR_NODE, &cfg_ncss_guard_timeout_cmd);</span><br><span> </span><br><span> hlr_vty_subscriber_init();</span><br><span> }</span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index e1f57a9..63d3da0 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -78,6 +78,7 @@</span><br><span> no ussd route prefix PREFIX</span><br><span> ussd default-route external EUSE</span><br><span> no ussd default-route</span><br><span style="color: hsl(120, 100%, 40%);">+ ncss-guard-timeout <0-255></span><br><span> </span><br><span> OsmoHLR(config-hlr)# gsup</span><br><span> OsmoHLR(config-hlr-gsup)# list</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12048">change 12048</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12048"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I971fc2cee6fd46d4d5d6dac6c634e0b22fff183d </div>
<div style="display:none"> Gerrit-Change-Number: 12048 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>