<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13479">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">USSD: fix routing to multiple MSC<br><br>hlr_ussd.c so far hardcoded osmo-msc's default IPA-name and hence was<br>only able to negotiate USSD sessions to<br>- a single osmo-msc<br>- that has no custom IPA-name set.<br>Fix: correctly route USSD to any number of MSC with any custom IPA<br>names.<br><br>Resolve the right MSC's IPA name from the USSD session's IMSI, using<br>hlr_subscriber->vlr_number to determine the right GSUP peer. Cache it in<br>ss_session->vlr_number to have at most one db hit for routing per<br>session.<br><br>Related: OS#3710<br>Change-Id: I18067bfadd33a6bc59a9ee336b6937313826fce3<br>---<br>M src/hlr_ussd.c<br>1 file changed, 33 insertions(+), 4 deletions(-)<br><br></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 cc6aa8a..ea69cd9 100644</span><br><span>--- a/src/hlr_ussd.c</span><br><span>+++ b/src/hlr_ussd.c</span><br><span>@@ -34,6 +34,7 @@</span><br><span> #include "gsup_server.h"</span><br><span> #include "gsup_router.h"</span><br><span> #include "logging.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "db.h"</span><br><span> </span><br><span> /***********************************************************************</span><br><span> * core data structures expressing config from VTY</span><br><span>@@ -166,6 +167,9 @@</span><br><span> const struct hlr_iuse *iuse;</span><br><span> } u;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* subscriber's vlr_number, will be looked up once per session and cached here */</span><br><span style="color: hsl(120, 100%, 40%);">+ char vlr_number[32];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* we don't keep a pointer to the osmo_gsup_{route,conn} towards the MSC/VLR here,</span><br><span> * as this might change during inter-VLR hand-over, and we simply look-up the serving MSC/VLR</span><br><span> * every time we receive an USSD component from the EUSE */</span><br><span>@@ -222,6 +226,33 @@</span><br><span> * handling functions for encoding SS messages + wrapping them in GSUP</span><br><span> ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Resolve the target MSC by ss->imsi and send GSUP message. */</span><br><span style="color: hsl(120, 100%, 40%);">+static int ss_gsup_send(struct ss_session *ss, struct osmo_gsup_server *gs, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct hlr_subscriber subscr = {};</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Use vlr_number as looked up by the caller, or look up now. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ss->vlr_number[0]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = db_subscr_get_by_imsi(g_hlr->dbc, ss->imsi, &subscr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPSS(ss, LOGL_ERROR, "Cannot find subscriber, cannot route GSUP message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(ss->vlr_number, subscr.vlr_number, sizeof(ss->vlr_number));</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 (!ss->vlr_number[0]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPSS(ss, LOGL_ERROR, "Cannot send GSUP message, no VLR number stored for subscriber\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</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%);">+ LOGPSS(ss, LOGL_DEBUG, "Tx SS/USSD to VLR '%s'\n", ss->vlr_number);</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsup_addr_send(gs, (uint8_t *)ss->vlr_number, strlen(ss->vlr_number) + 1, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int ss_tx_to_ms(struct ss_session *ss, enum osmo_gsup_message_type gsup_msg_type,</span><br><span> bool final, struct msgb *ss_msg)</span><br><span> </span><br><span>@@ -246,8 +277,7 @@</span><br><span> osmo_gsup_encode(resp_msg, &resp);</span><br><span> msgb_free(ss_msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: resolve this based on the database vlr_addr */</span><br><span style="color: hsl(0, 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%);">+ return ss_gsup_send(ss, g_hlr->gs, resp_msg);</span><br><span> }</span><br><span> </span><br><span> #if 0</span><br><span>@@ -433,8 +463,7 @@</span><br><span> 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 style="color: hsl(0, 100%, 40%);">- /* FIXME: resolve this based on the database vlr_addr */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_gsup_addr_send(conn->server, (uint8_t *)"MSC-00-00-00-00-00-00", 22, msg_out);</span><br><span style="color: hsl(120, 100%, 40%);">+ ss_gsup_send(ss, conn->server, msg_out);</span><br><span> } else {</span><br><span> /* Received from VLR (MS) */</span><br><span> if (ss->is_external) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13479">change 13479</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/13479"/><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: I18067bfadd33a6bc59a9ee336b6937313826fce3 </div>
<div style="display:none"> Gerrit-Change-Number: 13479 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </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>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>