<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11311">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">subscr conn: properly forget lchan before release<br><br>Clear all lchan->conn pointers when the subscr conn code is choosing to release<br>an lchan, with gscon_release_lchan().<br><br>Rationale: when an lchan releases in error, it should trigger the conn to be<br>notified and cause a BSSMAP Clear. However, if the conn is actively requesting<br>for an lchan release, it is already taking care of the situation.<br><br>Related: osmo-ttcn3-hacks If772dbbc5f9790d3f911465e1303dd0a99811154<br>Change-Id: I4fd582b41ba4599af704d670af83651d2450b1db<br>---<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>1 file changed, 22 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/11311/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index a8b3183..52afd54 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -149,6 +149,24 @@</span><br><span> gscon_sigtran_send(conn, resp);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Release an lchan in such a way that it doesn't fire events back to the conn. */</span><br><span style="color: hsl(120, 100%, 40%);">+static void gscon_release_lchan(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool do_sacch_deact, bool err, enum gsm48_rr_cause cause_rr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!lchan || !conn)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->conn == conn)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_forget_conn(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->lchan == lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->lchan = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->ho.fi && conn->ho.new_lchan == lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->ho.new_lchan = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->assignment.new_lchan == lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->assignment.new_lchan = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_release(lchan, do_sacch_deact, err, cause_rr);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_sacch_deact)</span><br><span> {</span><br><span> if (conn->ho.fi)</span><br><span>@@ -156,9 +174,7 @@</span><br><span> </span><br><span> assignment_reset(conn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan_release(conn->lchan, do_sacch_deact, false, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_forget_conn(conn->lchan);</span><br><span style="color: hsl(0, 100%, 40%);">- conn->lchan = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ gscon_release_lchan(conn, conn->lchan, do_sacch_deact, false, 0);</span><br><span> }</span><br><span> </span><br><span> static void handle_bssap_n_connect(struct osmo_fsm_inst *fi, struct osmo_scu_prim *scu_prim)</span><br><span>@@ -602,10 +618,8 @@</span><br><span> if (conn->lchan->fi_rtp)</span><br><span> osmo_fsm_inst_dispatch(conn->lchan->fi_rtp, LCHAN_RTP_EV_ESTABLISHED, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (old_lchan && (old_lchan != new_lchan)) {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_forget_conn(old_lchan);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_release(old_lchan, false, false, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (old_lchan && (old_lchan != new_lchan))</span><br><span style="color: hsl(120, 100%, 40%);">+ gscon_release_lchan(conn, old_lchan, false, false, 0);</span><br><span> }</span><br><span> </span><br><span> void gscon_lchan_releasing(struct gsm_subscriber_connection *conn, struct gsm_lchan *lchan)</span><br><span>@@ -769,7 +783,7 @@</span><br><span> </span><br><span> switch (fi->T) {</span><br><span> case 993210:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_release(conn->lchan, false, true, RSL_ERR_INTERWORKING);</span><br><span style="color: hsl(120, 100%, 40%);">+ gscon_release_lchan(conn, conn->lchan, false, true, RSL_ERR_INTERWORKING);</span><br><span> </span><br><span> /* MSC has not responded/confirmed connection with CC, this</span><br><span> * could indicate a bad SCCP connection. We now inform the the</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11311">change 11311</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/11311"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I4fd582b41ba4599af704d670af83651d2450b1db </div>
<div style="display:none"> Gerrit-Change-Number: 11311 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>