<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13569">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ggsn: Remove magic numbers from ipcp_contains_option()<br><br>Let's remove some magic numbers and use a data structure instead.<br><br>Change-Id: I5b1abc6f403f85986407e9e8359924dfcb58031a<br>---<br>M ggsn/ggsn.c<br>1 file changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c</span><br><span>index a439d01..59523ac 100644</span><br><span>--- a/ggsn/ggsn.c</span><br><span>+++ b/ggsn/ggsn.c</span><br><span>@@ -419,14 +419,15 @@</span><br><span>       const uint8_t *cur_opt = ipcp + sizeof(struct ipcp_hdr);</span><br><span> </span><br><span>         /* iterate over Options and check if protocol contained */</span><br><span style="color: hsl(0, 100%, 40%);">-      while (cur_opt + 2 <= ipcp + ipcp_len) {</span><br><span style="color: hsl(0, 100%, 40%);">-             uint8_t type = cur_opt[0];</span><br><span style="color: hsl(0, 100%, 40%);">-              uint8_t len = cur_opt[1]; /* length value includes 2 bytes type/length */</span><br><span style="color: hsl(0, 100%, 40%);">-               if (len < 2)</span><br><span style="color: hsl(120, 100%, 40%);">+       while (cur_opt + sizeof(struct ipcp_option_hdr) <= ipcp + ipcp_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+              const struct ipcp_option_hdr *cur_opt_hdr = (const struct ipcp_option_hdr *)cur_opt;</span><br><span style="color: hsl(120, 100%, 40%);">+          /* length value includes 2 bytes type/length */</span><br><span style="color: hsl(120, 100%, 40%);">+               if (cur_opt_hdr->len < sizeof(struct ipcp_option_hdr))</span><br><span>                         return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-            if (type == opt && len >= 2 + opt_minlen)</span><br><span style="color: hsl(120, 100%, 40%);">+          if (cur_opt_hdr->type == opt &&</span><br><span style="color: hsl(120, 100%, 40%);">+                cur_opt_hdr->len >= sizeof(struct ipcp_option_hdr) + opt_minlen)</span><br><span>                   return cur_opt;</span><br><span style="color: hsl(0, 100%, 40%);">-         cur_opt += len;</span><br><span style="color: hsl(120, 100%, 40%);">+               cur_opt += cur_opt_hdr->len;</span><br><span>      }</span><br><span>    return NULL;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13569">change 13569</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/13569"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ggsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5b1abc6f403f85986407e9e8359924dfcb58031a </div>
<div style="display:none"> Gerrit-Change-Number: 13569 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>