<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14039">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 BSC Osmux support on RESET (ACK) recv<br><br>Related: OS#2551<br>Depends: libosmocore.git I28f83e2e32b9533c99e65ccc1562900ac2aec74e<br>Change-Id: If4f33da9b414ab194098755d2c5be85e1fce5d31<br>---<br>M include/osmocom/msc/ran_peer.h<br>M src/libmsc/ran_peer.c<br>2 files changed, 45 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/ran_peer.h b/include/osmocom/msc/ran_peer.h</span><br><span>index e3ff59d..06ab500 100644</span><br><span>--- a/include/osmocom/msc/ran_peer.h</span><br><span>+++ b/include/osmocom/msc/ran_peer.h</span><br><span>@@ -51,6 +51,9 @@</span><br><span> </span><br><span> /* See cell_id_list.h */</span><br><span> struct llist_head cells_seen;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Whether we detected the BSC 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> #define ran_peer_for_each_ran_conn(RAN_CONN, RAN_PEER) \</span><br><span>diff --git a/src/libmsc/ran_peer.c b/src/libmsc/ran_peer.c</span><br><span>index 35f2842..ce26794 100644</span><br><span>--- a/src/libmsc/ran_peer.c</span><br><span>+++ b/src/libmsc/ran_peer.c</span><br><span>@@ -122,13 +122,41 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* TODO: create an sccp_ran_ops.rx_reset(_ack) to handle this differently on 2g and 3G */</span><br><span style="color: hsl(120, 100%, 40%);">+/* We expect RAN peer 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 ran_peer_update_osmux_support(struct ran_peer *rp, struct msgb *msg)</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 = rp->remote_supports_osmux;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->l3h = msg->l2h + sizeof(struct bssmap_header);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l3h + 1, msgb_l3len(msg) - 1, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_RAN_PEER(rp, 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%);">+ if (TLVP_PRESENT(&tp, GSM0808_IE_OSMO_OSMUX_SUPPORT)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rp->remote_supports_osmux = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ rp->remote_supports_osmux = false;</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 (old_value != rp->remote_supports_osmux)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_RAN_PEER(rp, LOGL_INFO, "BSC detected AoIP Osmux support changed: %d->%d\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ old_value, rp->remote_supports_osmux);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Drop all SCCP connections for this ran_peer, respond with RESET ACKNOWLEDGE and move to READY state. */</span><br><span style="color: hsl(0, 100%, 40%);">-static void ran_peer_rx_reset(struct ran_peer *rp)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ran_peer_rx_reset(struct ran_peer *rp, struct msgb* msg)</span><br><span> {</span><br><span> struct msgb *reset_ack;</span><br><span> </span><br><span> ran_peer_discard_all_conns(rp);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ran_peer_update_osmux_support(rp, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> reset_ack = rp->sri->ran->sccp_ran_ops.make_reset_msg(rp->sri, SCCP_RAN_MSG_RESET_ACK);</span><br><span> </span><br><span> if (!reset_ack) {</span><br><span>@@ -152,9 +180,10 @@</span><br><span> ran_peer_state_chg(rp, RAN_PEER_ST_READY);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ran_peer_rx_reset_ack(struct ran_peer *rp)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ran_peer_rx_reset_ack(struct ran_peer *rp, struct msgb* msg)</span><br><span> {</span><br><span> ran_peer_state_chg(rp, RAN_PEER_ST_READY);</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_peer_update_osmux_support(rp, msg);</span><br><span> }</span><br><span> </span><br><span> void ran_peer_reset(struct ran_peer *rp)</span><br><span>@@ -228,6 +257,7 @@</span><br><span> {</span><br><span> struct ran_peer *rp = fi->priv;</span><br><span> struct ran_peer_ev_ctx *ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span> </span><br><span> switch (event) {</span><br><span> </span><br><span>@@ -257,7 +287,8 @@</span><br><span> return;</span><br><span> </span><br><span> case RAN_PEER_EV_RX_RESET:</span><br><span style="color: hsl(0, 100%, 40%);">- ran_peer_rx_reset(rp);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = (struct msgb*)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_peer_rx_reset(rp, msg);</span><br><span> return;</span><br><span> </span><br><span> default:</span><br><span>@@ -270,11 +301,13 @@</span><br><span> {</span><br><span> struct ran_peer *rp = fi->priv;</span><br><span> struct ran_peer_ev_ctx *ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span> </span><br><span> switch (event) {</span><br><span> </span><br><span> case RAN_PEER_EV_RX_RESET_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- ran_peer_rx_reset_ack(rp);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = (struct msgb*)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_peer_rx_reset_ack(rp, msg);</span><br><span> return;</span><br><span> </span><br><span> case RAN_PEER_EV_MSG_UP_CO:</span><br><span>@@ -289,7 +322,8 @@</span><br><span> return;</span><br><span> </span><br><span> case RAN_PEER_EV_RX_RESET:</span><br><span style="color: hsl(0, 100%, 40%);">- ran_peer_rx_reset(rp);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = (struct msgb*)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_peer_rx_reset(rp, msg);</span><br><span> return;</span><br><span> </span><br><span> default:</span><br><span>@@ -330,6 +364,7 @@</span><br><span> struct ran_peer_ev_ctx *ctx;</span><br><span> struct ran_conn *conn;</span><br><span> struct an_apdu an_apdu;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span> </span><br><span> switch (event) {</span><br><span> </span><br><span>@@ -397,7 +432,8 @@</span><br><span> return;</span><br><span> </span><br><span> case RAN_PEER_EV_RX_RESET:</span><br><span style="color: hsl(0, 100%, 40%);">- ran_peer_rx_reset(rp);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = (struct msgb*)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_peer_rx_reset(rp, msg);</span><br><span> return;</span><br><span> </span><br><span> default:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14039">change 14039</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/14039"/><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: If4f33da9b414ab194098755d2c5be85e1fce5d31 </div>
<div style="display:none"> Gerrit-Change-Number: 14039 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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>
<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-CC: Vadim Yanitskiy <axilirator@gmail.com> </div>