<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24584">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: use struct ns2_sns_elems in add/update/remove remote_elems<br><br>Prepare to use the function also with local elems.<br><br>Related: OS#5036<br>Change-Id: I7db43c8dbd5bd7e7b07a7d629d2615bfa18623db<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 47 insertions(+), 41 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/84/24584/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 0c1ca6d..20076ed 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -449,7 +449,8 @@</span><br><span> }</span><br><span> </span><br><span> /* Add a given remote IPv4 element to gprs_sns_state */</span><br><span style="color: hsl(0, 100%, 40%);">-static int add_remote_ip4_elem(struct ns2_sns_state *gss, const struct gprs_ns_ie_ip4_elem *ip4)</span><br><span style="color: hsl(120, 100%, 40%);">+static int add_ip4_elem(struct ns2_sns_state *gss, struct ns2_sns_elems *elems,</span><br><span style="color: hsl(120, 100%, 40%);">+                   const struct gprs_ns_ie_ip4_elem *ip4)</span><br><span> {</span><br><span>  unsigned int i;</span><br><span> </span><br><span>@@ -457,93 +458,98 @@</span><br><span>          return -NS_CAUSE_INVAL_NR_NS_VC;</span><br><span> </span><br><span>         /* check for duplicates */</span><br><span style="color: hsl(0, 100%, 40%);">-      for (i = 0; i < gss->remote.num_ip4; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-               if (memcmp(&gss->remote.ip4[i], ip4, sizeof(*ip4)))</span><br><span style="color: hsl(120, 100%, 40%);">+    for (i = 0; i < elems->num_ip4; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+          if (memcmp(&elems->ip4[i], ip4, sizeof(*ip4)))</span><br><span>                        continue;</span><br><span>            /* TODO: log message duplicate */</span><br><span>            return -NS_CAUSE_PROTO_ERR_UNSPEC;</span><br><span>   }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   gss->remote.ip4 = talloc_realloc(gss, gss->remote.ip4, struct gprs_ns_ie_ip4_elem,</span><br><span style="color: hsl(0, 100%, 40%);">-                                         gss->remote.num_ip4+1);</span><br><span style="color: hsl(0, 100%, 40%);">-     gss->remote.ip4[gss->remote.num_ip4] = *ip4;</span><br><span style="color: hsl(0, 100%, 40%);">-      gss->remote.num_ip4 += 1;</span><br><span style="color: hsl(120, 100%, 40%);">+  elems->ip4 = talloc_realloc(gss, elems->ip4, struct gprs_ns_ie_ip4_elem,</span><br><span style="color: hsl(120, 100%, 40%);">+                                         elems->num_ip4+1);</span><br><span style="color: hsl(120, 100%, 40%);">+        elems->ip4[elems->num_ip4] = *ip4;</span><br><span style="color: hsl(120, 100%, 40%);">+      elems->num_ip4 += 1;</span><br><span>      return 0;</span><br><span> }</span><br><span> </span><br><span> /* Remove a given remote IPv4 element from gprs_sns_state */</span><br><span style="color: hsl(0, 100%, 40%);">-static int remove_remote_ip4_elem(struct ns2_sns_state *gss, const struct gprs_ns_ie_ip4_elem *ip4)</span><br><span style="color: hsl(120, 100%, 40%);">+static int remove_ip4_elem(struct ns2_sns_state *gss, struct ns2_sns_elems *elems,</span><br><span style="color: hsl(120, 100%, 40%);">+                        const struct gprs_ns_ie_ip4_elem *ip4)</span><br><span> {</span><br><span>       unsigned int i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     for (i = 0; i < gss->remote.num_ip4; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-               if (memcmp(&gss->remote.ip4[i], ip4, sizeof(*ip4)))</span><br><span style="color: hsl(120, 100%, 40%);">+    for (i = 0; i < elems->num_ip4; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+          if (memcmp(&elems->ip4[i], ip4, sizeof(*ip4)))</span><br><span>                        continue;</span><br><span>            /* all array elements < i remain as they are; all > i are shifted left by one */</span><br><span style="color: hsl(0, 100%, 40%);">-          memmove(&gss->remote.ip4[i], &gss->remote.ip4[i+1], gss->remote.num_ip4-i-1);</span><br><span style="color: hsl(0, 100%, 40%);">-          gss->remote.num_ip4 -= 1;</span><br><span style="color: hsl(120, 100%, 40%);">+          memmove(&elems->ip4[i], &elems->ip4[i+1], elems->num_ip4-i-1);</span><br><span style="color: hsl(120, 100%, 40%);">+               elems->num_ip4 -= 1;</span><br><span>              return 0;</span><br><span>    }</span><br><span>    return -1;</span><br><span> }</span><br><span> </span><br><span> /* update the weights for specified remote IPv4 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int update_remote_ip4_elem(struct ns2_sns_state *gss, const struct gprs_ns_ie_ip4_elem *ip4)</span><br><span style="color: hsl(120, 100%, 40%);">+static int update_ip4_elem(struct ns2_sns_state *gss, struct ns2_sns_elems *elems,</span><br><span style="color: hsl(120, 100%, 40%);">+                         const struct gprs_ns_ie_ip4_elem *ip4)</span><br><span> {</span><br><span>       unsigned int i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     for (i = 0; i < gss->remote.num_ip4; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-               if (gss->remote.ip4[i].ip_addr != ip4->ip_addr ||</span><br><span style="color: hsl(0, 100%, 40%);">-             gss->remote.ip4[i].udp_port != ip4->udp_port)</span><br><span style="color: hsl(120, 100%, 40%);">+       for (i = 0; i < elems->num_ip4; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+          if (elems->ip4[i].ip_addr != ip4->ip_addr ||</span><br><span style="color: hsl(120, 100%, 40%);">+                elems->ip4[i].udp_port != ip4->udp_port)</span><br><span>                   continue;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           gss->remote.ip4[i].sig_weight = ip4->sig_weight;</span><br><span style="color: hsl(0, 100%, 40%);">-          gss->remote.ip4[i].data_weight = ip4->data_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+              elems->ip4[i].sig_weight = ip4->sig_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+             elems->ip4[i].data_weight = ip4->data_weight;</span><br><span>          return 0;</span><br><span>    }</span><br><span>    return -1;</span><br><span> }</span><br><span> </span><br><span> /* Add a given remote IPv6 element to gprs_sns_state */</span><br><span style="color: hsl(0, 100%, 40%);">-static int add_remote_ip6_elem(struct ns2_sns_state *gss, const struct gprs_ns_ie_ip6_elem *ip6)</span><br><span style="color: hsl(120, 100%, 40%);">+static int add_ip6_elem(struct ns2_sns_state *gss, struct ns2_sns_elems *elems,</span><br><span style="color: hsl(120, 100%, 40%);">+                       const struct gprs_ns_ie_ip6_elem *ip6)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     if (gss->remote.num_ip6 >= gss->num_max_ip6_remote)</span><br><span style="color: hsl(120, 100%, 40%);">+  if (elems->num_ip6 >= gss->num_max_ip6_remote)</span><br><span>              return -NS_CAUSE_INVAL_NR_NS_VC;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    gss->remote.ip6 = talloc_realloc(gss, gss->remote.ip6, struct gprs_ns_ie_ip6_elem,</span><br><span style="color: hsl(0, 100%, 40%);">-                                         gss->remote.num_ip6+1);</span><br><span style="color: hsl(0, 100%, 40%);">-     gss->remote.ip6[gss->remote.num_ip6] = *ip6;</span><br><span style="color: hsl(0, 100%, 40%);">-      gss->remote.num_ip6 += 1;</span><br><span style="color: hsl(120, 100%, 40%);">+  elems->ip6 = talloc_realloc(gss, elems->ip6, struct gprs_ns_ie_ip6_elem,</span><br><span style="color: hsl(120, 100%, 40%);">+                                         elems->num_ip6+1);</span><br><span style="color: hsl(120, 100%, 40%);">+        elems->ip6[elems->num_ip6] = *ip6;</span><br><span style="color: hsl(120, 100%, 40%);">+      elems->num_ip6 += 1;</span><br><span>      return 0;</span><br><span> }</span><br><span> </span><br><span> /* Remove a given remote IPv6 element from gprs_sns_state */</span><br><span style="color: hsl(0, 100%, 40%);">-static int remove_remote_ip6_elem(struct ns2_sns_state *gss, const struct gprs_ns_ie_ip6_elem *ip6)</span><br><span style="color: hsl(120, 100%, 40%);">+static int remove_ip6_elem(struct ns2_sns_state *gss, struct ns2_sns_elems *elems,</span><br><span style="color: hsl(120, 100%, 40%);">+                        const struct gprs_ns_ie_ip6_elem *ip6)</span><br><span> {</span><br><span>       unsigned int i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     for (i = 0; i < gss->remote.num_ip6; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-               if (memcmp(&gss->remote.ip6[i], ip6, sizeof(*ip6)))</span><br><span style="color: hsl(120, 100%, 40%);">+    for (i = 0; i < elems->num_ip6; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+          if (memcmp(&elems->ip6[i], ip6, sizeof(*ip6)))</span><br><span>                        continue;</span><br><span>            /* all array elements < i remain as they are; all > i are shifted left by one */</span><br><span style="color: hsl(0, 100%, 40%);">-          memmove(&gss->remote.ip6[i], &gss->remote.ip6[i+1], gss->remote.num_ip6-i-1);</span><br><span style="color: hsl(0, 100%, 40%);">-          gss->remote.num_ip6 -= 1;</span><br><span style="color: hsl(120, 100%, 40%);">+          memmove(&elems->ip6[i], &elems->ip6[i+1], elems->num_ip6-i-1);</span><br><span style="color: hsl(120, 100%, 40%);">+               elems->num_ip6 -= 1;</span><br><span>              return 0;</span><br><span>    }</span><br><span>    return -1;</span><br><span> }</span><br><span> </span><br><span> /* update the weights for specified remote IPv6 */</span><br><span style="color: hsl(0, 100%, 40%);">-static int update_remote_ip6_elem(struct ns2_sns_state *gss, const struct gprs_ns_ie_ip6_elem *ip6)</span><br><span style="color: hsl(120, 100%, 40%);">+static int update_ip6_elem(struct ns2_sns_state *gss, struct ns2_sns_elems *elems,</span><br><span style="color: hsl(120, 100%, 40%);">+                         const struct gprs_ns_ie_ip6_elem *ip6)</span><br><span> {</span><br><span>       unsigned int i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     for (i = 0; i < gss->remote.num_ip6; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-               if (memcmp(&gss->remote.ip6[i].ip_addr, &ip6->ip_addr, sizeof(ip6->ip_addr)) ||</span><br><span style="color: hsl(0, 100%, 40%);">-                    gss->remote.ip6[i].udp_port != ip6->udp_port)</span><br><span style="color: hsl(120, 100%, 40%);">+       for (i = 0; i < elems->num_ip6; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+          if (memcmp(&elems->ip6[i].ip_addr, &ip6->ip_addr, sizeof(ip6->ip_addr)) ||</span><br><span style="color: hsl(120, 100%, 40%);">+               elems->ip6[i].udp_port != ip6->udp_port)</span><br><span>                   continue;</span><br><span style="color: hsl(0, 100%, 40%);">-               gss->remote.ip6[i].sig_weight = ip6->sig_weight;</span><br><span style="color: hsl(0, 100%, 40%);">-          gss->remote.ip6[i].data_weight = ip6->data_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+              elems->ip6[i].sig_weight = ip6->sig_weight;</span><br><span style="color: hsl(120, 100%, 40%);">+             elems->ip6[i].data_weight = ip6->data_weight;</span><br><span>          return 0;</span><br><span>    }</span><br><span>    return -1;</span><br><span>@@ -566,7 +572,7 @@</span><br><span>      * SNS-ACK PDU with a cause code of "Invalid weights". */</span><br><span> </span><br><span>      if (ip4) {</span><br><span style="color: hsl(0, 100%, 40%);">-              if (update_remote_ip4_elem(gss, ip4))</span><br><span style="color: hsl(120, 100%, 40%);">+         if (update_ip4_elem(gss, &gss->remote, ip4))</span><br><span>                  return -NS_CAUSE_UNKN_IP_EP;</span><br><span> </span><br><span>             /* copy over. Both data structures use network byte order */</span><br><span>@@ -576,7 +582,7 @@</span><br><span>           new_signal = ip4->sig_weight;</span><br><span>             new_data = ip4->data_weight;</span><br><span>      } else if (ip6) {</span><br><span style="color: hsl(0, 100%, 40%);">-               if (update_remote_ip6_elem(gss, ip6))</span><br><span style="color: hsl(120, 100%, 40%);">+         if (update_ip6_elem(gss, &gss->remote, ip6))</span><br><span>                  return -NS_CAUSE_UNKN_IP_EP;</span><br><span> </span><br><span>             /* copy over. Both data structures use network byte order */</span><br><span>@@ -619,14 +625,14 @@</span><br><span>         struct osmo_sockaddr sa = {};</span><br><span> </span><br><span>    if (ip4) {</span><br><span style="color: hsl(0, 100%, 40%);">-              if (remove_remote_ip4_elem(gss, ip4) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+          if (remove_ip4_elem(gss, &gss->remote, ip4) < 0)</span><br><span>                   return -NS_CAUSE_UNKN_IP_EP;</span><br><span>                 /* copy over. Both data structures use network byte order */</span><br><span>                 sa.u.sin.sin_addr.s_addr = ip4->ip_addr;</span><br><span>          sa.u.sin.sin_port = ip4->udp_port;</span><br><span>                sa.u.sin.sin_family = AF_INET;</span><br><span>       } else if (ip6) {</span><br><span style="color: hsl(0, 100%, 40%);">-               if (remove_remote_ip6_elem(gss, ip6))</span><br><span style="color: hsl(120, 100%, 40%);">+         if (remove_ip6_elem(gss, &gss->remote, ip6))</span><br><span>                  return -NS_CAUSE_UNKN_IP_EP;</span><br><span> </span><br><span>             /* copy over. Both data structures use network byte order */</span><br><span>@@ -665,10 +671,10 @@</span><br><span>          * an SNS-ACK PDU with a cause code set to "Invalid number of IP4 Endpoints". */</span><br><span>   switch (gss->ip) {</span><br><span>        case IPv4:</span><br><span style="color: hsl(0, 100%, 40%);">-              rc = add_remote_ip4_elem(gss, ip4);</span><br><span style="color: hsl(120, 100%, 40%);">+           rc = add_ip4_elem(gss, &gss->remote, ip4);</span><br><span>            break;</span><br><span>       case IPv6:</span><br><span style="color: hsl(0, 100%, 40%);">-              rc = add_remote_ip6_elem(gss, ip6);</span><br><span style="color: hsl(120, 100%, 40%);">+           rc = add_ip6_elem(gss, &gss->remote, ip6);</span><br><span>            break;</span><br><span>       default:</span><br><span>             /* the gss->ip is initialized with the bss */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24584">change 24584</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/+/24584"/><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: I7db43c8dbd5bd7e7b07a7d629d2615bfa18623db </div>
<div style="display:none"> Gerrit-Change-Number: 24584 </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>