<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/7839">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Neels Hofmeyr: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gscon: remove dead code<br><br>The state ST_WAIT_MODE_MODIFY_ACK can never be reached by the<br>current FSM model.<br><br>- Remove ST_WAIT_MODE_MODIFY_ACK and all related code<br><br>Change-Id: Iacaae2ee50ca1956066b7dce4517bbc9c2b0897e<br>Related: OS#2762<br>---<br>M include/osmocom/bsc/bsc_subscr_conn_fsm.h<br>M src/libbsc/bsc_subscr_conn_fsm.c<br>2 files changed, 1 insertion(+), 45 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>index 9421528..9498d9f 100644</span><br><span>--- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>+++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>@@ -21,8 +21,6 @@</span><br><span> GSCON_EV_RR_ASS_COMPL,</span><br><span> /* RR ASSIGNMENT FAIL received */</span><br><span> GSCON_EV_RR_ASS_FAIL,</span><br><span style="color: hsl(0, 100%, 40%);">- /* RR MODE MODIFY ACK received */</span><br><span style="color: hsl(0, 100%, 40%);">- GSCON_EV_RR_MODE_MODIFY_ACK,</span><br><span> </span><br><span> /* RSL RLL Release Indication */</span><br><span> GSCON_EV_RLL_REL_IND,</span><br><span>diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/libbsc/bsc_subscr_conn_fsm.c</span><br><span>index 3e0ccc0..176bfbf 100644</span><br><span>--- a/src/libbsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/libbsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -56,8 +56,6 @@</span><br><span> ST_ACTIVE,</span><br><span> /* during assignment; waiting for ASS_CMPL */</span><br><span> ST_WAIT_ASS_CMPL,</span><br><span style="color: hsl(0, 100%, 40%);">- /* during assignment; waiting for MODE_MODIFY_ACK */</span><br><span style="color: hsl(0, 100%, 40%);">- ST_WAIT_MODE_MODIFY_ACK,</span><br><span> /* BSSMAP CLEAR has been received */</span><br><span> ST_CLEARING,</span><br><span> </span><br><span>@@ -99,7 +97,6 @@</span><br><span> </span><br><span> {GSCON_EV_RR_ASS_COMPL, "RR_ASSIGN_COMPL"},</span><br><span> {GSCON_EV_RR_ASS_FAIL, "RR_ASSIGN_FAIL"},</span><br><span style="color: hsl(0, 100%, 40%);">- {GSCON_EV_RR_MODE_MODIFY_ACK, "RR_MODE_MODIFY_ACK"},</span><br><span> {GSCON_EV_RLL_REL_IND, "RLL_RELEASE.ind"},</span><br><span> {GSCON_EV_RSL_CONN_FAIL, "RSL_CONN_FAIL.ind"},</span><br><span> {GSCON_EV_RSL_CLEAR_COMPL, "RSL_CLEAR_COMPLETE"},</span><br><span>@@ -722,39 +719,6 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* We're waiting for a MODE MODIFY ACK from MS + BTS */</span><br><span style="color: hsl(0, 100%, 40%);">-static void gscon_fsm_wait_mode_modify_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_subscriber_connection *conn = fi->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *lchan = conn->lchan;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSCON_EV_RR_MODE_MODIFY_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">- /* we assume that not only have we received the RR MODE_MODIFY_ACK, but</span><br><span style="color: hsl(0, 100%, 40%);">- * actually that also the BTS side of the channel mode has been changed accordingly */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_state_chg(fi, ST_ACTIVE, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: Check if this requires special handling. For now I assume that the send_ass_compl()</span><br><span style="color: hsl(0, 100%, 40%);">- * can be used. But I am not sure. */</span><br><span style="color: hsl(0, 100%, 40%);">- send_ass_compl(lchan, fi, false);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: Do we need to handle DTAP traffic in this state? Maybe yes? Needs to be checked. */</span><br><span style="color: hsl(0, 100%, 40%);">- case GSCON_EV_MO_DTAP:</span><br><span style="color: hsl(0, 100%, 40%);">- forward_dtap(conn, (struct msgb *)data, fi);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSCON_EV_MT_DTAP:</span><br><span style="color: hsl(0, 100%, 40%);">- submit_dtap(conn, (struct msgb *)data, fi);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSCON_EV_TX_SCCP:</span><br><span style="color: hsl(0, 100%, 40%);">- sigtran_send(conn, (struct msgb *)data, fi);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(false);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void gscon_fsm_clearing(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct gsm_subscriber_connection *conn = fi->priv;</span><br><span>@@ -869,7 +833,7 @@</span><br><span> .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_A_ASSIGNMENT_CMD) |</span><br><span> S(GSCON_EV_A_HO_REQ) | S(GSCON_EV_HO_START),</span><br><span> .out_state_mask = S(ST_CLEARING) | S(ST_WAIT_CRCX_BTS) | S(ST_WAIT_ASS_CMPL) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(ST_WAIT_MODE_MODIFY_ACK) | S(ST_WAIT_MO_HO_CMD) | S(ST_WAIT_HO_COMPL),</span><br><span style="color: hsl(120, 100%, 40%);">+ S(ST_WAIT_MO_HO_CMD) | S(ST_WAIT_HO_COMPL),</span><br><span> .action = gscon_fsm_active,</span><br><span> },</span><br><span> [ST_WAIT_CRCX_BTS] = {</span><br><span>@@ -896,12 +860,6 @@</span><br><span> .out_state_mask = S(ST_ACTIVE),</span><br><span> .action = gscon_fsm_wait_crcx_msc,</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- [ST_WAIT_MODE_MODIFY_ACK] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = OSMO_STRINGIFY(WAIT_MODE_MODIFY_ACK),</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = EV_TRANSPARENT_SCCP | S(GSCON_EV_RR_MODE_MODIFY_ACK),</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = S(ST_ACTIVE) | S(ST_CLEARING),</span><br><span style="color: hsl(0, 100%, 40%);">- .action = gscon_fsm_wait_mode_modify_ack,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span> [ST_CLEARING] = {</span><br><span> .name = OSMO_STRINGIFY(CLEARING),</span><br><span> .in_event_mask = S(GSCON_EV_RSL_CLEAR_COMPL),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/7839">change 7839</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/7839"/><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: Iacaae2ee50ca1956066b7dce4517bbc9c2b0897e </div>
<div style="display:none"> Gerrit-Change-Number: 7839 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>