<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22859">View Change</a></p><div style="white-space:pre-wrap">Approvals:
daniel: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nacc_fsm: Support receiving Pkt Cell Chg Notif while in some advanced states<br><br>Related: SYS#4909<br>Change-Id: Iee9cb67bf2c0c6f36b788498f4ef2672e33204b7<br>---<br>M src/nacc_fsm.c<br>1 file changed, 31 insertions(+), 3 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 5bc9c12..3afa8b5 100644</span><br><span>--- a/src/nacc_fsm.c</span><br><span>+++ b/src/nacc_fsm.c</span><br><span>@@ -321,7 +321,8 @@</span><br><span> if (fill_neigh_key_from_bts_pkt_cell_chg_not(&neigh_key, bts, notif) < 0) {</span><br><span> LOGPFSML(ctx->fi, LOGL_NOTICE, "TargetCell type=0x%x not supported\n",</span><br><span> notif->Target_Cell.UnionType);</span><br><span style="color: hsl(0, 100%, 40%);">- nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ctx->fi->state != NACC_ST_TX_CELL_CHG_CONTINUE)</span><br><span style="color: hsl(120, 100%, 40%);">+ nacc_fsm_state_chg(ctx->fi, NACC_ST_TX_CELL_CHG_CONTINUE);</span><br><span> return;</span><br><span> }</span><br><span> /* If tgt cell changed, restart resolving it */</span><br><span>@@ -520,19 +521,29 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* st_tx_neighbour_data_on_enter:</span><br><span style="color: hsl(0, 100%, 40%);">- * At this point, we already received all required SI information to send stored</span><br><span style="color: hsl(120, 100%, 40%);">+/* At this point, we already received all required SI information to send stored</span><br><span> * in struct nacc_fsm_ctx. We now wait for scheduler to ask us to construct</span><br><span> * RLCMAC DL CTRL messages to move FSM states forward</span><br><span> */</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_tx_neighbour_data_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nacc_fsm_ctx *ctx = (struct nacc_fsm_ctx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx->si_info_bytes_sent = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx->container_idx = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> static void st_tx_neighbour_data(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 nacc_ev_create_rlcmac_msg_ctx *data_ctx;</span><br><span> bool all_si_info_sent;</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_CREATE_RLCMAC_MSG:</span><br><span> data_ctx = (struct nacc_ev_create_rlcmac_msg_ctx *)data;</span><br><span> data_ctx->msg = create_packet_neighbour_cell_data(ctx, data_ctx->tbf, &all_si_info_sent);</span><br><span>@@ -557,9 +568,14 @@</span><br><span> static void st_cell_chg_continue(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 nacc_ev_create_rlcmac_msg_ctx *data_ctx;</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_CREATE_RLCMAC_MSG:</span><br><span> data_ctx = (struct nacc_ev_create_rlcmac_msg_ctx *)data;</span><br><span> data_ctx->msg = create_packet_cell_chg_continue(ctx, data_ctx, &ctx->continue_poll_fn);</span><br><span>@@ -575,7 +591,14 @@</span><br><span> </span><br><span> static void st_wait_cell_chg_continue_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ 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 style="color: hsl(120, 100%, 40%);">+</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_TIMEOUT_CELL_CHG_CONTINUE:</span><br><span> nacc_fsm_state_chg(fi, NACC_ST_TX_CELL_CHG_CONTINUE);</span><br><span> break;</span><br><span>@@ -656,8 +679,10 @@</span><br><span> X(NACC_EV_RX_CELL_CHG_NOTIFICATION) |</span><br><span> X(NACC_EV_CREATE_RLCMAC_MSG),</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_CELL_CHG_CONTINUE),</span><br><span> .name = "TX_NEIGHBOUR_DATA",</span><br><span style="color: hsl(120, 100%, 40%);">+ .onenter = st_tx_neighbour_data_on_enter,</span><br><span> .action = st_tx_neighbour_data,</span><br><span> },</span><br><span> [NACC_ST_TX_CELL_CHG_CONTINUE] = {</span><br><span>@@ -665,15 +690,18 @@</span><br><span> X(NACC_EV_RX_CELL_CHG_NOTIFICATION) |</span><br><span> X(NACC_EV_CREATE_RLCMAC_MSG),</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_WAIT_CELL_CHG_CONTINUE_ACK),</span><br><span> .name = "TX_CELL_CHG_CONTINUE",</span><br><span> .action = st_cell_chg_continue,</span><br><span> },</span><br><span> [NACC_ST_WAIT_CELL_CHG_CONTINUE_ACK] = {</span><br><span> .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+ X(NACC_EV_RX_CELL_CHG_NOTIFICATION) |</span><br><span> X(NACC_EV_RX_CELL_CHG_CONTINUE_ACK) |</span><br><span> X(NACC_EV_TIMEOUT_CELL_CHG_CONTINUE),</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_CELL_CHG_CONTINUE) |</span><br><span> X(NACC_ST_DONE),</span><br><span> .name = "WAIT_CELL_CHG_CONTINUE_ACK",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22859">change 22859</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/+/22859"/><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: Iee9cb67bf2c0c6f36b788498f4ef2672e33204b7 </div>
<div style="display:none"> Gerrit-Change-Number: 22859 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>