<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24585">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: move gss->remote specific check out of add_ip4_elem/add_ip6_elem<br><br>Allow to use the add_ip4_elem also with local elemens.<br><br>Related: OS#5036<br>Change-Id: Ib48dfd7567467e60c5af2348924ece5cc6124206<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/24585/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 20076ed..c50b2b9 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -454,15 +454,11 @@</span><br><span> {</span><br><span>     unsigned int i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     if (gss->remote.num_ip4 >= gss->num_max_ip4_remote)</span><br><span style="color: hsl(0, 100%, 40%);">-            return -NS_CAUSE_INVAL_NR_NS_VC;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>     /* check for duplicates */</span><br><span>   for (i = 0; i < elems->num_ip4; i++) {</span><br><span>                 if (memcmp(&elems->ip4[i], ip4, sizeof(*ip4)))</span><br><span>                        continue;</span><br><span style="color: hsl(0, 100%, 40%);">-               /* TODO: log message duplicate */</span><br><span style="color: hsl(0, 100%, 40%);">-               return -NS_CAUSE_PROTO_ERR_UNSPEC;</span><br><span style="color: hsl(120, 100%, 40%);">+            return -1;</span><br><span>   }</span><br><span> </span><br><span>        elems->ip4 = talloc_realloc(gss, elems->ip4, struct gprs_ns_ie_ip4_elem,</span><br><span>@@ -511,8 +507,6 @@</span><br><span> static int add_ip6_elem(struct ns2_sns_state *gss, struct ns2_sns_elems *elems,</span><br><span>                      const struct gprs_ns_ie_ip6_elem *ip6)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     if (elems->num_ip6 >= gss->num_max_ip6_remote)</span><br><span style="color: hsl(0, 100%, 40%);">-         return -NS_CAUSE_INVAL_NR_NS_VC;</span><br><span> </span><br><span>         elems->ip6 = talloc_realloc(gss, elems->ip6, struct gprs_ns_ie_ip6_elem,</span><br><span>                                        elems->num_ip6+1);</span><br><span>@@ -671,9 +665,15 @@</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(120, 100%, 40%);">+            if (gss->remote.num_ip4 >= gss->num_max_ip4_remote)</span><br><span style="color: hsl(120, 100%, 40%);">+                  return -NS_CAUSE_INVAL_NR_NS_VC;</span><br><span style="color: hsl(120, 100%, 40%);">+              /* TODO: log message duplicate */</span><br><span>            rc = add_ip4_elem(gss, &gss->remote, ip4);</span><br><span>            break;</span><br><span>       case IPv6:</span><br><span style="color: hsl(120, 100%, 40%);">+            if (gss->remote.num_ip6 >= gss->num_max_ip6_remote)</span><br><span style="color: hsl(120, 100%, 40%);">+                  return -NS_CAUSE_INVAL_NR_NS_VC;</span><br><span style="color: hsl(120, 100%, 40%);">+              /* TODO: log message duplicate */</span><br><span>            rc = add_ip6_elem(gss, &gss->remote, ip6);</span><br><span>            break;</span><br><span>       default:</span><br><span>@@ -682,7 +682,7 @@</span><br><span>       }</span><br><span> </span><br><span>        if (rc)</span><br><span style="color: hsl(0, 100%, 40%);">-         return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+            return -NS_CAUSE_PROTO_ERR_UNSPEC;</span><br><span> </span><br><span>       /* Upon receiving an SNS-ADD PDU containing an already configured IP endpoint the</span><br><span>     * NSE shall send an SNS-ACK PDU with the cause code "Protocol error -</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24585">change 24585</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/+/24585"/><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: Ib48dfd7567467e60c5af2348924ece5cc6124206 </div>
<div style="display:none"> Gerrit-Change-Number: 24585 </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>