espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-07-18 11:36:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(lwip): fix the bug that ip_route get wrong netif

Browse Source
This commit is contained in:
Zhang Jun Hao
2018-07-18 17:19:40 +08:00
parent a29928dee5
commit 2b17b7280f
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/lwip/port/esp8266/include/lwipopts.h
View File

@ -1867,6 +1867,8 @@
--------------------------------------- ---------------------------------------
*/ */
#define LWIP_HOOK_IP4_ROUTE_SRC ip4_route_src_hook
/** /**
* @defgroup lwip_opts_hooks Hooks * @defgroup lwip_opts_hooks Hooks
* @ingroup lwip_opts_infrastructure * @ingroup lwip_opts_infrastructure

26
components/tcpip_adapter/tcpip_adapter_lwip.c
View File

@ -24,6 +24,7 @@
#include "lwip/dhcp.h" #include "lwip/dhcp.h"
#include "lwip/dns.h" #include "lwip/dns.h"
#include "lwip/errno.h" #include "lwip/errno.h"
#include "lwip/timeouts.h"
#include "lwip/prot/dhcp.h" #include "lwip/prot/dhcp.h"
#include "netif/etharp.h" #include "netif/etharp.h"
#include "esp_wifi.h" #include "esp_wifi.h"
@ -50,7 +51,6 @@ static tcpip_adapter_ip_info_t esp_ip_old[TCPIP_ADAPTER_IF_MAX];
/*TODO need add ip6*/ /*TODO need add ip6*/
static tcpip_adapter_ip6_info_t esp_ip6[TCPIP_ADAPTER_IF_MAX]; static tcpip_adapter_ip6_info_t esp_ip6[TCPIP_ADAPTER_IF_MAX];
#endif #endif
static netif_init_fn esp_netif_init_fn[TCPIP_ADAPTER_IF_MAX];
static tcpip_adapter_ip_lost_timer_t esp_ip_lost_timer[TCPIP_ADAPTER_IF_MAX]; static tcpip_adapter_ip_lost_timer_t esp_ip_lost_timer[TCPIP_ADAPTER_IF_MAX];
static tcpip_adapter_dhcp_status_t dhcps_status = TCPIP_ADAPTER_DHCP_INIT; static tcpip_adapter_dhcp_status_t dhcps_status = TCPIP_ADAPTER_DHCP_INIT;
@ -1095,4 +1095,28 @@ esp_err_t tcpip_adapter_get_netif(tcpip_adapter_if_t tcpip_if, void ** netif)
return ESP_OK; return ESP_OK;
} }
struct netif* ip4_route_src_hook(const ip4_addr_t* dest, const ip4_addr_t* src)
{
/* destination IP is broadcast IP? */
if ((src != NULL) && (dest->addr == IPADDR_BROADCAST)) {
if (esp_netif[TCPIP_ADAPTER_IF_STA] != NULL
&& netif_is_up(esp_netif[TCPIP_ADAPTER_IF_STA])
&& netif_is_link_up(esp_netif[TCPIP_ADAPTER_IF_STA])
&& !ip4_addr_isany_val(*netif_ip4_addr(esp_netif[TCPIP_ADAPTER_IF_STA]))
&& ip4_addr_cmp(src, netif_ip4_addr(esp_netif[TCPIP_ADAPTER_IF_STA]))) {
return esp_netif[TCPIP_ADAPTER_IF_STA];
}
if (esp_netif[TCPIP_ADAPTER_IF_AP] != NULL
&& netif_is_up(esp_netif[TCPIP_ADAPTER_IF_AP])
&& netif_is_link_up(esp_netif[TCPIP_ADAPTER_IF_AP])
&& !ip4_addr_isany_val(*netif_ip4_addr(esp_netif[TCPIP_ADAPTER_IF_AP]))
&& ip4_addr_cmp(src, netif_ip4_addr(esp_netif[TCPIP_ADAPTER_IF_AP]))) {
return esp_netif[TCPIP_ADAPTER_IF_AP];
}
}
return NULL;
}
#endif /* CONFIG_TCPIP_LWIP */ #endif /* CONFIG_TCPIP_LWIP */