<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/23409">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: Don't clear remote IP endpoints in SGSN role<br><br>In BSS role, we can clear local + remote endpoints when sending<br>SNS-CONFIG, as we are first.<br><br>In SGSN role, we must not clear remote endpoints when sending<br>SNS-CONFIG, as we are last, and the BSS has just previously told<br>us its IP endpoints in the BSS-originated SNS-CONFIG.<br><br>Change-Id: I58549707ac5a3a0aae5f9348ed76f16c09ad3e46<br>Related: OS#3373<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 15 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/23409/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 564ffc7..e60664b 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -297,16 +297,21 @@</span><br><span>        osmo_fsm_inst_dispatch(fi, GPRS_SNS_EV_REQ_NO_NSVC, NULL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ns2_clear_ipv46_entries(struct ns2_sns_state *gss)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_clear_ipv46_entries_local(struct ns2_sns_state *gss)</span><br><span> {</span><br><span>         TALLOC_FREE(gss->ip4_local);</span><br><span style="color: hsl(0, 100%, 40%);">- TALLOC_FREE(gss->ip4_remote);</span><br><span>     TALLOC_FREE(gss->ip6_local);</span><br><span style="color: hsl(0, 100%, 40%);">- TALLOC_FREE(gss->ip6_remote);</span><br><span> </span><br><span>         gss->num_ip4_local = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-      gss->num_ip4_remote = 0;</span><br><span>  gss->num_ip6_local = 0;</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_clear_ipv46_entries_remote(struct ns2_sns_state *gss)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+     TALLOC_FREE(gss->ip4_remote);</span><br><span style="color: hsl(120, 100%, 40%);">+      TALLOC_FREE(gss->ip6_remote);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    gss->num_ip4_remote = 0;</span><br><span>  gss->num_ip6_remote = 0;</span><br><span> }</span><br><span> </span><br><span>@@ -756,7 +761,7 @@</span><br><span>   struct osmo_sockaddr local;</span><br><span>  int count;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  ns2_clear_ipv46_entries(gss);</span><br><span style="color: hsl(120, 100%, 40%);">+ ns2_clear_ipv46_entries_local(gss);</span><br><span> </span><br><span>      /* no initial available */</span><br><span>   if (gss->role == GPRS_SNS_ROLE_BSS) {</span><br><span>@@ -1489,7 +1494,8 @@</span><br><span>              * gprs_ns2_free_nsvcs() will trigger NO_NSVC, prevent this from triggering a reselection */</span><br><span>                 gss->reselection_running = true;</span><br><span>          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(120, 100%, 40%);">+         ns2_clear_ipv46_entries_local(gss);</span><br><span style="color: hsl(120, 100%, 40%);">+           ns2_clear_ipv46_entries_remote(gss);</span><br><span> </span><br><span>             /* Choose the next sns endpoint. */</span><br><span>          if (llist_empty(&gss->sns_endpoints) || llist_empty(&gss->binds)) {</span><br><span>@@ -2132,8 +2138,10 @@</span><br><span>           if (flag & 1) {</span><br><span>                  struct gprs_ns2_vc *nsvc, *nsvc2;</span><br><span>                    /* clear all state */</span><br><span style="color: hsl(120, 100%, 40%);">+                 osmo_fsm_inst_state_chg(fi, GPRS_SNS_ST_UNCONFIGURED, 0, 0);</span><br><span>                         gss->N = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                  ns2_clear_ipv46_entries(gss);</span><br><span style="color: hsl(120, 100%, 40%);">+                 ns2_clear_ipv46_entries_local(gss);</span><br><span style="color: hsl(120, 100%, 40%);">+                   ns2_clear_ipv46_entries_remote(gss);</span><br><span>                         llist_for_each_entry_safe(nsvc, nsvc2, &gss->nse->nsvc, list) {</span><br><span>                            if (nsvc == gss->sns_nsvc) {</span><br><span>                                      /* keep the NSVC we need for SNS, but unconfigure it */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/23409">change 23409</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/+/23409"/><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: I58549707ac5a3a0aae5f9348ed76f16c09ad3e46 </div>
<div style="display:none"> Gerrit-Change-Number: 23409 </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>