Merge branch 'optimization/lwip_dns_ipv4_ipv6_timer' into 'master'

lwip:optimization dns ipv4 ipv6 timer Closes AUD-4073 See merge request espressif/esp-idf!20963
espressif · Dec 5, 2022 · 4bd1e3f · 4bd1e3f
2 parents bcbb6d2 + 7490a15
commit 4bd1e3f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/components/lwip/lwip b/components/lwip/lwip
diff --git a/components/lwip/port/esp32/include/lwipopts.h b/components/lwip/port/esp32/include/lwipopts.h
@@ -1425,10 +1425,24 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
 #define ESP_LWIP_IGMP_TIMERS_ONDEMAND   1
 #define ESP_LWIP_MLD6_TIMERS_ONDEMAND   1
 #define ESP_LWIP_DHCP_FINE_TIMERS_ONDEMAND 1
+#define ESP_LWIP_DNS_TIMERS_ONDEMAND       1
+#if IP_REASSEMBLY
+#define ESP_LWIP_IP4_REASSEMBLY_TIMERS_ONDEMAND 1
+#endif /* IP_REASSEMBLY */
+#if LWIP_IPV6_REASS
+#define ESP_LWIP_IP6_REASSEMBLY_TIMERS_ONDEMAND 1
+#endif /* LWIP_IPV6_REASS */
 #else
 #define ESP_LWIP_IGMP_TIMERS_ONDEMAND   0
 #define ESP_LWIP_MLD6_TIMERS_ONDEMAND   0
 #define ESP_LWIP_DHCP_FINE_TIMERS_ONDEMAND 0
+#define ESP_LWIP_DNS_TIMERS_ONDEMAND    0
+#if IP_REASSEMBLY
+#define ESP_LWIP_IP4_REASSEMBLY_TIMERS_ONDEMAND 0
+#endif /* IP_REASSEMBLY */
+#if LWIP_IPV6_REASS
+#define ESP_LWIP_IP6_REASSEMBLY_TIMERS_ONDEMAND 0
+#endif /* LWIP_IPV6_REASS */
 #endif
 
 /**
+1 −1		.github/workflows/ci-linux.yml
+1 −1		.gitlab-ci.yml
+41 −0		src/core/dns.c
+1 −1		src/core/ipv4/dhcp.c
+38 −0		src/core/ipv4/ip4_frag.c
+36 −1		src/core/ipv6/ip6_frag.c
+3 −3		src/core/timeouts.c
+1 −1		src/include/lwip/opt.h
+8 −0		test/apps/lwipopts.h
+15 −0		test/unit/lwipopts.h