Skip to content

Commit 6aacec4

Browse files
committed
Merge branch 'feature/update_lwip_component' into 'master'
feat(lw-ip): update lw-ip from idf See merge request sdk/ESP8266_RTOS_SDK!1521
2 parents dfea8ba + 0c15844 commit 6aacec4

File tree

3 files changed

+112
-4
lines changed

3 files changed

+112
-4
lines changed

components/lwip/Kconfig

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,20 @@ menu "LWIP"
601601
This would in turn fail the configuration for the whole link.
602602
If your modem is not responding correctly to PPP Phase Network, try to disable IPV6 support.
603603

604+
config LWIP_IPV6_MEMP_NUM_ND6_QUEUE
605+
int "Max number of IPv6 packets to queue during MAC resolution"
606+
range 3 20
607+
default 3
608+
help
609+
Config max number of IPv6 packets to queue during MAC resolution.
610+
611+
config LWIP_IPV6_ND6_NUM_NEIGHBORS
612+
int "Max number of entries in IPv6 neighbor cache"
613+
range 3 10
614+
default 5
615+
help
616+
Config max number of entries in IPv6 neighbor cache
617+
604618
config LWIP_PPP_NOTIFY_PHASE_SUPPORT
605619
bool "Enable Notify Phase Callback"
606620
depends on LWIP_PPP_SUPPORT
@@ -703,4 +717,43 @@ menu "LWIP"
703717
Enable this option allows lwip to check assert.
704718
It is recommended to keep it open, do not close it.
705719

720+
menu "Debug"
721+
722+
config LWIP_NETIF_DEBUG
723+
bool "Enable netif debug messages"
724+
default n
725+
726+
config LWIP_PBUF_DEBUG
727+
bool "Enable pbuf debug messages"
728+
default n
729+
730+
config LWIP_ETHARP_DEBUG
731+
bool "Enable etharp debug messages"
732+
default n
733+
734+
config LWIP_API_LIB_DEBUG
735+
bool "Enable api lib debug messages"
736+
default n
737+
738+
config LWIP_SOCKETS_DEBUG
739+
bool "Enable socket debug messages"
740+
default n
741+
742+
config LWIP_IP_DEBUG
743+
bool "Enable IP debug messages"
744+
default n
745+
746+
config LWIP_ICMP_DEBUG
747+
bool "Enable ICMP debug messages"
748+
default n
749+
750+
config LWIP_IP6_DEBUG
751+
bool "Enable IP6 debug messages"
752+
default n
753+
754+
config LWIP_ICMP6_DEBUG
755+
bool "Enable ICMP6 debug messages"
756+
default n
757+
758+
endmenu #debug
706759
endmenu

components/lwip/port/esp8266/include/lwipopts.h

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,16 @@
736736
*/
737737
#define LWIP_IPV6 CONFIG_LWIP_IPV6
738738

739+
/**
740+
* MEMP_NUM_ND6_QUEUE: Max number of IPv6 packets to queue during MAC resolution.
741+
*/
742+
#define MEMP_NUM_ND6_QUEUE CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE
743+
744+
/**
745+
* LWIP_ND6_NUM_NEIGHBORS: Number of entries in IPv6 neighbor cache
746+
*/
747+
#define LWIP_ND6_NUM_NEIGHBORS CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS
748+
739749
/*
740750
---------------------------------------
741751
---------- Hook options ---------------
@@ -750,37 +760,82 @@
750760
/**
751761
* ETHARP_DEBUG: Enable debugging in etharp.c.
752762
*/
753-
#define ETHARP_DEBUG LWIP_DBG_OFF
763+
#ifdef CONFIG_LWIP_ETHARP_DEBUG
764+
#define ETHARP_DEBUG LWIP_DBG_ON
765+
#else
766+
#define ETHARP_DEBUG LWIP_DBG_OFF
767+
#endif
768+
754769

755770
/**
756771
* NETIF_DEBUG: Enable debugging in netif.c.
757772
*/
773+
#ifdef CONFIG_LWIP_NETIF_DEBUG
774+
#define NETIF_DEBUG LWIP_DBG_ON
775+
#else
758776
#define NETIF_DEBUG LWIP_DBG_OFF
777+
#endif
759778

760779
/**
761780
* PBUF_DEBUG: Enable debugging in pbuf.c.
762781
*/
763-
#define PBUF_DEBUG LWIP_DBG_OFF
782+
#ifdef CONFIG_LWIP_PBUF_DEBUG
783+
#define PBUF_DEBUG LWIP_DBG_ON
784+
#else
785+
#define PBUF_DEBUG LWIP_DBG_OFF
786+
#endif
764787

765788
/**
766789
* API_LIB_DEBUG: Enable debugging in api_lib.c.
767790
*/
768-
#define API_LIB_DEBUG LWIP_DBG_OFF
791+
#ifdef CONFIG_LWIP_API_LIB_DEBUG
792+
#define API_LIB_DEBUG LWIP_DBG_ON
793+
#else
794+
#define API_LIB_DEBUG LWIP_DBG_OFF
795+
#endif
796+
769797

770798
/**
771799
* SOCKETS_DEBUG: Enable debugging in sockets.c.
772800
*/
801+
#ifdef CONFIG_LWIP_SOCKETS_DEBUG
802+
#define SOCKETS_DEBUG LWIP_DBG_ON
803+
#else
773804
#define SOCKETS_DEBUG LWIP_DBG_OFF
805+
#endif
774806

775807
/**
776808
* ICMP_DEBUG: Enable debugging in icmp.c.
777809
*/
810+
#ifdef CONFIG_LWIP_ICMP_DEBUG
811+
#define ICMP_DEBUG LWIP_DBG_ON
812+
#else
778813
#define ICMP_DEBUG LWIP_DBG_OFF
814+
#endif
815+
816+
#ifdef CONFIG_LWIP_ICMP6_DEBUG
817+
#define ICMP6_DEBUG LWIP_DBG_ON
818+
#else
819+
#define ICMP6_DEBUG LWIP_DBG_OFF
820+
#endif
779821

780822
/**
781823
* IP_DEBUG: Enable debugging for IP.
782824
*/
825+
#ifdef CONFIG_LWIP_IP_DEBUG
826+
#define IP_DEBUG LWIP_DBG_ON
827+
#else
783828
#define IP_DEBUG LWIP_DBG_OFF
829+
#endif
830+
831+
/**
832+
* IP_DEBUG: Enable debugging for IP.
833+
*/
834+
#ifdef CONFIG_LWIP_IP6_DEBUG
835+
#define IP6_DEBUG LWIP_DBG_ON
836+
#else
837+
#define IP6_DEBUG LWIP_DBG_OFF
838+
#endif
784839

785840
/**
786841
* MEMP_DEBUG: Enable debugging in memp.c.

0 commit comments

Comments
 (0)