<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12022">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">SS/USSD: fix: properly (re)schedule SS session timeout<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. This<br>is why we have SS session timeout, that prevents keeping<br>'stalled' sessions forever.<br><br>For some reason, it wasn't properly resceduled in case of any<br>SS/USSD activity, so the lifetime of a session was limited to<br>hard-coded 30 seconds.<br><br>Let's introduce a VTY option, which can be used to configure<br>the timer (by default it is 120 seconds now):<br><br>hlr<br> ...<br> ! Use 0 to disable this timer<br> ss-guard-timeout 120<br><br>and properly (re)schedule it.<br><br>Change-Id: I00561c7aa692b19f85692e11f83ffc1826023120<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_vty.c<br>M tests/test_nodes.vty<br>5 files changed, 36 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/22/12022/1</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 78d6c91..9f1b907 100644</span><br><span>--- a/src/hlr.c</span><br><span>+++ b/src/hlr.c</span><br><span>@@ -604,6 +604,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%);">+ /* Default SS guard timeout is 120 (i.e. 2 mins) */</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->ss_guard_timeout = 120;</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..5236356 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%);">+ /* SS session guard timer value */</span><br><span style="color: hsl(120, 100%, 40%);">+ int ss_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 ba373f3..6ba1dcc 100644</span><br><span>--- a/src/hlr_ussd.c</span><br><span>+++ b/src/hlr_ussd.c</span><br><span>@@ -1,6 +1,7 @@</span><br><span> /* OsmoHLR SS/USSD implementation */</span><br><span> </span><br><span> /* (C) 2018 Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span> *</span><br><span> * All Rights Reserved</span><br><span> *</span><br><span>@@ -208,11 +209,13 @@</span><br><span> </span><br><span> OSMO_STRLCPY_ARRAY(ss->imsi, imsi);</span><br><span> ss->session_id = session_id;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Schedule self-destruction timer */</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%);">+ if (g_hlr->ss_guard_timeout > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&ss->timeout,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->ss_guard_timeout, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> llist_add_tail(&ss->list, &hlr->ss_sessions);</span><br><span> return ss;</span><br><span>@@ -535,6 +538,13 @@</span><br><span> gsup->imsi, gsup->session_id);</span><br><span> goto out_err;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Reschedule self-destruction timer */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_hlr->ss_guard_timeout > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&ss->timeout,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->ss_guard_timeout, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (ss_op_is_ussd(req.opcode)) {</span><br><span> /* dispatch unstructured SS to routing */</span><br><span> handle_ussd(conn, ss, gsup, &req);</span><br><span>diff --git a/src/hlr_vty.c b/src/hlr_vty.c</span><br><span>index 2d9b929..be49113 100644</span><br><span>--- a/src/hlr_vty.c</span><br><span>+++ b/src/hlr_vty.c</span><br><span>@@ -288,9 +288,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->ss_guard_timeout > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ss-guard-timeout %i%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hlr->ss_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_ss_guard_timeout, cfg_ss_guard_timeout_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ss-guard-timeout <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set guard timer for SS/USSD 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->ss_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 +366,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_ss_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 a9d4ac4..88ee5fb 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -77,6 +77,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%);">+ ss-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>@@ -118,4 +119,5 @@</span><br><span> bind ip 127.0.0.1</span><br><span> ussd route prefix *#100# internal own-msisdn</span><br><span> ussd route prefix *#101# internal own-imsi</span><br><span style="color: hsl(120, 100%, 40%);">+ ss-guard-timeout 120</span><br><span> end</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12022">change 12022</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/12022"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I00561c7aa692b19f85692e11f83ffc1826023120 </div>
<div style="display:none"> Gerrit-Change-Number: 12022 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>