<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9656">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libvlr/vlr.c: forward unhandled GSUP messages towards MSC<br><br>Some internal sub-systems, such as SS/USSD or SMS implementation,<br>may also need to use GSUP connection with HLR. Previously, it was<br>only available within the libvlr code, and nowhere else.<br><br>Let's introduce the generic GSUP message router, which will<br>receive messages unhandled by VLR itself, and route them to<br>a handler depending on the message type.<br><br>Change-Id: Ib8146ce5788c8f249dcaa39d61bd0388574bf892<br>---<br>M include/osmocom/msc/vlr.h<br>M src/libmsc/gsm_04_08.c<br>M src/libvlr/vlr.c<br>3 files changed, 20 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h</span><br><span>index f12d758..b54aa55 100644</span><br><span>--- a/include/osmocom/msc/vlr.h</span><br><span>+++ b/include/osmocom/msc/vlr.h</span><br><span>@@ -8,6 +8,7 @@</span><br><span> #include <osmocom/gsm/protocol/gsm_04_08_gprs.h></span><br><span> #include <osmocom/gsm/gsm23003.h></span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/gsup.h></span><br><span> #include <osmocom/msc/gsm_data.h></span><br><span> // for GSM_NAME_LENGTH</span><br><span> #include <osmocom/msc/gsm_subscriber.h></span><br><span>@@ -226,6 +227,9 @@</span><br><span> /* notify MSC/SGSN that the given subscriber has been associated</span><br><span> * with this msc_conn_ref */</span><br><span> void (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Forward a parsed GSUP message towards MSC message router */</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*forward_gsup_msg)(struct vlr_subscr *vsub, struct osmo_gsup_message *gsup_msg);</span><br><span> };</span><br><span> </span><br><span> enum vlr_timer {</span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index f81a6fa..c10a701 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -1698,6 +1698,18 @@</span><br><span> conn->vsub->cs.attached_via_ran = conn->via_ran;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int msc_vlr_route_gsup_msg(struct vlr_subscr *vsub,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message *gsup_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gsup_msg->message_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Nowhere to route for now */</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMM, LOGL_ERROR, "No handler found for %s, dropping message...\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsup_message_type_name(gsup_msg->message_type));</span><br><span style="color: hsl(120, 100%, 40%);">+ return -GMM_CAUSE_MSGT_NOTEXIST_NOTIMPL;</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> /* operations that we need to implement for libvlr */</span><br><span> static const struct vlr_ops msc_vlr_ops = {</span><br><span> .tx_auth_req = msc_vlr_tx_auth_req,</span><br><span>@@ -1712,6 +1724,7 @@</span><br><span> .tx_mm_info = msc_vlr_tx_mm_info,</span><br><span> .subscr_update = msc_vlr_subscr_update,</span><br><span> .subscr_assoc = msc_vlr_subscr_assoc,</span><br><span style="color: hsl(120, 100%, 40%);">+ .forward_gsup_msg = msc_vlr_route_gsup_msg,</span><br><span> };</span><br><span> </span><br><span> /* Allocate net->vlr so that the VTY may configure the VLR's data structures */</span><br><span>diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c</span><br><span>index cff2e12..2f7dc30 100644</span><br><span>--- a/src/libvlr/vlr.c</span><br><span>+++ b/src/libvlr/vlr.c</span><br><span>@@ -1042,10 +1042,8 @@</span><br><span> rc = -GMM_CAUSE_MSGT_NOTEXIST_NOTIMPL;</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGVSUBP(LOGL_ERROR, vsub,</span><br><span style="color: hsl(0, 100%, 40%);">- "Rx GSUP msg_type=%d not valid at VLR/SGSN side\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsup.message_type);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = -GMM_CAUSE_MSGT_NOTEXIST_NOTIMPL;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Forward message towards MSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = vlr->ops.forward_gsup_msg(vsub, &gsup);</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span>@@ -1192,6 +1190,7 @@</span><br><span> OSMO_ASSERT(ops->tx_common_id);</span><br><span> OSMO_ASSERT(ops->subscr_update);</span><br><span> OSMO_ASSERT(ops->subscr_assoc);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(ops->forward_gsup_msg);</span><br><span> </span><br><span> INIT_LLIST_HEAD(&vlr->subscribers);</span><br><span> INIT_LLIST_HEAD(&vlr->operations);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9656">change 9656</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/9656"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib8146ce5788c8f249dcaa39d61bd0388574bf892 </div>
<div style="display:none"> Gerrit-Change-Number: 9656 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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 </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>