<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23406">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: Add some more OSMO_ASSERT about BSS role<br><br>Some functions are only to be called when operating in BSS role,<br>let's enforce that by sprinkling some OSMO_ASSERT() around.<br><br>Related: OS#3373<br>Change-Id: I20d1bd8df62e0bb84696e291756e2d96acf49246<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 17 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/23406/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 9be0909..564ffc7 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -713,15 +713,20 @@</span><br><span> </span><br><span> static void ns2_sns_st_unconfigured(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</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%);">+     OSMO_ASSERT(gss->role == GPRS_SNS_ROLE_BSS);</span><br><span>      /* empty state - SNS Select will start by ns2_sns_st_all_action() */</span><br><span> }</span><br><span> </span><br><span> static void ns2_sns_st_size(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span style="color: hsl(120, 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 gprs_ns2_inst *nsi = nse->nsi;</span><br><span>     struct tlv_parsed *tp = NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+     OSMO_ASSERT(gss->role == GPRS_SNS_ROLE_BSS);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    switch (event) {</span><br><span>     case GPRS_SNS_EV_RX_SIZE_ACK:</span><br><span>                tp = data;</span><br><span>@@ -849,6 +854,8 @@</span><br><span> {</span><br><span>        struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gss->role == GPRS_SNS_ROLE_BSS);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    /* on a generic failure, the timer callback will recover */</span><br><span>  if (old_state != GPRS_SNS_ST_UNCONFIGURED)</span><br><span>           ns2_prim_status_ind(gss->nse, NULL, 0, GPRS_NS2_AFF_CAUSE_SNS_FAILURE);</span><br><span>@@ -890,8 +897,11 @@</span><br><span> </span><br><span> static void ns2_sns_st_config_bss(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   struct tlv_parsed *tp = NULL;</span><br><span style="color: hsl(120, 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 style="color: hsl(120, 100%, 40%);">+      struct tlv_parsed *tp = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       OSMO_ASSERT(gss->role == GPRS_SNS_ROLE_BSS);</span><br><span> </span><br><span>  switch (event) {</span><br><span>     case GPRS_SNS_EV_RX_CONFIG_ACK:</span><br><span>@@ -913,6 +923,8 @@</span><br><span> {</span><br><span>   struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gss->role == GPRS_SNS_ROLE_BSS);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    if (old_state != GPRS_SNS_ST_CONFIG_BSS)</span><br><span>             gss->N = 0;</span><br><span> </span><br><span>@@ -998,6 +1010,8 @@</span><br><span> {</span><br><span>       struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(gss->role == GPRS_SNS_ROLE_BSS);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    if (old_state != GPRS_SNS_ST_CONFIG_SGSN)</span><br><span>            gss->N = 0;</span><br><span> }</span><br><span>@@ -1009,6 +1023,8 @@</span><br><span>  uint8_t cause;</span><br><span>       int rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   OSMO_ASSERT(gss->role == GPRS_SNS_ROLE_BSS);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    switch (event) {</span><br><span>     case GPRS_SNS_EV_RX_CONFIG_END:</span><br><span>      case GPRS_SNS_EV_RX_CONFIG:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23406">change 23406</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/+/23406"/><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: I20d1bd8df62e0bb84696e291756e2d96acf49246 </div>
<div style="display:none"> Gerrit-Change-Number: 23406 </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>