<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-cbc/+/21925">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">smscb_peer_fsm: Accept DELETE event in [almost] all states<br><br>This is required as a DELETE may happen at any point in time,<br>even e.g. in WAIT_WRITE_ACK.<br><br>Change-Id: I39b5a243862f4477ac7b625bb77c5e24b2d54dd2<br>---<br>M src/smscb_peer_fsm.c<br>1 file changed, 39 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c</span><br><span>index 89aad61..69b4418 100644</span><br><span>--- a/src/smscb_peer_fsm.c</span><br><span>+++ b/src/smscb_peer_fsm.c</span><br><span>@@ -345,16 +345,6 @@</span><br><span> cbsp_cbc_client_tx(mp->peer->client.cbsp, cbsp);</span><br><span> osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_STATUS_ACK, 10, T_WAIT_STATUS_ACK);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case SMSCB_E_DELETE: /* send KILL to BSC */</span><br><span style="color: hsl(0, 100%, 40%);">- cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_KILL);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(cbsp);</span><br><span style="color: hsl(0, 100%, 40%);">- cbsp->u.kill.msg_id = mp->cbcmsg->msg.message_id;</span><br><span style="color: hsl(0, 100%, 40%);">- cbsp->u.kill.old_serial_nr = mp->cbcmsg->msg.serial_nr;</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: we assume that the delete will always affect all original cells */</span><br><span style="color: hsl(0, 100%, 40%);">- cbsp_append_cell_list(&cbsp->u.kill.cell_list, cbsp, mp);</span><br><span style="color: hsl(0, 100%, 40%);">- cbsp_cbc_client_tx(mp->peer->client.cbsp, cbsp);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> default:</span><br><span> OSMO_ASSERT(0);</span><br><span> }</span><br><span>@@ -460,6 +450,36 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void smscb_p_fsm_allstate(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_cbsp_decoded *cbsp;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SMSCB_E_DELETE: /* send KILL to BSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (fi->state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case SMSCB_S_DELETED:</span><br><span style="color: hsl(120, 100%, 40%);">+ case SMSCB_S_INIT:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(fi, LOGL_ERROR, "Event %s not permitted\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_event_name(fi->fsm, event));</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ cbsp = osmo_cbsp_decoded_alloc(mp->peer, CBSP_MSGT_KILL);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(cbsp);</span><br><span style="color: hsl(120, 100%, 40%);">+ cbsp->u.kill.msg_id = mp->cbcmsg->msg.message_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ cbsp->u.kill.old_serial_nr = mp->cbcmsg->msg.serial_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: we assume that the delete will always affect all original cells */</span><br><span style="color: hsl(120, 100%, 40%);">+ cbsp_append_cell_list(&cbsp->u.kill.cell_list, cbsp, mp);</span><br><span style="color: hsl(120, 100%, 40%);">+ cbsp_cbc_client_tx(mp->peer->client.cbsp, cbsp);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_DELETE_ACK, 10, T_WAIT_DELETE_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</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 style="color: hsl(120, 100%, 40%);">+</span><br><span> static void smscb_p_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause)</span><br><span> {</span><br><span> struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv;</span><br><span>@@ -478,14 +498,14 @@</span><br><span> .name = "WAIT_WRITE_ACK",</span><br><span> .in_event_mask = S(SMSCB_E_CBSP_WRITE_ACK) |</span><br><span> S(SMSCB_E_CBSP_WRITE_NACK),</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = S(SMSCB_S_ACTIVE),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = S(SMSCB_S_ACTIVE) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(SMSCB_S_WAIT_DELETE_ACK),</span><br><span> .action = smscb_p_fsm_wait_write_ack,</span><br><span> },</span><br><span> [SMSCB_S_ACTIVE] = {</span><br><span> .name = "ACTIVE",</span><br><span> .in_event_mask = S(SMSCB_E_REPLACE) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(SMSCB_E_STATUS) |</span><br><span style="color: hsl(0, 100%, 40%);">- S(SMSCB_E_DELETE),</span><br><span style="color: hsl(120, 100%, 40%);">+ S(SMSCB_E_STATUS),</span><br><span> .out_state_mask = S(SMSCB_S_WAIT_REPLACE_ACK) |</span><br><span> S(SMSCB_S_WAIT_STATUS_ACK) |</span><br><span> S(SMSCB_S_WAIT_DELETE_ACK),</span><br><span>@@ -495,14 +515,16 @@</span><br><span> .name = "WAIT_STATUS_ACK",</span><br><span> .in_event_mask = S(SMSCB_E_CBSP_STATUS_ACK) |</span><br><span> S(SMSCB_E_CBSP_STATUS_NACK),</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = S(SMSCB_S_ACTIVE),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = S(SMSCB_S_ACTIVE) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(SMSCB_S_WAIT_DELETE_ACK),</span><br><span> .action = smscb_p_fsm_wait_status_ack,</span><br><span> },</span><br><span> [SMSCB_S_WAIT_REPLACE_ACK] = {</span><br><span> .name = "WAIT_REPLACE_ACK",</span><br><span> .in_event_mask = S(SMSCB_E_CBSP_REPLACE_ACK) |</span><br><span> S(SMSCB_E_CBSP_REPLACE_NACK),</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = S(SMSCB_S_ACTIVE),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = S(SMSCB_S_ACTIVE) |</span><br><span style="color: hsl(120, 100%, 40%);">+ S(SMSCB_S_WAIT_DELETE_ACK),</span><br><span> .action = smscb_p_fsm_wait_replace_ack,</span><br><span> },</span><br><span> [SMSCB_S_WAIT_DELETE_ACK] = {</span><br><span>@@ -521,6 +543,8 @@</span><br><span> .name = "SMSCB-PEER",</span><br><span> .states = smscb_p_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(smscb_p_fsm_states),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = S(SMSCB_E_DELETE),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_action = smscb_p_fsm_allstate,</span><br><span> .timer_cb = smscb_p_fsm_timer_cb,</span><br><span> .log_subsys = DCBSP,</span><br><span> .event_names = smscb_fsm_event_names,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-cbc/+/21925">change 21925</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/c/osmo-cbc/+/21925"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-cbc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I39b5a243862f4477ac7b625bb77c5e24b2d54dd2 </div>
<div style="display:none"> Gerrit-Change-Number: 21925 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>