<p>Stefan Sperling has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10061">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix support for multiple IPCP in PDP protocol configuration options<br><br>Parse multiple IPCP IEs embedded in Protocol Configuration Options,<br>and return IPCP responses for all of them. Makes the associated<br>TTCN3 GGSN test pass.<br><br>Depends: Ia1410abb216831864042f95679330f4508e1af3d<br>Change-Id: I51ecab4e35f3ee638e68ca773b0da90cc0294ab0<br>Related: OS#3319<br>---<br>M ggsn/ggsn.c<br>1 file changed, 40 insertions(+), 35 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/61/10061/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 b74056f..85f3690 100644</span><br><span>--- a/ggsn/ggsn.c</span><br><span>+++ b/ggsn/ggsn.c</span><br><span>@@ -461,9 +461,9 @@</span><br><span> };</span><br><span> </span><br><span> /* determine if PCO contains given protocol */</span><br><span style="color: hsl(0, 100%, 40%);">-static uint8_t *pco_contains_proto(struct ul255_t *pco, uint16_t prot, size_t prot_minlen)</span><br><span style="color: hsl(120, 100%, 40%);">+static uint8_t *pco_contains_proto(struct ul255_t *pco, size_t offset, uint16_t prot, size_t prot_minlen)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *cur = pco->v + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *cur = pco->v + 1 + offset;</span><br><span> </span><br><span> /* iterate over PCO and check if protocol contained */</span><br><span> while (cur + 3 <= pco->v + pco->l) {</span><br><span>@@ -508,47 +508,52 @@</span><br><span> uint8_t *ipcp;</span><br><span> uint16_t ipcp_len;</span><br><span> uint8_t *len1, *len2, *pco_ipcp;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *start = msg->tail;</span><br><span> unsigned int len_appended;</span><br><span> ptrdiff_t consumed;</span><br><span style="color: hsl(0, 100%, 40%);">- size_t remain;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t remain, offset = 0;</span><br><span> </span><br><span> /* pco_contains_proto() returns a potentially unaligned pointer into pco_req->v (see OS#3194) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!(pco_ipcp = pco_contains_proto(&pdp->pco_req, PCO_P_IPCP, sizeof(struct ipcp_hdr))))</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ pco_ipcp = pco_contains_proto(&pdp->pco_req, offset, PCO_P_IPCP, sizeof(struct ipcp_hdr));</span><br><span style="color: hsl(120, 100%, 40%);">+ while (pco_ipcp) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *start = msg->tail;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ipcp = (pco_ipcp + 3); /* 2=type + 1=len */</span><br><span style="color: hsl(0, 100%, 40%);">- consumed = (ipcp - &pdp->pco_req.v[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- remain = sizeof(pdp->pco_req.v) - consumed;</span><br><span style="color: hsl(0, 100%, 40%);">- 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(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ ipcp = (pco_ipcp + 3); /* 2=type + 1=len */</span><br><span style="color: hsl(120, 100%, 40%);">+ consumed = (ipcp - &pdp->pco_req.v[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ remain = sizeof(pdp->pco_req.v) - consumed;</span><br><span style="color: hsl(120, 100%, 40%);">+ ipcp_len = osmo_load16be(ipcp + 2); /* 1=code + 1=id */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (remain < 0 || remain < ipcp_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Three byte T16L header */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u16(msg, 0x8021); /* IPCP */</span><br><span style="color: hsl(0, 100%, 40%);">- len1 = msgb_put(msg, 1); /* Length of contents: delay */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Three byte T16L header */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u16(msg, 0x8021); /* IPCP */</span><br><span style="color: hsl(120, 100%, 40%);">+ len1 = msgb_put(msg, 1); /* Length of contents: delay */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u8(msg, 0x02); /* ACK */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u8(msg, ipcp[1]); /* ID: Needs to match request */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u8(msg, 0x00); /* Length MSB */</span><br><span style="color: hsl(0, 100%, 40%);">- len2 = msgb_put(msg, 1); /* Length LSB: delay */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(msg, 0x02); /* ACK */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(msg, ipcp[1]); /* ID: Needs to match request */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(msg, 0x00); /* Length MSB */</span><br><span style="color: hsl(120, 100%, 40%);">+ len2 = msgb_put(msg, 1); /* Length LSB: delay */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (dns1->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_PRIMARY_DNS, 4)) {</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u8(msg, 0x81); /* DNS1 Tag */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u8(msg, 2 + dns1->len);/* DNS1 Length, incl. TL */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u32(msg, ntohl(dns1->v4.s_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dns1->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_PRIMARY_DNS, 4)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(msg, 0x81); /* DNS1 Tag */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(msg, 2 + dns1->len);/* DNS1 Length, incl. TL */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u32(msg, ntohl(dns1->v4.s_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dns2->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_SECONDARY_DNS, 4)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(msg, 0x83); /* DNS2 Tag */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u8(msg, 2 + dns2->len);/* DNS2 Length, incl. TL */</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put_u32(msg, ntohl(dns2->v4.s_addr));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* patch in length values */</span><br><span style="color: hsl(120, 100%, 40%);">+ len_appended = msg->tail - start;</span><br><span style="color: hsl(120, 100%, 40%);">+ *len1 = len_appended - 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ *len2 = len_appended - 3;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ offset += 3 + ipcp_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ pco_ipcp = pco_contains_proto(&pdp->pco_req, offset, PCO_P_IPCP, sizeof(struct ipcp_hdr));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (dns2->len == 4 && ipcp_contains_option(ipcp, ipcp_len, IPCP_OPT_SECONDARY_DNS, 4)) {</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u8(msg, 0x83); /* DNS2 Tag */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u8(msg, 2 + dns2->len);/* DNS2 Length, incl. TL */</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_put_u32(msg, ntohl(dns2->v4.s_addr));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* patch in length values */</span><br><span style="color: hsl(0, 100%, 40%);">- len_appended = msg->tail - start;</span><br><span style="color: hsl(0, 100%, 40%);">- *len1 = len_appended - 3;</span><br><span style="color: hsl(0, 100%, 40%);">- *len2 = len_appended - 3;</span><br><span> }</span><br><span> </span><br><span> /* process one PCO request from a MS/UE, putting together the proper responses */</span><br><span>@@ -564,7 +569,7 @@</span><br><span> if (peer_v4)</span><br><span> build_ipcp_pco(apn, pdp, msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pco_contains_proto(&pdp->pco_req, PCO_P_DNS_IPv6_ADDR, 0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pco_contains_proto(&pdp->pco_req, 0, PCO_P_DNS_IPv6_ADDR, 0)) {</span><br><span> for (i = 0; i < ARRAY_SIZE(apn->v6.cfg.dns); i++) {</span><br><span> struct in46_addr *i46a = &apn->v6.cfg.dns[i];</span><br><span> if (i46a->len != 16)</span><br><span>@@ -573,7 +578,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pco_contains_proto(&pdp->pco_req, PCO_P_DNS_IPv4_ADDR, 0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pco_contains_proto(&pdp->pco_req, 0, PCO_P_DNS_IPv4_ADDR, 0)) {</span><br><span> for (i = 0; i < ARRAY_SIZE(apn->v4.cfg.dns); i++) {</span><br><span> struct in46_addr *i46a = &apn->v4.cfg.dns[i];</span><br><span> if (i46a->len != 4)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10061">change 10061</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/10061"/><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: I51ecab4e35f3ee638e68ca773b0da90cc0294ab0 </div>
<div style="display:none"> Gerrit-Change-Number: 10061 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>