<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22828">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nacc_fsm: nacc_fsm: Support receiving Pkt Cell Change Notify in state WAIT_REQUEST_SI<br><br>Similar to what's done in the previous commit, but this time when we are<br>further forward in the resolution process.<br>This can be triggered for instance because we are taking too much time<br>to resolve and MS has timer to retransmit the Pkt cell Change Notify in<br>case no response was received in time.<br><br>This commit fixes osmo-pcu exiting due to ASSERT(0) since the event was<br>already accepted but not being handled in the state function.<br><br>Related: SYS#4909<br>Change-Id: I0c29e5979fec6eebe9dfb151907a4cd2f5e4a737<br>---<br>M src/nacc_fsm.c<br>1 file changed, 32 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c</span><br><span>index 8d5f23d..5bc9c12 100644</span><br><span>--- a/src/nacc_fsm.c</span><br><span>+++ b/src/nacc_fsm.c</span><br><span>@@ -309,6 +309,29 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Called on event NACC_EV_RX_CELL_CHG_NOTIFICATION on states after</span><br><span style="color: hsl(120, 100%, 40%);">+ * WAIT_RESOLVE_RAC_CI. Ignore duplicate messages, transition back if target</span><br><span style="color: hsl(120, 100%, 40%);">+ * cell changed.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static void handle_retrans_pkt_cell_chg_notif(struct nacc_fsm_ctx *ctx, const Packet_Cell_Change_Notification_t *notif)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_rlcmac_bts *bts = ctx->ms->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neigh_cache_entry_key neigh_key;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fill_neigh_key_from_bts_pkt_cell_chg_not(&neigh_key, bts, notif) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPFSML(ctx->fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ notif->Target_Cell.UnionType);</span><br><span style="color: hsl(120, 100%, 40%);">+ nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If tgt cell changed, restart resolving it */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!neigh_cache_entry_key_eq(&ctx->neigh_key, &neigh_key)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx->neigh_key = neigh_key;</span><br><span style="color: hsl(120, 100%, 40%);">+ nacc_fsm_state_chg(ctx->fi, NACC_ST_WAIT_RESOLVE_RAC_CI);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* else: ignore it, it's a dup, carry on what we were doing */</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ////////////////</span><br><span> // FSM states //</span><br><span> ////////////////</span><br><span>@@ -398,28 +421,15 @@</span><br><span> nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void st_wait_resolve_rac_ci(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gprs_rlcmac_bts *bts = ctx->ms->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Cell_Change_Notification_t *notif;</span><br><span style="color: hsl(0, 100%, 40%);">- struct neigh_cache_entry_key neigh_key;</span><br><span style="color: hsl(120, 100%, 40%);">+ const Packet_Cell_Change_Notification_t *notif;</span><br><span> </span><br><span> switch (event) {</span><br><span> case NACC_EV_RX_CELL_CHG_NOTIFICATION:</span><br><span style="color: hsl(0, 100%, 40%);">- notif = (Packet_Cell_Change_Notification_t *)data;</span><br><span style="color: hsl(0, 100%, 40%);">- if (fill_neigh_key_from_bts_pkt_cell_chg_not(&neigh_key, bts, notif) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPFSML(fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n",</span><br><span style="color: hsl(0, 100%, 40%);">- notif->Target_Cell.UnionType);</span><br><span style="color: hsl(0, 100%, 40%);">- nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* If tgt cell changed, restart resolving it */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neigh_cache_entry_key_eq(&ctx->neigh_key, &neigh_key)) {</span><br><span style="color: hsl(0, 100%, 40%);">- ctx->neigh_key = neigh_key;</span><br><span style="color: hsl(0, 100%, 40%);">- nacc_fsm_state_chg(fi, NACC_ST_WAIT_RESOLVE_RAC_CI);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ notif = (const Packet_Cell_Change_Notification_t *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_retrans_pkt_cell_chg_notif(ctx, notif);</span><br><span> break;</span><br><span> case NACC_EV_RX_RAC_CI:</span><br><span> /* Assumption: ctx->cgi_ps has been filled by caller of the event */</span><br><span>@@ -489,9 +499,14 @@</span><br><span> static void st_wait_request_si(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ const Packet_Cell_Change_Notification_t *notif;</span><br><span> struct si_cache_entry *entry;</span><br><span> </span><br><span> switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NACC_EV_RX_CELL_CHG_NOTIFICATION:</span><br><span style="color: hsl(120, 100%, 40%);">+ notif = (const Packet_Cell_Change_Notification_t *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_retrans_pkt_cell_chg_notif(ctx, notif);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case NACC_EV_RX_SI:</span><br><span> entry = (struct si_cache_entry *)data;</span><br><span> /* Copy info since cache can be deleted at any point */</span><br><span>@@ -629,6 +644,7 @@</span><br><span> X(NACC_EV_RX_CELL_CHG_NOTIFICATION) |</span><br><span> X(NACC_EV_RX_SI),</span><br><span> .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NACC_ST_WAIT_RESOLVE_RAC_CI) |</span><br><span> X(NACC_ST_TX_NEIGHBOUR_DATA) |</span><br><span> X(NACC_ST_TX_CELL_CHG_CONTINUE),</span><br><span> .name = "WAIT_REQUEST_SI",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22828">change 22828</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-pcu/+/22828"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0c29e5979fec6eebe9dfb151907a4cd2f5e4a737 </div>
<div style="display:none"> Gerrit-Change-Number: 22828 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>