<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10247">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">USSD: Send ReturnError component if USSD Code unknown / EUSE disconnected<br><br>Change-Id: Ieef06cec05dd81f600594465d18804362e0fafd6<br>---<br>M src/hlr_ussd.c<br>1 file changed, 64 insertions(+), 7 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/47/10247/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr_ussd.c b/src/hlr_ussd.c</span><br><span>index ef4063c..fdbde9d 100644</span><br><span>--- a/src/hlr_ussd.c</span><br><span>+++ b/src/hlr_ussd.c</span><br><span>@@ -196,6 +196,60 @@</span><br><span> }</span><br><span> </span><br><span> /***********************************************************************</span><br><span style="color: hsl(120, 100%, 40%);">+ * handling functions for encoding SS messages + wrapping them in GSUP</span><br><span style="color: hsl(120, 100%, 40%);">+ ***********************************************************************/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int ss_tx_to_ms(struct ss_session *ss, enum osmo_gsup_message_type gsup_msg_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool final, struct msgb *ss_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message resp = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *resp_msg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ resp.message_type = gsup_msg_type;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRLCPY_ARRAY(resp.imsi, ss->imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (final)</span><br><span style="color: hsl(120, 100%, 40%);">+ resp.session_state = OSMO_GSUP_SESSION_STATE_END;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ resp.session_state = OSMO_GSUP_SESSION_STATE_CONTINUE;</span><br><span style="color: hsl(120, 100%, 40%);">+ resp.session_id = ss->session_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ss_msg) {</span><br><span style="color: hsl(120, 100%, 40%);">+ resp.ss_info = msgb_data(ss_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ resp.ss_info_len = msgb_length(ss_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ resp_msg = gsm0480_msgb_alloc_name(__func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(resp_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_encode(resp_msg, &resp);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(ss_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: resolve this based on the database vlr_addr */</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsup_addr_send(g_hlr->gs, (uint8_t *)"MSC-00-00-00-00-00-00", 22, resp_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span style="color: hsl(120, 100%, 40%);">+static int ss_tx_reject(struct ss_session *ss, int invoke_id, uint8_t problem_tag,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t problem_code)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = gsm0480_gen_reject(invoke_id, problem_tag, problem_code);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPSS(ss, LOGL_NOTICE, "Tx Reject(%u, 0x%02x, 0x%02x)\n", invoke_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ problem_tag, problem_code);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ss_tx_to_ms(ss, OSMO_GSUP_MSGT_PROC_SS_RESULT, true, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int ss_tx_error(struct ss_session *ss, uint8_t invoke_id, uint8_t error_code)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = gsm0480_gen_return_error(invoke_id, error_code);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPSS(ss, LOGL_NOTICE, "Tx ReturnError(%u, 0x%02x)\n", invoke_id, error_code);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ss_tx_to_ms(ss, OSMO_GSUP_MSGT_PROC_SS_RESULT, true, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/***********************************************************************</span><br><span> * handling functions for individual GSUP messages</span><br><span> ***********************************************************************/</span><br><span> </span><br><span>@@ -264,16 +318,16 @@</span><br><span> gsm0480_comp_type_name(comp_type), gsm0480_op_code_name(req->opcode),</span><br><span> req->ussd_text);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP USSD FW");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msg_out);</span><br><span> </span><br><span> if (!ss->euse) {</span><br><span> LOGP(DMAIN, LOGL_NOTICE, "%s: USSD for unknown code '%s'\n", gsup->imsi, req->ussd_text);</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: send proper error */</span><br><span style="color: hsl(120, 100%, 40%);">+ ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_SS_NOT_AVAILABLE);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span> if (is_euse_originated) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP USSD FW");</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(msg_out);</span><br><span> /* Received from EUSE, Forward to VLR */</span><br><span> osmo_gsup_encode(msg_out, gsup);</span><br><span> /* FIXME: resolve this based on the database vlr_addr */</span><br><span>@@ -286,11 +340,13 @@</span><br><span> conn = gsup_route_find(conn->server, (uint8_t *)addr, strlen(addr)+1);</span><br><span> if (!conn) {</span><br><span> LOGP(DMAIN, LOGL_ERROR, "Cannot find conn for EUSE %s\n", addr);</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: send proper error */</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ss_tx_error(ss, req->invoke_id, GSM0480_ERR_CODE_SYSTEM_FAILURE);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_out = msgb_alloc_headroom(1024+16, 16, "GSUP USSD FW");</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(msg_out);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_encode(msg_out, gsup);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_conn_send(conn, msg_out);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gsup_encode(msg_out, gsup);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gsup_conn_send(conn, msg_out);</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span>@@ -314,6 +370,7 @@</span><br><span> LOGP(DMAIN, LOGL_ERROR, "%s: Unable to parse SS request for 0x%08x: %s\n",</span><br><span> gsup->imsi, gsup->session_id,</span><br><span> osmo_hexdump(gsup->ss_info, gsup->ss_info_len));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: Send a Reject component? */</span><br><span> goto out_err;</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10247">change 10247</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/10247"/><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: Ieef06cec05dd81f600594465d18804362e0fafd6 </div>
<div style="display:none"> Gerrit-Change-Number: 10247 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>