<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11606">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;">gsm0408_rcvmsg: Release lchan if L3 fails to complete<br><br>gscon_release_lchans stub is added to gsm0408_test.c to make linker<br>happy.<br><br>Change-Id: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210<br>---<br>M src/osmo-bsc/gsm_04_08_rr.c<br>M tests/gsm0408/gsm0408_test.c<br>2 files changed, 10 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>index 4659c1a..4be5198 100644</span><br><span>--- a/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>+++ b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>@@ -927,6 +927,7 @@</span><br><span> int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id)</span><br><span> {</span><br><span>     struct gsm_lchan *lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+      int rc;</span><br><span> </span><br><span>  lchan = msg->lchan;</span><br><span>       if (!lchan_may_receive_data(lchan)) {</span><br><span>@@ -948,7 +949,11 @@</span><br><span>                 lchan->conn->lchan = lchan;</span><br><span> </span><br><span>                /* fwd via bsc_api to send COMPLETE L3 INFO to MSC */</span><br><span style="color: hsl(0, 100%, 40%);">-           bsc_compl_l3(lchan->conn, msg, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+         rc = bsc_compl_l3(lchan->conn, msg, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+            if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      gscon_release_lchans(lchan->conn, true);</span><br><span style="color: hsl(120, 100%, 40%);">+                   return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+            }</span><br><span>            /* conn shall release lchan on teardown, also if this Layer 3 Complete is rejected. */</span><br><span>       }</span><br><span> </span><br><span>diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c</span><br><span>index d15e149..a30aaf8 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.c</span><br><span>+++ b/tests/gsm0408/gsm0408_test.c</span><br><span>@@ -952,6 +952,10 @@</span><br><span>    OSMO_ASSERT(0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release) {</span><br><span style="color: hsl(120, 100%, 40%);">+     OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts)</span><br><span> {</span><br><span>  return true;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11606">change 11606</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/11606"/><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: I1743f9d5cd0fdbc0fb9afe7bcc0271c897915210 </div>
<div style="display:none"> Gerrit-Change-Number: 11606 </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>
<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>