<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/21183">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">USSD: add special 'idle' handler to IUSE for testing<br><br>Change-Id: I0d566a60e95ce2da951f22ad47c6155c5b6a338c<br>---<br>M doc/manuals/chapters/ussd.adoc<br>M src/hlr_ussd.c<br>M src/hlr_vty.c<br>M tests/test_nodes.vty<br>4 files changed, 24 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/chapters/ussd.adoc b/doc/manuals/chapters/ussd.adoc</span><br><span>index 3ab587f..6100c93 100644</span><br><span>--- a/doc/manuals/chapters/ussd.adoc</span><br><span>+++ b/doc/manuals/chapters/ussd.adoc</span><br><span>@@ -67,7 +67,9 @@</span><br><span> can be assigned to one or more USSD request prefixes:</span><br><span> </span><br><span> * `own-msisdn` returns subscriber's MSISDN (if assigned);</span><br><span style="color: hsl(0, 100%, 40%);">-* `own-imsi` returns subscriber's IMSI.</span><br><span style="color: hsl(120, 100%, 40%);">+* `own-imsi` returns subscriber's IMSI;</span><br><span style="color: hsl(120, 100%, 40%);">+* `test-idle` keeps the session idle until the MS terminates it, or</span><br><span style="color: hsl(120, 100%, 40%);">+ the guard timer expires (may be useful for testing).</span><br><span> </span><br><span> Additional handlers can be added on request.</span><br><span> </span><br><span>diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c</span><br><span>index 399bdbc..35b74b6 100644</span><br><span>--- a/src/hlr_ussd.c</span><br><span>+++ b/src/hlr_ussd.c</span><br><span>@@ -379,6 +379,19 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* This handler just keeps the session idle unless the guard timer expires. */</span><br><span style="color: hsl(120, 100%, 40%);">+static int handle_ussd_test_idle(struct ss_session *ss,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_gsup_message *gsup,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct ss_request *req)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ char buf[GSM0480_USSD_7BIT_STRING_LEN + 1];</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(buf, sizeof(buf), "Keeping your session idle, it will expire "</span><br><span style="color: hsl(120, 100%, 40%);">+ "at most in %u seconds.", g_hlr->ncss_guard_timeout);</span><br><span style="color: hsl(120, 100%, 40%);">+ ss->state = OSMO_GSUP_SESSION_STATE_CONTINUE;</span><br><span style="color: hsl(120, 100%, 40%);">+ ss_tx_to_ms_ussd_7bit(ss, req->invoke_id, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> static const struct hlr_iuse hlr_iuses[] = {</span><br><span> {</span><br><span>@@ -389,6 +402,10 @@</span><br><span> .name = "own-imsi",</span><br><span> .handle_ussd = handle_ussd_own_imsi,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "test-idle",</span><br><span style="color: hsl(120, 100%, 40%);">+ .handle_ussd = handle_ussd_test_idle,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> const struct hlr_iuse *iuse_find(const char *name)</span><br><span>diff --git a/src/hlr_vty.c b/src/hlr_vty.c</span><br><span>index a054cbe..4b91aa9 100644</span><br><span>--- a/src/hlr_vty.c</span><br><span>+++ b/src/hlr_vty.c</span><br><span>@@ -174,10 +174,11 @@</span><br><span> #define UROUTE_STR "Routing Configuration\n"</span><br><span> #define PREFIX_STR "Prefix-Matching Route\n" "USSD Prefix\n"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define INT_CHOICE "(own-msisdn|own-imsi)"</span><br><span style="color: hsl(120, 100%, 40%);">+#define INT_CHOICE "(own-msisdn|own-imsi|test-idle)"</span><br><span> #define INT_STR "Internal USSD Handler\n" \</span><br><span> "Respond with subscribers' own MSISDN\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- "Respond with subscribers' own IMSI\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Respond with subscribers' own IMSI\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Keep the session idle (useful for testing)\n"</span><br><span> </span><br><span> #define EXT_STR "External USSD Handler\n" \</span><br><span> "Name of External USSD Handler (IPA CCM ID)\n"</span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index d9971f7..cf1707a 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -51,7 +51,7 @@</span><br><span> database PATH</span><br><span> euse NAME</span><br><span> no euse NAME</span><br><span style="color: hsl(0, 100%, 40%);">- ussd route prefix PREFIX internal (own-msisdn|own-imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+ ussd route prefix PREFIX internal (own-msisdn|own-imsi|test-idle)</span><br><span> ussd route prefix PREFIX external EUSE</span><br><span> no ussd route prefix PREFIX</span><br><span> ussd default-route external EUSE</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/21183">change 21183</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/c/osmo-hlr/+/21183"/><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-Change-Id: I0d566a60e95ce2da951f22ad47c6155c5b6a338c </div>
<div style="display:none"> Gerrit-Change-Number: 21183 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>