<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13923">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bssap: Detect MSC Osmux support on RESET (ACK) recv<br><br>Related: OS#2551<br>Depends on: libosmocore I28f83e2e32b9533c99e65ccc1562900ac2aec74e<br>Change-Id: I830e38cc1ffb8b6ebbe299567507160f19beb528<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>2 files changed, 25 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index 271bdd4..4720845 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -133,6 +133,8 @@</span><br><span> </span><br><span> /* Whether we want to use Osmux against this MSC. Controlled via VTY */</span><br><span> enum osmux_usage use_osmux;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Whether we detected the MSC supports Osmux (during BSSMAP_RESET) */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool remote_supports_osmux;</span><br><span> };</span><br><span> </span><br><span> /*</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index e79a344..9dee265 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -51,6 +51,25 @@</span><br><span> * helpers for the assignment command</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* We expect MSC to provide use with an Osmocom extension TLV in BSSMAP_RESET to</span><br><span style="color: hsl(120, 100%, 40%);">+ * announce Osmux support */</span><br><span style="color: hsl(120, 100%, 40%);">+static void update_msc_osmux_support(struct bsc_msc_data *msc,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg, unsigned int length)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tlv_parsed tp;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool old_value = msc->remote_supports_osmux;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l4h + 1, length - 1, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_NOTICE, "Failed parsing TLV looking for Osmux support\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->remote_supports_osmux = !!TLVP_PRESENT(&tp, GSM0808_IE_OSMO_OSMUX_SUPPORT);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (old_value != msc->remote_supports_osmux)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_INFO, "MSC detected AoIP Osmux support changed: %d->%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ old_value, msc->remote_supports_osmux);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> static int bssmap_handle_reset_ack(struct bsc_msc_data *msc,</span><br><span> struct msgb *msg, unsigned int length)</span><br><span>@@ -63,6 +82,8 @@</span><br><span> * that we have successfully received the reset-ack message */</span><br><span> a_reset_ack_confirm(msc);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ update_msc_osmux_support(msc, msg, length);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -81,6 +102,8 @@</span><br><span> /* Drop all ongoing paging requests that this MSC has created on any BTS */</span><br><span> paging_flush_network(msc->network, msc);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ update_msc_osmux_support(msc, msg, length);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Inform the MSC that we have received the reset request and</span><br><span> * that we acted accordingly */</span><br><span> osmo_bsc_sigtran_tx_reset_ack(msc);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13923">change 13923</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/13923"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I830e38cc1ffb8b6ebbe299567507160f19beb528 </div>
<div style="display:none"> Gerrit-Change-Number: 13923 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>