abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-09 00:53:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup: Create new file ip.c and move dual-stack code from ipv4 and ipv6 folder in there

Browse Source
This commit is contained in:
Dirk Ziegelmeier
2016-02-26 23:04:51 +01:00
parent 2dc8f59bf4
commit 70f3e5ed05
6 changed files with 114 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/ipv4/ip4.c
View File

@@ -99,9 +99,6 @@
#define IP_ACCEPT_LINK_LAYER_ADDRESSING 0
#endif /* LWIP_DHCP */
/** Global data for both IPv4 and IPv6 */
struct ip_globals ip_data;
/** The IP header ID of the next outgoing IP packet */
static u16_t ip_id;
@@ -352,26 +349,6 @@ return_noroute:
}
#endif /* IP_FORWARD */
/* If both IP versions are enabled, this function can dispatch packets to the correct one.
* If only IPv4 is enabled, this directly maps at ip4_input.
* May be used as netif input function.
*/
err_t
ip_input(struct pbuf *p, struct netif *inp)
{
#if LWIP_IPV6
if (p != NULL) {
if (IP_HDR_GET_VERSION(p->payload) == 6) {
return ip6_input(p, inp);
}
return ip4_input(p, inp);
}
return ERR_VAL;
#else /* LWIP_IPV6 */
return ip4_input(p, inp);
#endif /* LWIP_IPV6 */
}
/**
* This function is called by the network interface device driver when
* an IP packet is received. The function does the basic checks of the