espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-09 15:44:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/support_max_16_sockets' into 'master'

Browse Source 
lwip: support max 16 sockets

Since the customers need more sockets in their application, support max 16 sockets,
in other words, the total socket number of UDP/TCP/RAW sockets should not exceed 16.

See merge request !156
This commit is contained in:
Wu Jian Gang
2016-10-28 15:38:57 +08:00
parent 933b6bd94a 9e7bc900c5
commit 95403b8803
2 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/lwip/Kconfig
View File

@@ -7,7 +7,8 @@ config LWIP_MAX_SOCKETS
help help
Sockets take up a certain amount of memory, and allowing fewer Sockets take up a certain amount of memory, and allowing fewer
sockets to be open at the same time conserves memory. Specify sockets to be open at the same time conserves memory. Specify
the maximum amount of sockets here. the maximum amount of sockets here. The valid value is from 1
to 16.
config LWIP_THREAD_LOCAL_STORAGE_INDEX config LWIP_THREAD_LOCAL_STORAGE_INDEX
int "Index for thread-local-storage pointer for lwip" int "Index for thread-local-storage pointer for lwip"

36
components/lwip/include/lwip/port/lwipopts.h
View File

@@ -95,17 +95,37 @@ extern unsigned long os_random(void);
---------- Internal Memory Pool Sizes ---------- ---------- Internal Memory Pool Sizes ----------
------------------------------------------------ ------------------------------------------------
*/ */
/**
* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP connections.
* (requires the LWIP_TCP option)
*/
#define MEMP_NUM_TCP_PCB 5
/** /**
* MEMP_NUM_NETCONN: the number of struct netconns. * MEMP_NUM_NETCONN: the number of struct netconns.
* (only needed if you use the sequential API, like api_lib.c) * (only needed if you use the sequential API, like api_lib.c)
*/ */
#define MEMP_NUM_NETCONN 10 #define MEMP_NUM_NETCONN CONFIG_LWIP_MAX_SOCKETS
/**
* MEMP_NUM_RAW_PCB: Number of raw connection PCBs
* (requires the LWIP_RAW option)
*/
#define MEMP_NUM_RAW_PCB 16
/**
* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP connections.
* (requires the LWIP_TCP option)
*/
#define MEMP_NUM_TCP_PCB 16
/**
* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP connections.
* (requires the LWIP_TCP option)
*/
#define MEMP_NUM_TCP_PCB_LISTEN 16
/**
* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
* per active UDP "connection".
* (requires the LWIP_UDP option)
*/
#define MEMP_NUM_UDP_PCB 16
/* /*
-------------------------------- --------------------------------
@@ -542,9 +562,9 @@ extern unsigned char misc_prof_get_tcp_snd_buf(void);
* DHCP_DEBUG: Enable debugging in dhcp.c. * DHCP_DEBUG: Enable debugging in dhcp.c.
*/ */
#define DHCP_DEBUG LWIP_DBG_OFF #define DHCP_DEBUG LWIP_DBG_OFF
#define LWIP_DEBUG 0 #define LWIP_DEBUG LWIP_DBG_OFF
#define TCP_DEBUG LWIP_DBG_OFF #define TCP_DEBUG LWIP_DBG_OFF
#define ESP_THREAD_SAFE_DEBUG LWIP_DBG_OFF #define ESP_THREAD_SAFE_DEBUG LWIP_DBG_OFF
#define CHECKSUM_CHECK_UDP 0 #define CHECKSUM_CHECK_UDP 0
#define CHECKSUM_CHECK_IP 0 #define CHECKSUM_CHECK_IP 0