<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13609">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ggsn: More logging from PCO handling (e.g. in case of malconfiguration)<br><br>Change-Id: I38c2c4178ff4fd795f54638adec63166b1c0838e<br>---<br>M ggsn/ggsn.c<br>1 file changed, 18 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/09/13609/1</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 d079efe..45026fe 100644</span><br><span>--- a/ggsn/ggsn.c</span><br><span>+++ b/ggsn/ggsn.c</span><br><span>@@ -567,15 +567,19 @@</span><br><span> ptrdiff_t consumed;</span><br><span> size_t remain;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!peer_v4)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!peer_v4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPDP(LOGL_ERROR, pdp, "IPCP but no IPv4 type ?!?\n");</span><br><span> return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> ipcp = pco_elem->data;</span><br><span> consumed = (ipcp - &pdp->pco_req.v[0]);</span><br><span> remain = sizeof(pdp->pco_req.v) - consumed;</span><br><span> ipcp_len = osmo_load16be(ipcp + 2); /* 1=code + 1=id */</span><br><span style="color: hsl(0, 100%, 40%);">- if (remain < 0 || remain < ipcp_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (remain < 0 || remain < ipcp_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPDP(LOGL_ERROR, pdp, "Malformed IPCP, ignoring\n");</span><br><span> return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Three byte T16L header */</span><br><span> msgb_put_u16(resp, 0x8021); /* IPCP */</span><br><span>@@ -608,6 +612,7 @@</span><br><span> const struct apn_ctx *apn, struct pdp_t *pdp)</span><br><span> {</span><br><span> unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *tail = resp->tail;</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(apn->v6.cfg.dns); i++) {</span><br><span> const struct in46_addr *i46a = &apn->v6.cfg.dns[i];</span><br><span>@@ -615,12 +620,15 @@</span><br><span> continue;</span><br><span> msgb_t16lv_put(resp, PCO_P_DNS_IPv6_ADDR, i46a->len, i46a->v6.s6_addr);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (resp->tail == tail)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPDP(LOGL_NOTICE, pdp, "MS requested IPv6 DNS, but APN has none configured\n");</span><br><span> }</span><br><span> </span><br><span> static void process_pco_element_dns_ipv4(const struct pco_element *pco_elem, struct msgb *resp,</span><br><span> const struct apn_ctx *apn, struct pdp_t *pdp)</span><br><span> {</span><br><span> unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *tail = resp->tail;</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(apn->v4.cfg.dns); i++) {</span><br><span> const struct in46_addr *i46a = &apn->v4.cfg.dns[i];</span><br><span>@@ -628,12 +636,17 @@</span><br><span> continue;</span><br><span> msgb_t16lv_put(resp, PCO_P_DNS_IPv4_ADDR, i46a->len, (uint8_t *)&i46a->v4);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (resp->tail == tail)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPDP(LOGL_NOTICE, pdp, "MS requested IPv4 DNS, but APN has none configured\n");</span><br><span> }</span><br><span> </span><br><span> static void process_pco_element(const struct pco_element *pco_elem, struct msgb *resp,</span><br><span> const struct apn_ctx *apn, struct pdp_t *pdp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- switch (ntohs(pco_elem->protocol_id)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t protocol_id = ntohs(pco_elem->protocol_id);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPDP(LOGL_DEBUG, pdp, "PCO Protocol 0x%04x\n", protocol_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (protocol_id) {</span><br><span> case PCO_P_PAP:</span><br><span> process_pco_element_pap(pco_elem, resp, apn, pdp);</span><br><span> break;</span><br><span>@@ -647,6 +660,8 @@</span><br><span> process_pco_element_dns_ipv4(pco_elem, resp, apn, pdp);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPPDP(LOGL_INFO, pdp, "Unknown/Unimplemented PCO Protocol 0x%04x: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ protocol_id, osmo_hexdump_nospc(pco_elem->data, pco_elem->length));</span><br><span> break;</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13609">change 13609</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/13609"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I38c2c4178ff4fd795f54638adec63166b1c0838e </div>
<div style="display:none"> Gerrit-Change-Number: 13609 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>