mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-27 06:14:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

netif: fix the netif's index error

Browse Source 
When using multiple netifs on one hardware interface (e.g. when mapping multiple IP addresses to one hardware interface), if the netif's low-level receive routine cannot decide for the correct netif, here the `netif` parameter may be a default netif, in this case, `p-> if_idx` will get a wrong netif index value. It should be placed after `netif = LWIP_ARP_FILTER_NETIF_FN(p, netif, lwip_htons(type));`.  Filter function can returns the correct netif before assigning `p-> if_idx`.
This commit is contained in:
weycen 2021-09-26 23:05:53 +08:00 committed by Erik Ekman
parent 63d21c53e5
commit 9f7d9170c1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/netif/ethernet.c
View File

@ -96,10 +96,6 @@ ethernet_input(struct pbuf *p, struct netif *netif)
goto free_and_return; goto free_and_return;
} }
if (p->if_idx == NETIF_NO_INDEX) {
p->if_idx = netif_get_index(netif);
}
/* points to packet payload, which starts with an Ethernet header */ /* points to packet payload, which starts with an Ethernet header */
ethhdr = (struct eth_hdr *)p->payload; ethhdr = (struct eth_hdr *)p->payload;
LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE,
@ -143,6 +139,10 @@ ethernet_input(struct pbuf *p, struct netif *netif)
netif = LWIP_ARP_FILTER_NETIF_FN(p, netif, lwip_htons(type)); netif = LWIP_ARP_FILTER_NETIF_FN(p, netif, lwip_htons(type));
#endif /* LWIP_ARP_FILTER_NETIF*/ #endif /* LWIP_ARP_FILTER_NETIF*/
if (p->if_idx == NETIF_NO_INDEX) {
p->if_idx = netif_get_index(netif);
}
if (ethhdr->dest.addr[0] & 1) { if (ethhdr->dest.addr[0] & 1) {
/* this might be a multicast or broadcast packet */ /* this might be a multicast or broadcast packet */
if (ethhdr->dest.addr[0] == LL_IP4_MULTICAST_ADDR_0) { if (ethhdr->dest.addr[0] == LL_IP4_MULTICAST_ADDR_0) {