<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24586">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gprs_ns2_sns: add check for duplicates to add_ip6_elem()<br><br>The ip4 version already checks for duplicates.<br><br>Related: OS#5036<br>Change-Id: I4a1528ea3427946ce465085919b2b522d3cedd07<br>---<br>M src/gb/gprs_ns2_sns.c<br>1 file changed, 8 insertions(+), 3 deletions(-)<br><br></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 c50b2b9..1204266 100644</span><br><span>--- a/src/gb/gprs_ns2_sns.c</span><br><span>+++ b/src/gb/gprs_ns2_sns.c</span><br><span>@@ -452,10 +452,8 @@</span><br><span> static int add_ip4_elem(struct ns2_sns_state *gss, struct ns2_sns_elems *elems,</span><br><span> const struct gprs_ns_ie_ip4_elem *ip4)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* check for duplicates */</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < elems->num_ip4; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (unsigned int 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> return -1;</span><br><span>@@ -507,6 +505,13 @@</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(120, 100%, 40%);">+ /* check for duplicates */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (unsigned int 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 style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24586">change 24586</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/+/24586"/><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: I4a1528ea3427946ce465085919b2b522d3cedd07 </div>
<div style="display:none"> Gerrit-Change-Number: 24586 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>