<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/25145">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: rework sns clean up<br><br>Move the cleanup into it's own state. Also changing the<br>SGSN unconfigured state which won't be triggered when a<br>SIZE is received.<br><br>Change-Id: I2639345fdf3cd300a934238d676c543065ceaa8b<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 33 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/25145/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 b856eab..aee37fa 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -2059,6 +2059,29 @@</span><br><span>  * SGSN role</span><br><span>  ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* cleanup all state. If nsvc is given, don't remove this nsvc. (nsvc is given when a SIZE PDU received) */</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_clear_sgsn(struct ns2_sns_state *gss, struct gprs_ns2_vc *size_nsvc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  struct gprs_ns2_vc *nsvc, *nsvc2;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   ns2_clear_elems(&gss->local);</span><br><span style="color: hsl(120, 100%, 40%);">+  ns2_clear_elems(&gss->remote);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry_safe(nsvc, nsvc2, &gss->nse->nsvc, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+             /* Ignore the NSVC over which the SIZE PDU got received */</span><br><span style="color: hsl(120, 100%, 40%);">+            if (size_nsvc && size_nsvc == nsvc)</span><br><span style="color: hsl(120, 100%, 40%);">+                   continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+           gprs_ns2_free_nsvc(nsvc);</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 style="color: hsl(120, 100%, 40%);">+static void ns2_sns_st_sgsn_unconfigured_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   ns2_clear_sgsn(gss, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void ns2_sns_st_sgsn_unconfigured(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span>       struct ns2_sns_state *gss = (struct ns2_sns_state *) fi->priv;</span><br><span>@@ -2154,6 +2177,7 @@</span><br><span>                              S(GPRS_SNS_ST_SGSN_WAIT_CONFIG),</span><br><span>           .name = "UNCONFIGURED",</span><br><span>            .action = ns2_sns_st_sgsn_unconfigured,</span><br><span style="color: hsl(120, 100%, 40%);">+               .onenter = ns2_sns_st_sgsn_unconfigured_onenter,</span><br><span>     },</span><br><span>   [GPRS_SNS_ST_SGSN_WAIT_CONFIG] = {</span><br><span>           .in_event_mask = S(GPRS_SNS_EV_RX_CONFIG) |</span><br><span>@@ -2167,6 +2191,7 @@</span><br><span>  [GPRS_SNS_ST_SGSN_WAIT_CONFIG_ACK] = {</span><br><span>               .in_event_mask = S(GPRS_SNS_EV_RX_CONFIG_ACK),</span><br><span>               .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) |</span><br><span style="color: hsl(120, 100%, 40%);">+                                 S(GPRS_SNS_ST_SGSN_WAIT_CONFIG) |</span><br><span>                            S(GPRS_SNS_ST_SGSN_WAIT_CONFIG_ACK) |</span><br><span>                                S(GPRS_SNS_ST_CONFIGURED),</span><br><span>                 .name = "SGSN_WAIT_CONFIG_ACK",</span><br><span>@@ -2178,7 +2203,8 @@</span><br><span>                             S(GPRS_SNS_EV_RX_DELETE) |</span><br><span>                           S(GPRS_SNS_EV_RX_CHANGE_WEIGHT) |</span><br><span>                            S(GPRS_SNS_EV_REQ_NSVC_ALIVE),</span><br><span style="color: hsl(0, 100%, 40%);">-         .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED),</span><br><span style="color: hsl(120, 100%, 40%);">+                .out_state_mask = S(GPRS_SNS_ST_UNCONFIGURED) |</span><br><span style="color: hsl(120, 100%, 40%);">+                                 S(GPRS_SNS_ST_SGSN_WAIT_CONFIG),</span><br><span>           .name = "CONFIGURED",</span><br><span>              /* shared with BSS side; once configured there's no difference */</span><br><span>                .action = ns2_sns_st_configured,</span><br><span>@@ -2281,23 +2307,14 @@</span><br><span>           /* perform state reset, if requested */</span><br><span>              flag = *TLVP_VAL(tp, NS_IE_RESET_FLAG);</span><br><span>              if (flag & 1) {</span><br><span style="color: hsl(0, 100%, 40%);">-                     struct gprs_ns2_vc *nsvc, *nsvc2;</span><br><span>                    /* clear all state */</span><br><span style="color: hsl(0, 100%, 40%);">-                   osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_UNCONFIGURED, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+                  /* TODO: ensure gss->sns_nsvc is always the NSVC on which we received the SIZE PDU */</span><br><span>                     gss->N = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                  ns2_clear_elems(&gss->local);</span><br><span style="color: hsl(0, 100%, 40%);">-                    ns2_clear_elems(&gss->remote);</span><br><span style="color: hsl(0, 100%, 40%);">-                   llist_for_each_entry_safe(nsvc, nsvc2, &gss->nse->nsvc, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-                               if (nsvc == gss->sns_nsvc) {</span><br><span style="color: hsl(0, 100%, 40%);">-                                 /* keep the NSVC we need for SNS, but unconfigure it */</span><br><span style="color: hsl(0, 100%, 40%);">-                                 nsvc->sig_weight = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                                        nsvc->data_weight = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                                       ns2_vc_force_unconfigured(nsvc);</span><br><span style="color: hsl(0, 100%, 40%);">-                                } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                                        /* free all other NS-VCs */</span><br><span style="color: hsl(0, 100%, 40%);">-                                     gprs_ns2_free_nsvc(nsvc);</span><br><span style="color: hsl(0, 100%, 40%);">-                               }</span><br><span style="color: hsl(0, 100%, 40%);">-                       }</span><br><span style="color: hsl(120, 100%, 40%);">+                     ns2_clear_sgsn(gss, gss->sns_nsvc);</span><br><span style="color: hsl(120, 100%, 40%);">+                        /* keep the NSVC we need for SNS, but unconfigure it */</span><br><span style="color: hsl(120, 100%, 40%);">+                       gss->sns_nsvc->sig_weight = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+                  gss->sns_nsvc->data_weight = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+                 ns2_vc_force_unconfigured(gss->sns_nsvc);</span><br><span>                         ns2_sns_compute_local_ep_from_binds(fi);</span><br><span>             }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/25145">change 25145</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/+/25145"/><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: I2639345fdf3cd300a934238d676c543065ceaa8b </div>
<div style="display:none"> Gerrit-Change-Number: 25145 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>