abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 13:34:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support IP_HDRINCL in ip6_output() and ip6_output_hinted(),

Browse Source 
previously only supported in ip6_output_if().
This commit is contained in:
Ivan Delamer 2012-03-02 09:06:57 -07:00
parent c52189557e
commit 5c199483cd
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/ipv6/ip6.c
View File

@ -827,12 +827,23 @@ ip6_output(struct pbuf *p, ip6_addr_t *src, ip6_addr_t *dest,
u8_t hl, u8_t tc, u8_t nexth) u8_t hl, u8_t tc, u8_t nexth)
{ {
struct netif *netif; struct netif *netif;
ip6_addr_t src_addr, dest_addr;
/* pbufs passed to IPv6 must have a ref-count of 1 as their payload pointer /* pbufs passed to IPv6 must have a ref-count of 1 as their payload pointer
gets altered as the packet is passed down the stack */ gets altered as the packet is passed down the stack */
LWIP_ASSERT("p->ref == 1", p->ref == 1); LWIP_ASSERT("p->ref == 1", p->ref == 1);
if ((netif = ip6_route(src, dest)) == NULL) { if (dest != IP_HDRINCL) {
netif = ip6_route(src, dest);
} else {
/* IP header included in p, read addresses. */
ip6hdr = (struct ip6_hdr *)p->payload;
ip6_addr_copy(src_addr, ip6hdr->src);
ip6_addr_copy(dest_addr, ip6hdr->dest);
netif = ip6_route(&src_addr, &dest_addr);
}
if (netif == NULL) {
LWIP_DEBUGF(IP6_DEBUG, ("ip6_output: no route for %"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F"\n", LWIP_DEBUGF(IP6_DEBUG, ("ip6_output: no route for %"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F"\n",
IP6_ADDR_BLOCK1(dest), IP6_ADDR_BLOCK1(dest),
IP6_ADDR_BLOCK2(dest), IP6_ADDR_BLOCK2(dest),
@ -881,7 +892,17 @@ ip6_output_hinted(struct pbuf *p, ip6_addr_t *src, ip6_addr_t *dest,
gets altered as the packet is passed down the stack */ gets altered as the packet is passed down the stack */
LWIP_ASSERT("p->ref == 1", p->ref == 1); LWIP_ASSERT("p->ref == 1", p->ref == 1);
if ((netif = ip6_route(src, dest)) == NULL) { if (dest != IP_HDRINCL) {
netif = ip6_route(src, dest);
} else {
/* IP header included in p, read addresses. */
ip6hdr = (struct ip6_hdr *)p->payload;
ip6_addr_copy(src_addr, ip6hdr->src);
ip6_addr_copy(dest_addr, ip6hdr->dest);
netif = ip6_route(&src_addr, &dest_addr);
}
if (netif == NULL) {
LWIP_DEBUGF(IP6_DEBUG, ("ip6_output: no route for %"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F"\n", LWIP_DEBUGF(IP6_DEBUG, ("ip6_output: no route for %"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F"\n",
IP6_ADDR_BLOCK1(dest), IP6_ADDR_BLOCK1(dest),
IP6_ADDR_BLOCK2(dest), IP6_ADDR_BLOCK2(dest),