<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23247">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: Split allstate action in generic and BSS-specific part<br><br>Related: OS#3373<br>Change-Id: Icd40bd76df12795b4efcaf5865c6cf00da145f94<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 50 insertions(+), 37 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/47/23247/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gb/gprs_ns2_sns.c b/src/gb/gprs_ns2_sns.c</span><br><span>index e008d0f..c47004c 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -1385,49 +1385,14 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* common allstate-action for both roles */</span><br><span> static void ns2_sns_st_all_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span> struct gprs_ns2_nse *nse = nse_inst_from_fi(fi);</span><br><span> struct ns2_sns_bind *sbind;</span><br><span> struct gprs_ns2_vc *nsvc, *nsvc2;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* reset when receiving GPRS_SNS_EV_REQ_NO_NSVC */</span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_REQ_NO_NSVC:</span><br><span style="color: hsl(0, 100%, 40%);">- /* ignore reselection running */</span><br><span style="color: hsl(0, 100%, 40%);">- if (gss->reselection_running)</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%);">- LOGPFSML(fi, LOGL_ERROR, "NSE %d: no remaining NSVC, resetting SNS FSM\n", nse->nsei);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GPRS_SNS_EV_REQ_SELECT_ENDPOINT:</span><br><span style="color: hsl(0, 100%, 40%);">- /* tear down previous state</span><br><span style="color: hsl(0, 100%, 40%);">- * gprs_ns2_free_nsvcs() will trigger NO_NSVC, prevent this from triggering a reselection */</span><br><span style="color: hsl(0, 100%, 40%);">- gss->reselection_running = true;</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ns2_free_nsvcs(nse);</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_clear_ipv46_entries(gss);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Choose the next sns endpoint. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (llist_empty(&gss->sns_endpoints) || llist_empty(&gss->binds)) {</span><br><span style="color: hsl(0, 100%, 40%);">- gss->initial = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_UNCONFIGURED, 0, 3);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (!gss->initial) {</span><br><span style="color: hsl(0, 100%, 40%);">- gss->initial = llist_first_entry(&gss->sns_endpoints, struct sns_endpoint, list);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (gss->initial->list.next == &gss->sns_endpoints) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* last entry, continue with first */</span><br><span style="color: hsl(0, 100%, 40%);">- gss->initial = llist_first_entry(&gss->sns_endpoints, struct sns_endpoint, list);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* next element is an entry */</span><br><span style="color: hsl(0, 100%, 40%);">- gss->initial = llist_entry(gss->initial->list.next, struct sns_endpoint, list);</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%);">- gss->reselection_running = false;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_SIZE, nse->nsi->timeout[NS_TOUT_TSNS_PROV], 1);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> case GPRS_SNS_EV_REQ_ADD_BIND:</span><br><span> sbind = data;</span><br><span> switch (fi->state) {</span><br><span>@@ -1475,6 +1440,54 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* allstate-action for BSS role */</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_sns_st_all_action_bss(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 ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gprs_ns2_nse *nse = nse_inst_from_fi(fi);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* reset when receiving GPRS_SNS_EV_REQ_NO_NSVC */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_REQ_NO_NSVC:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ignore reselection running */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gss->reselection_running)</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%);">+ LOGPFSML(fi, LOGL_ERROR, "NSE %d: no remaining NSVC, resetting SNS FSM\n", nse->nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_SELECT_ENDPOINT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GPRS_SNS_EV_REQ_SELECT_ENDPOINT:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* tear down previous state</span><br><span style="color: hsl(120, 100%, 40%);">+ * gprs_ns2_free_nsvcs() will trigger NO_NSVC, prevent this from triggering a reselection */</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->reselection_running = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ns2_free_nsvcs(nse);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_clear_ipv46_entries(gss);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Choose the next sns endpoint. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&gss->sns_endpoints) || llist_empty(&gss->binds)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->initial = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_NO_ENDPOINTS);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_UNCONFIGURED, 0, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (!gss->initial) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->initial = llist_first_entry(&gss->sns_endpoints, struct sns_endpoint, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (gss->initial->list.next == &gss->sns_endpoints) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* last entry, continue with first */</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->initial = llist_first_entry(&gss->sns_endpoints, struct sns_endpoint, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* next element is an entry */</span><br><span style="color: hsl(120, 100%, 40%);">+ gss->initial = llist_entry(gss->initial->list.next, struct sns_endpoint, list);</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%);">+ gss->reselection_running = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_SIZE, nse->nsi->timeout[NS_TOUT_TSNS_PROV], 1);</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%);">+ ns2_sns_st_all_action(fi, event, data);</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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static struct osmo_fsm gprs_ns2_sns_bss_fsm = {</span><br><span> .name = "GPRS-NS2-SNS-BSS",</span><br><span> .states = ns2_sns_bss_states,</span><br><span>@@ -1483,7 +1496,7 @@</span><br><span> S(GPRS_SNS_EV_REQ_SELECT_ENDPOINT) |</span><br><span> S(GPRS_SNS_EV_REQ_ADD_BIND) |</span><br><span> S(GPRS_SNS_EV_REQ_DELETE_BIND),</span><br><span style="color: hsl(0, 100%, 40%);">- .allstate_action = ns2_sns_st_all_action,</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_action = ns2_sns_st_all_action_bss,</span><br><span> .cleanup = NULL,</span><br><span> .timer_cb = ns2_sns_fsm_bss_timer_cb,</span><br><span> .event_names = gprs_sns_event_names,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23247">change 23247</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/libosmocore/+/23247"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Icd40bd76df12795b4efcaf5865c6cf00da145f94 </div>
<div style="display:none"> Gerrit-Change-Number: 23247 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>