mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-02-06 18:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug #43094 "The function tcpip_input() forget to handle IPv6"

Browse Source
This commit is contained in:
sg 2015-02-11 21:36:46 +01:00
parent 974a853f40
commit 28783abbe2
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -163,6 +163,9 @@ HISTORY
++ Bugfixes: ++ Bugfixes:
2015-02-11: patch by hichard
* tcpip.c: fixed bug #43094 "The function tcpip_input() forget to handle IPv6"
2014-02-10: Simon Goldschmidt 2014-02-10: Simon Goldschmidt
* netconn API: fixed that netconn_close/netconn_delete still used message passing * netconn API: fixed that netconn_close/netconn_delete still used message passing
for LWIP_TCPIP_CORE_LOCKING==1 for LWIP_TCPIP_CORE_LOCKING==1

7
src/api/tcpip.c
View File

@ -115,7 +115,7 @@ tcpip_thread(void *arg)
} else } else
#endif /* LWIP_ETHERNET */ #endif /* LWIP_ETHERNET */
#if LWIP_IPV6 #if LWIP_IPV6
if ((*((unsigned char *)(msg->msg.inp.p->payload)) & 0xf0) == 0x60) { if (((*(u8_t*)(msg->msg.inp.p->payload)) & 0xf0) == 0x60) {
ip6_input(msg->msg.inp.p, msg->msg.inp.netif); ip6_input(msg->msg.inp.p, msg->msg.inp.netif);
} else } else
#endif /* LWIP_IPV6 */ #endif /* LWIP_IPV6 */
@ -192,6 +192,11 @@ tcpip_input(struct pbuf *p, struct netif *inp)
ret = ethernet_input(p, inp); ret = ethernet_input(p, inp);
} else } else
#endif /* LWIP_ETHERNET */ #endif /* LWIP_ETHERNET */
#if LWIP_IPV6
if (((*(u8_t*)(p->payload)) & 0xf0) == 0x60) {
ret = ip6_input(p, inp);
} else
#endif /* LWIP_IPV6 */
{ {
ret = ip_input(p, inp); ret = ip_input(p, inp);
} }