<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11668">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: lchan: introduce sub-struct lchan->release.*<br><br>Put all lchan release related flags and settings in a sub-struct named<br>'release' to better indicate what those fields are for. There is no functional<br>change.<br><br>Change-Id: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/lchan_fsm.c<br>M src/osmo-bsc/lchan_rtp_fsm.c<br>4 files changed, 53 insertions(+), 50 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/68/11668/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index b257b67..fb1db80 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -492,6 +492,8 @@</span><br><span> uint8_t nr;</span><br><span> char *name;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ char *last_error;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_fsm_inst *fi;</span><br><span> struct osmo_fsm_inst *fi_rtp;</span><br><span> struct mgwep_ci *mgw_endpoint_ci_bts;</span><br><span>@@ -510,21 +512,21 @@</span><br><span> struct gsm_lchan *re_use_mgw_endpoint_from_lchan;</span><br><span> } activate;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* If an event to release the lchan comes in while still waiting for responses, just mark this</span><br><span style="color: hsl(0, 100%, 40%);">- * flag, so that the lchan will gracefully release at the next sensible junction. */</span><br><span style="color: hsl(0, 100%, 40%);">- bool release_requested;</span><br><span style="color: hsl(0, 100%, 40%);">- bool do_rr_release;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If an event to release the lchan comes in while still waiting for responses, just mark this</span><br><span style="color: hsl(120, 100%, 40%);">+ * flag, so that the lchan will gracefully release at the next sensible junction. */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool release_requested;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool do_rr_release;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- char *last_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* There is an RSL error cause of value 0, so we need a separate flag. */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool release_in_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RSL error code, RSL_ERR_* */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rsl_error_cause;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* There is an RSL error cause of value 0, so we need a separate flag. */</span><br><span style="color: hsl(0, 100%, 40%);">- bool release_in_error;</span><br><span style="color: hsl(0, 100%, 40%);">- /* RSL error code, RSL_ERR_* */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t rsl_error_cause;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* If a release event is being handled, ignore other ricocheting release events until that</span><br><span style="color: hsl(0, 100%, 40%);">- * release handling has concluded. */</span><br><span style="color: hsl(0, 100%, 40%);">- bool in_release_handler;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If a release event is being handled, ignore other ricocheting release events until that</span><br><span style="color: hsl(120, 100%, 40%);">+ * release handling has concluded. */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool in_release_handler;</span><br><span style="color: hsl(120, 100%, 40%);">+ } release;</span><br><span> </span><br><span> /* The logical channel type */</span><br><span> enum gsm_chan_t type;</span><br><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 86f8354..c0febaa 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>@@ -715,8 +715,8 @@</span><br><span> break;</span><br><span> case GSCON_EV_RSL_CONN_FAIL:</span><br><span> if (conn->lchan) {</span><br><span style="color: hsl(0, 100%, 40%);">- conn->lchan->release_in_error = true;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->lchan->rsl_error_cause = data ? *(uint8_t*)data : RSL_ERR_IE_ERROR;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->lchan->release.release_in_error = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->lchan->release.rsl_error_cause = data ? *(uint8_t*)data : RSL_ERR_IE_ERROR;</span><br><span> }</span><br><span> gscon_bssmap_clear(conn, GSM0808_CAUSE_RADIO_INTERFACE_FAILURE);</span><br><span> break;</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 9964fcf..012239c 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -485,7 +485,7 @@</span><br><span> OSMO_ASSERT(!lchan->conn);</span><br><span> OSMO_ASSERT(!lchan->mgw_endpoint_ci_bts);</span><br><span> lchan_set_last_error(lchan, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->release_requested = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.release_requested = false;</span><br><span> </span><br><span> lchan->conn = info->for_conn;</span><br><span> lchan->activate.activ_for = info->activ_for;</span><br><span>@@ -557,7 +557,7 @@</span><br><span> struct gsm_lchan *lchan = lchan_fi_lchan(fi);</span><br><span> struct mgwep_ci *use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->release_requested) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.release_requested) {</span><br><span> lchan_fail("Release requested while activating");</span><br><span> return;</span><br><span> }</span><br><span>@@ -593,7 +593,7 @@</span><br><span> </span><br><span> case LCHAN_EV_RTP_RELEASED:</span><br><span> case LCHAN_EV_RTP_ERROR:</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->in_release_handler) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.in_release_handler) {</span><br><span> /* Already in release, the RTP is not the initial cause of failure.</span><br><span> * Just ignore. */</span><br><span> return;</span><br><span>@@ -616,7 +616,7 @@</span><br><span> uint8_t ho_ref = 0;</span><br><span> struct gsm_lchan *lchan = lchan_fi_lchan(fi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->release_requested) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.release_requested) {</span><br><span> lchan_fail_to(LCHAN_ST_UNUSED, "Release requested while activating");</span><br><span> return;</span><br><span> }</span><br><span>@@ -653,12 +653,12 @@</span><br><span> break;</span><br><span> </span><br><span> case LCHAN_EV_RSL_CHAN_ACTIV_NACK:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->in_release_handler = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.in_release_handler = true;</span><br><span> if (data) {</span><br><span> uint32_t next_state;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rsl_error_cause = *(uint8_t*)data;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->release_in_error = true;</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->rsl_error_cause != RSL_ERR_RCH_ALR_ACTV_ALLOC)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.rsl_error_cause = *(uint8_t*)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.release_in_error = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.rsl_error_cause != RSL_ERR_RCH_ALR_ACTV_ALLOC)</span><br><span> next_state = LCHAN_ST_BORKEN;</span><br><span> else</span><br><span> /* Taking this over from legacy code: send an RF Chan Release even though</span><br><span>@@ -666,18 +666,18 @@</span><br><span> next_state = LCHAN_ST_WAIT_RF_RELEASE_ACK;</span><br><span> </span><br><span> lchan_fail_to(next_state, "Chan Activ NACK: %s (0x%x)",</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_err_name(lchan->rsl_error_cause), lchan->rsl_error_cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_err_name(lchan->release.rsl_error_cause), lchan->release.rsl_error_cause);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rsl_error_cause = RSL_ERR_IE_NONEXIST;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->release_in_error = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.rsl_error_cause = RSL_ERR_IE_NONEXIST;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.release_in_error = true;</span><br><span> lchan_fail_to(LCHAN_ST_BORKEN, "Chan Activ NACK without cause IE");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->in_release_handler = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.in_release_handler = false;</span><br><span> break;</span><br><span> </span><br><span> case LCHAN_EV_RTP_RELEASED:</span><br><span> case LCHAN_EV_RTP_ERROR:</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->in_release_handler) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.in_release_handler) {</span><br><span> /* Already in release, the RTP is not the initial cause of failure.</span><br><span> * Just ignore. */</span><br><span> return;</span><br><span>@@ -698,7 +698,7 @@</span><br><span> {</span><br><span> int rc;</span><br><span> struct gsm_lchan *lchan = lchan_fi_lchan(fi);</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->release_requested) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.release_requested) {</span><br><span> lchan_fail_to(LCHAN_ST_WAIT_RF_RELEASE_ACK, "Release requested while activating");</span><br><span> return;</span><br><span> }</span><br><span>@@ -789,7 +789,7 @@</span><br><span> </span><br><span> case LCHAN_EV_RTP_RELEASED:</span><br><span> case LCHAN_EV_RTP_ERROR:</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->in_release_handler) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.in_release_handler) {</span><br><span> /* Already in release, the RTP is not the initial cause of failure.</span><br><span> * Just ignore. */</span><br><span> return;</span><br><span>@@ -809,7 +809,7 @@</span><br><span> {</span><br><span> struct gsm_lchan *lchan = lchan_fi_lchan(fi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->release_requested) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.release_requested) {</span><br><span> lchan_fail("Release requested while activating");</span><br><span> return;</span><br><span> }</span><br><span>@@ -896,7 +896,7 @@</span><br><span> </span><br><span> case LCHAN_EV_RTP_RELEASED:</span><br><span> case LCHAN_EV_RTP_ERROR:</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->in_release_handler) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.in_release_handler) {</span><br><span> /* Already in release, the RTP is not the initial cause of failure.</span><br><span> * Just ignore. */</span><br><span> return;</span><br><span>@@ -929,7 +929,7 @@</span><br><span> </span><br><span> static void lchan_do_release(struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.do_rr_release && lchan->sapis[0] != LCHAN_SAPI_UNUSED)</span><br><span> gsm48_send_rr_release(lchan);</span><br><span> </span><br><span> if (lchan->fi_rtp)</span><br><span>@@ -1025,7 +1025,7 @@</span><br><span> switch (event) {</span><br><span> </span><br><span> case LCHAN_EV_RSL_RF_CHAN_REL_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->rsl_error_cause)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.release_in_error)</span><br><span> lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR);</span><br><span> else</span><br><span> lchan_fsm_state_chg(LCHAN_ST_UNUSED);</span><br><span>@@ -1053,7 +1053,7 @@</span><br><span> </span><br><span> case LCHAN_EV_RSL_CHAN_ACTIV_ACK:</span><br><span> /* A late Chan Activ ACK? Release. */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->release_in_error = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.release_in_error = true;</span><br><span> lchan_fsm_state_chg(LCHAN_ST_WAIT_RF_RELEASE_ACK);</span><br><span> return;</span><br><span> </span><br><span>@@ -1064,7 +1064,7 @@</span><br><span> </span><br><span> case LCHAN_EV_RSL_RF_CHAN_REL_ACK:</span><br><span> /* A late Release ACK? */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->release_in_error = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.release_in_error = true;</span><br><span> lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR);</span><br><span> /* TODO: we used to do this only for sysmobts:</span><br><span> int do_free = is_sysmobts_v2(ts->trx->bts);</span><br><span>@@ -1288,7 +1288,7 @@</span><br><span> return 0;</span><br><span> </span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->release_in_error = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.release_in_error = true;</span><br><span> lchan_fail("Timeout");</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -1300,25 +1300,26 @@</span><br><span> if (!lchan || !lchan->fi)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->in_release_handler)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.in_release_handler)</span><br><span> return;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->in_release_handler = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.in_release_handler = true;</span><br><span> </span><br><span> struct osmo_fsm_inst *fi = lchan->fi;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->release_in_error = err;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->rsl_error_cause = cause_rr;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->do_rr_release = do_rr_release;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.release_in_error = err;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.rsl_error_cause = cause_rr;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.do_rr_release = do_rr_release;</span><br><span> </span><br><span> /* States waiting for events will notice the desire to release when done waiting, so it is enough</span><br><span> * to mark for release. */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->release_requested = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.release_requested = true;</span><br><span> </span><br><span> /* If we took the RTP over from another lchan, put it back. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->fi_rtp && lchan->release_in_error)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->fi_rtp && lchan->release.release_in_error)</span><br><span> osmo_fsm_inst_dispatch(lchan->fi_rtp, LCHAN_RTP_EV_ROLLBACK, 0);</span><br><span> </span><br><span> /* But when in error, don't wait for the next state to pick up release_requested. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->release_in_error) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.release_in_error) {</span><br><span> switch (lchan->fi->state) {</span><br><span> default:</span><br><span> /* Normally we signal release in lchan_fsm_wait_rll_rtp_released_onenter(). When</span><br><span>@@ -1343,7 +1344,7 @@</span><br><span> lchan_fsm_state_chg(LCHAN_ST_WAIT_RLL_RTP_RELEASED);</span><br><span> </span><br><span> exit_release_handler:</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->in_release_handler = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.in_release_handler = false;</span><br><span> }</span><br><span> </span><br><span> void lchan_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause)</span><br><span>diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>index bf73429..dd42fc4 100644</span><br><span>--- a/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>@@ -256,7 +256,7 @@</span><br><span> int val;</span><br><span> struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->release_requested) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.release_requested) {</span><br><span> lchan_rtp_fail("Release requested while activating");</span><br><span> return;</span><br><span> }</span><br><span>@@ -324,7 +324,7 @@</span><br><span> struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi);</span><br><span> const struct mgcp_conn_peer *mgw_rtp;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->release_requested) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.release_requested) {</span><br><span> lchan_rtp_fail("Release requested while activating");</span><br><span> return;</span><br><span> }</span><br><span>@@ -439,7 +439,7 @@</span><br><span> struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi);</span><br><span> struct gsm_lchan *old_lchan = lchan->activate.re_use_mgw_endpoint_from_lchan;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->release_requested) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->release.release_requested) {</span><br><span> lchan_rtp_fail("Release requested while activating");</span><br><span> return;</span><br><span> }</span><br><span>@@ -724,7 +724,7 @@</span><br><span> int lchan_rtp_fsm_timer_cb(struct osmo_fsm_inst *fi)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = lchan_rtp_fi_lchan(fi);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->release_in_error = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->release.release_in_error = true;</span><br><span> lchan_rtp_fail("Timeout");</span><br><span> return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11668">change 11668</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/11668"/><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: Icfddc6010e5d7c309f1a7ed3526b5b635ffeaf11 </div>
<div style="display:none"> Gerrit-Change-Number: 11668 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>