From 6f311db07e87323d442ad19fb3834bda2acc7ae2 Mon Sep 17 00:00:00 2001 From: xueyunfei Date: Tue, 3 Jan 2023 17:10:16 +0800 Subject: [PATCH] lwip: solve some routers do not forward multicast packet issue --- .../esp_netif/include/esp_netif_defaults.h | 8 ++- .../esp_netif/include/esp_netif_types.h | 1 + components/esp_netif/lwip/esp_netif_lwip.c | 49 +++++++++++++++++++ components/lwip/Kconfig | 18 +++++++ components/lwip/port/esp32/include/lwipopts.h | 9 ++++ 5 files changed, 84 insertions(+), 1 deletion(-) diff --git a/components/esp_netif/include/esp_netif_defaults.h b/components/esp_netif/include/esp_netif_defaults.h index 90fbca16dd..e94a9745ea 100644 --- a/components/esp_netif/include/esp_netif_defaults.h +++ b/components/esp_netif/include/esp_netif_defaults.h @@ -17,9 +17,15 @@ extern "C" { // Macros to assemble master configs with partial configs from netif, stack and driver // +#ifdef CONFIG_LWIP_ESP_MLDV6_REPORT +#define ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS (ESP_NETIF_FLAG_MLDV6_REPORT) +#else +#define ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS (0) +#endif + #define ESP_NETIF_INHERENT_DEFAULT_WIFI_STA() \ { \ - .flags = (esp_netif_flags_t)(ESP_NETIF_DHCP_CLIENT | ESP_NETIF_FLAG_GARP | ESP_NETIF_FLAG_EVENT_IP_MODIFIED), \ + .flags = (esp_netif_flags_t)(ESP_NETIF_DHCP_CLIENT | ESP_NETIF_FLAG_GARP | ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS | ESP_NETIF_FLAG_EVENT_IP_MODIFIED), \ ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(mac) \ ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(ip_info) \ .get_ip_event = IP_EVENT_STA_GOT_IP, \ diff --git a/components/esp_netif/include/esp_netif_types.h b/components/esp_netif/include/esp_netif_types.h index de7f7579fc..7560fb18cd 100644 --- a/components/esp_netif/include/esp_netif_types.h +++ b/components/esp_netif/include/esp_netif_types.h @@ -160,6 +160,7 @@ typedef enum esp_netif_flags { ESP_NETIF_FLAG_EVENT_IP_MODIFIED = 1 << 4, ESP_NETIF_FLAG_IS_PPP = 1 << 5, ESP_NETIF_FLAG_IS_BRIDGE = 1 << 6, + ESP_NETIF_FLAG_MLDV6_REPORT = 1 << 7, } esp_netif_flags_t; typedef enum esp_netif_ip_event_type { diff --git a/components/esp_netif/lwip/esp_netif_lwip.c b/components/esp_netif/lwip/esp_netif_lwip.c index 300f30bcad..d6bbd733ed 100644 --- a/components/esp_netif/lwip/esp_netif_lwip.c +++ b/components/esp_netif/lwip/esp_netif_lwip.c @@ -24,6 +24,7 @@ #include "lwip/ip_addr.h" #include "lwip/ip6_addr.h" #include "lwip/mld6.h" +#include "lwip/prot/mld6.h" #include "lwip/nd6.h" #include "lwip/snmp.h" #include "lwip/priv/tcpip_priv.h" @@ -115,6 +116,8 @@ static netif_ext_callback_t netif_callback = { .callback_fn = NULL, .next = NULL static void esp_netif_internal_dhcpc_cb(struct netif *netif); #if LWIP_IPV6 static void esp_netif_internal_nd6_cb(struct netif *p_netif, uint8_t ip_index); +static void netif_set_mldv6_flag(struct netif *netif); +static void netif_unset_mldv6_flag(struct netif *netif); #endif /* LWIP_IPV6 */ static void netif_callback_fn(struct netif* netif, netif_nsc_reason_t reason, const netif_ext_callback_args_t* args) @@ -709,6 +712,11 @@ static void esp_netif_lwip_remove(esp_netif_t *esp_netif) if (esp_netif->flags & ESP_NETIF_FLAG_GARP) { netif_unset_garp_flag(esp_netif->lwip_netif); } +#endif +#if ESP_MLDV6_REPORT && LWIP_IPV6 + if (esp_netif->flags & ESP_NETIF_FLAG_MLDV6_REPORT) { + netif_unset_mldv6_flag(esp_netif->lwip_netif); + } #endif if (esp_netif->flags & ESP_NETIF_DHCP_CLIENT) { dhcp_cleanup(esp_netif->lwip_netif); @@ -1500,6 +1508,11 @@ static esp_err_t esp_netif_down_api(esp_netif_api_msg_t *msg) esp_netif_reset_ip_info(esp_netif); } #if CONFIG_LWIP_IPV6 +#if ESP_MLDV6_REPORT + if (esp_netif->flags & ESP_NETIF_FLAG_MLDV6_REPORT) { + netif_unset_mldv6_flag(esp_netif->lwip_netif); + } +#endif for(int8_t i = 0 ;i < LWIP_IPV6_NUM_ADDRESSES ;i++) { netif_ip6_addr_set(lwip_netif, i, IP6_ADDR_ANY6); netif_ip6_addr_set_valid_life(lwip_netif, i, 0); @@ -1807,6 +1820,34 @@ esp_err_t esp_netif_get_dns_info(esp_netif_t *esp_netif, esp_netif_dns_type_t ty } #if CONFIG_LWIP_IPV6 + +#ifdef CONFIG_LWIP_MLDV6_TMR_INTERVAL + +static void netif_send_mldv6(void *arg) +{ + struct netif *netif = arg; + if (!netif_is_up(netif)) { + return; + } + mld6_report_groups(netif); + sys_timeout(CONFIG_LWIP_MLDV6_TMR_INTERVAL*1000, netif_send_mldv6, netif); +} + +static void netif_set_mldv6_flag(struct netif *netif) +{ + if (!netif_is_up(netif)) { + return; + } + sys_timeout(CONFIG_LWIP_MLDV6_TMR_INTERVAL*1000, netif_send_mldv6, netif); +} + +static void netif_unset_mldv6_flag(struct netif *netif) +{ + sys_untimeout(netif_send_mldv6, netif); +} + +#endif + esp_ip6_addr_type_t esp_netif_ip6_get_addr_type(esp_ip6_addr_t* ip6_addr) { ip6_addr_t* lwip_ip6_info = (ip6_addr_t*)ip6_addr; @@ -1847,6 +1888,14 @@ static void esp_netif_internal_nd6_cb(struct netif *netif, uint8_t ip_index) ip6_info.ip.zone = 0; // zero out zone, as not used in lwip #endif /* LWIP_IPV6_SCOPES */ + if (esp_netif->flags&ESP_NETIF_FLAG_MLDV6_REPORT) { +#if ESP_MLDV6_REPORT + netif_set_mldv6_flag(netif); +#else + ESP_LOGW(TAG,"CONFIG_LWIP_ESP_MLDV6_REPORT not enabled, but esp-netif configured with ESP_NETIF_FLAG_MLDV6_REPORT"); +#endif + } + memcpy(&evt.ip6_info, &ip6_info, sizeof(esp_netif_ip6_info_t)); int ret = esp_event_post(IP_EVENT, IP_EVENT_GOT_IP6, &evt, sizeof(evt), 0); if (ESP_OK != ret) { diff --git a/components/lwip/Kconfig b/components/lwip/Kconfig index d26af23c4b..646e3c0d2e 100644 --- a/components/lwip/Kconfig +++ b/components/lwip/Kconfig @@ -200,6 +200,24 @@ menu "LWIP" help Set the timer interval for gratuitous ARP. The default value is 60s + config LWIP_ESP_MLDV6_REPORT + bool "Send mldv6 report periodically" + depends on LWIP_IPV6 + default y + help + Enable this option allows to send mldv6 report periodically. + + This option solve the issue that failed to receive multicast data. + Some routers fail to forward multicast packets. + To solve this problem, send multicast mdlv6 report to routers regularly. + + config LWIP_MLDV6_TMR_INTERVAL + int "mldv6 report timer interval(seconds)" + default 40 + depends on LWIP_ESP_MLDV6_REPORT + help + Set the timer interval for mldv6 report. The default value is 30s + config LWIP_TCPIP_RECVMBOX_SIZE int "TCPIP task receive mail box size" default 32 diff --git a/components/lwip/port/esp32/include/lwipopts.h b/components/lwip/port/esp32/include/lwipopts.h index 2a9d29fedc..a189a092a4 100644 --- a/components/lwip/port/esp32/include/lwipopts.h +++ b/components/lwip/port/esp32/include/lwipopts.h @@ -1455,6 +1455,15 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min) #define ESP_GRATUITOUS_ARP 0 #endif +/** + * ESP_MLDV6_REPORT==1: This option allows to send mldv6 report periodically. + */ +#ifdef CONFIG_LWIP_ESP_MLDV6_REPORT +#define ESP_MLDV6_REPORT 1 +#else +#define ESP_MLDV6_REPORT 0 +#endif + #define ESP_LWIP 1 #define ESP_LWIP_ARP 1 #define ESP_PER_SOC_TCP_WND 0