Change in ...osmo-ggsn[master]: ggsn: Use structures instead of raw arrays when parsing ipcp_hdr

[pespin]

pespin has uploaded this change for review. ( 
https://gerrit.osmocom.org/c/osmo-ggsn/+/14620


Change subject: ggsn: Use structures instead of raw arrays when parsing ipcp_hdr
......................................................................

ggsn: Use structures instead of raw arrays when parsing ipcp_hdr

We have a structure to handle that data type, so let's use it.

Change-Id: I991e53544b733df7773d66280ffa19a2a5123d97
---
M ggsn/ggsn.c
1 file changed, 8 insertions(+), 8 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/20/14620/1

diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c
index 466f07d..34cab39 100644
--- a/ggsn/ggsn.c
+++ b/ggsn/ggsn.c
@@ -419,13 +419,13 @@
 } __attribute__ ((packed));

 /* determine if IPCP contains given option */
-static const uint8_t *ipcp_contains_option(const uint8_t *ipcp, size_t 
ipcp_len,
+static const uint8_t *ipcp_contains_option(const struct ipcp_hdr *ipcp, size_t 
ipcp_len,
                                           enum ipcp_options opt, size_t 
opt_minlen)
 {
-       const uint8_t *cur_opt = ipcp + sizeof(struct ipcp_hdr);
+       const uint8_t *cur_opt = ipcp->options;

        /* iterate over Options and check if protocol contained */
-       while (cur_opt + sizeof(struct ipcp_option_hdr) <= ipcp + ipcp_len) {
+       while (cur_opt + sizeof(struct ipcp_option_hdr) <= (uint8_t*)ipcp + 
ipcp_len) {
                const struct ipcp_option_hdr *cur_opt_hdr = (const struct 
ipcp_option_hdr *)cur_opt;
                /* length value includes 2 bytes type/length */
                if (cur_opt_hdr->len < sizeof(struct ipcp_option_hdr))
@@ -587,7 +587,7 @@
        const struct in46_addr *dns1 = &apn->v4.cfg.dns[0];
        const struct in46_addr *dns2 = &apn->v4.cfg.dns[1];
        uint8_t *start = resp->tail;
-       const uint8_t *ipcp;
+       const struct ipcp_hdr *ipcp;
        uint16_t ipcp_len;
        uint8_t *len1, *len2;
        unsigned int len_appended;
@@ -599,10 +599,10 @@
                return;
        }

-       ipcp = pco_elem->data;
-       consumed = (ipcp - &pdp->pco_req.v[0]);
+       ipcp = (const struct ipcp_hdr *)pco_elem->data;
+       consumed = (pco_elem->data - &pdp->pco_req.v[0]);
        remain = sizeof(pdp->pco_req.v) - consumed;
-       ipcp_len = osmo_load16be(ipcp + 2); /* 1=code + 1=id */
+       ipcp_len = osmo_load16be(&ipcp->len);
        if (remain < 0 || remain < ipcp_len) {
                LOGPPDP(LOGL_ERROR, pdp, "Malformed IPCP, ignoring\n");
                return;
@@ -613,7 +613,7 @@
        len1 = msgb_put(resp, 1);       /* Length of contents: delay */

        msgb_put_u8(resp, 0x02);        /* ACK */
-       msgb_put_u8(resp, ipcp[1]);     /* ID: Needs to match request */
+       msgb_put_u8(resp, ipcp->id);    /* ID: Needs to match request */
        msgb_put_u8(resp, 0x00);        /* Length MSB */
        len2 = msgb_put(resp, 1);       /* Length LSB: delay */


--
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/14620
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I991e53544b733df7773d66280ffa19a2a5123d97
Gerrit-Change-Number: 14620
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pes...@sysmocom.de>
Gerrit-MessageType: newchange