<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24583">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: refactor ns2_clear_ipv46_entries_local to use new elems functions<br><br>Related: OS#5036<br>Change-Id: I7225f7a4215842f0ea601ce6d9d38220f98f808d<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 10 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/24583/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 66dd421..0c1ca6d 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -295,22 +295,13 @@</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_local(struct ns2_sns_state *gss)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ns2_clear_elems(struct ns2_sns_elems *elems)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  TALLOC_FREE(gss->local.ip4);</span><br><span style="color: hsl(0, 100%, 40%);">- TALLOC_FREE(gss->local.ip6);</span><br><span style="color: hsl(120, 100%, 40%);">+       TALLOC_FREE(elems->ip4);</span><br><span style="color: hsl(120, 100%, 40%);">+   TALLOC_FREE(elems->ip6);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gss->local.num_ip4 = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-      gss->local.num_ip6 = 0;</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%);">-static void ns2_clear_ipv46_entries_remote(struct ns2_sns_state *gss)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-       TALLOC_FREE(gss->remote.ip4);</span><br><span style="color: hsl(0, 100%, 40%);">-        TALLOC_FREE(gss->remote.ip6);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        gss->remote.num_ip4 = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-     gss->remote.num_ip6 = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+   elems->num_ip4 = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+        elems->num_ip6 = 0;</span><br><span> }</span><br><span> </span><br><span> static void ns2_vc_create_ip(struct osmo_fsm_inst *fi, struct gprs_ns2_nse *nse, const struct osmo_sockaddr *remote,</span><br><span>@@ -789,7 +780,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_local(gss);</span><br><span style="color: hsl(120, 100%, 40%);">+   ns2_clear_elems(&gss->local);</span><br><span> </span><br><span>     /* no initial available */</span><br><span>   if (gss->role == GPRS_SNS_ROLE_BSS) {</span><br><span>@@ -1585,8 +1576,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_local(gss);</span><br><span style="color: hsl(0, 100%, 40%);">-             ns2_clear_ipv46_entries_remote(gss);</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> </span><br><span>            /* Choose the next sns endpoint. */</span><br><span>          if (!ns2_sns_bss_valid_configuration(gss)) {</span><br><span>@@ -2282,8 +2273,8 @@</span><br><span>                         /* clear all state */</span><br><span>                        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_local(gss);</span><br><span style="color: hsl(0, 100%, 40%);">-                     ns2_clear_ipv46_entries_remote(gss);</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>                        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/+/24583">change 24583</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/+/24583"/><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: I7225f7a4215842f0ea601ce6d9d38220f98f808d </div>
<div style="display:none"> Gerrit-Change-Number: 24583 </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>