<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25405">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nacc_fsm: Move logic checking if SI is being waited for to a func helper<br><br>We already have a similar function for Neighbor Address Resolution.<br>This way we keep as much as possible internal state related logic into<br>the nacc_fsm.c file.<br><br>Change-Id: I7378939825cc3ec3280f76bc51233c0a172d8a27<br>---<br>M src/gprs_bssgp_rim.c<br>M src/nacc_fsm.c<br>M src/nacc_fsm.h<br>3 files changed, 13 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/05/25405/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs_bssgp_rim.c b/src/gprs_bssgp_rim.c</span><br><span>index c19ed81..f1679a6 100644</span><br><span>--- a/src/gprs_bssgp_rim.c</span><br><span>+++ b/src/gprs_bssgp_rim.c</span><br><span>@@ -158,13 +158,8 @@</span><br><span> </span><br><span>  llist_for_each(tmp, bts_ms_list(bts)) {</span><br><span>              struct GprsMs *ms = llist_entry(tmp, typeof(*ms), list);</span><br><span style="color: hsl(0, 100%, 40%);">-                if (!ms->nacc)</span><br><span style="color: hsl(0, 100%, 40%);">-                       continue;</span><br><span style="color: hsl(0, 100%, 40%);">-               if (ms->nacc->fi->state != NACC_ST_WAIT_REQUEST_SI)</span><br><span style="color: hsl(0, 100%, 40%);">-                    continue;</span><br><span style="color: hsl(0, 100%, 40%);">-               if (osmo_cgi_ps_cmp(&nacc->reprt_cell, &ms->nacc->cgi_ps) != 0)</span><br><span style="color: hsl(0, 100%, 40%);">-                        continue;</span><br><span style="color: hsl(0, 100%, 40%);">-               osmo_fsm_inst_dispatch(ms->nacc->fi, NACC_EV_RX_SI, entry);</span><br><span style="color: hsl(120, 100%, 40%);">+             if (ms->nacc && nacc_fsm_is_waiting_si_resolution(ms->nacc, &nacc->reprt_cell))</span><br><span style="color: hsl(120, 100%, 40%);">+                  osmo_fsm_inst_dispatch(ms->nacc->fi, NACC_EV_RX_SI, entry);</span><br><span>    }</span><br><span>    return 0;</span><br><span> }</span><br><span>diff --git a/src/nacc_fsm.c b/src/nacc_fsm.c</span><br><span>index 19f63e4..5b4c2fb 100644</span><br><span>--- a/src/nacc_fsm.c</span><br><span>+++ b/src/nacc_fsm.c</span><br><span>@@ -888,3 +888,11 @@</span><br><span>           return false;</span><br><span>        return neigh_cache_entry_key_eq(&ctx->neigh_key, neigh_key);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool nacc_fsm_is_waiting_si_resolution(const struct nacc_fsm_ctx *ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+                                   const struct osmo_cell_global_id_ps *cgi_ps)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        if (ctx->fi->state != NACC_ST_WAIT_REQUEST_SI)</span><br><span style="color: hsl(120, 100%, 40%);">+          return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return !osmo_cgi_ps_cmp(&ctx->cgi_ps, cgi_ps);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/nacc_fsm.h b/src/nacc_fsm.h</span><br><span>index 04c9ba4..68ebd52 100644</span><br><span>--- a/src/nacc_fsm.h</span><br><span>+++ b/src/nacc_fsm.h</span><br><span>@@ -72,3 +72,6 @@</span><br><span> </span><br><span> bool nacc_fsm_is_waiting_addr_resolution(const struct nacc_fsm_ctx *ctx,</span><br><span>                                     const 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%);">+bool nacc_fsm_is_waiting_si_resolution(const struct nacc_fsm_ctx *ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+                                   const struct osmo_cell_global_id_ps *cgi_ps);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25405">change 25405</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/+/25405"/><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: I7378939825cc3ec3280f76bc51233c0a172d8a27 </div>
<div style="display:none"> Gerrit-Change-Number: 25405 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>