<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13924">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: Announce Osmux support on RESET (ACK) send<br><br>Related: OS#2551<br>Depends on: libosmocore I28f83e2e32b9533c99e65ccc1562900ac2aec74e<br>Change-Id: I6b5b475b6109a2882051445762e27046d015b770<br>---<br>M src/osmo-bsc/osmo_bsc_sigtran.c<br>1 file changed, 16 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>index f2a6d08..5d61c32 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>@@ -82,6 +82,14 @@</span><br><span>      return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Patch regular BSSMAP RESET to add extra T to announce Osmux support (osmocom extension) */</span><br><span style="color: hsl(120, 100%, 40%);">+static void _gsm0808_extend_announce_osmux(struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+   OSMO_ASSERT(msg->l3h[1] == msgb_l3len(msg) - 2); /*TL not in len */</span><br><span style="color: hsl(120, 100%, 40%);">+        msgb_put_u8(msg, GSM0808_IE_OSMO_OSMUX_SUPPORT);</span><br><span style="color: hsl(120, 100%, 40%);">+      msg->l3h[1] = msgb_l3len(msg) - 2;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Send reset to MSC */</span><br><span> static void osmo_bsc_sigtran_tx_reset(const struct bsc_msc_data *msc)</span><br><span> {</span><br><span>@@ -92,6 +100,10 @@</span><br><span>    OSMO_ASSERT(ss7);</span><br><span>    LOGP(DMSC, LOGL_NOTICE, "Sending RESET to MSC: %s\n", osmo_sccp_addr_name(ss7, &msc->a.msc_addr));</span><br><span>  msg = gsm0808_create_reset();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       if (msc->use_osmux != OSMUX_USAGE_OFF)</span><br><span style="color: hsl(120, 100%, 40%);">+             _gsm0808_extend_announce_osmux(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       osmo_sccp_tx_unitdata_msg(msc->a.sccp_user, &msc->a.bsc_addr,</span><br><span>                                &msc->a.msc_addr, msg);</span><br><span> }</span><br><span>@@ -107,6 +119,10 @@</span><br><span>         OSMO_ASSERT(ss7);</span><br><span>    LOGP(DMSC, LOGL_NOTICE, "Sending RESET ACK to MSC: %s\n", osmo_sccp_addr_name(ss7, &msc->a.msc_addr));</span><br><span>      msg = gsm0808_create_reset_ack();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   if (msc->use_osmux != OSMUX_USAGE_OFF)</span><br><span style="color: hsl(120, 100%, 40%);">+             _gsm0808_extend_announce_osmux(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       osmo_sccp_tx_unitdata_msg(msc->a.sccp_user, &msc->a.bsc_addr,</span><br><span>                                &msc->a.msc_addr, msg);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13924">change 13924</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/13924"/><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: I6b5b475b6109a2882051445762e27046d015b770 </div>
<div style="display:none"> Gerrit-Change-Number: 13924 </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>