Skip to content

Commit 37dda2c

Browse files
earlephilhowerearlephilhower
committed
Clean up LWIP header, fix missing listen_backlog
There is no actual tcp_listen call, it's a macro which calls tcp_listen_with_backlog. Remove the unused wrapper. Actually set the backlog enable flag in lwipopts.h. Also make debugging a 1 or 0 option to enable/disable all printouts.
1 parent 903aa5a commit 37dda2c

File tree

3 files changed

+32
-35
lines changed

3 files changed

+32
-35
lines changed

‎cores/rp2040/lwip_wrap.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,6 @@ extern "C" {
166166
return __real_tcp_bind(pcb, ipaddr, port);
167167
}
168168

169-
extern struct tcp_pcb *__real_tcp_listen(struct tcp_pcb *pcb);
170-
struct tcp_pcb *__wrap_tcp_listen(struct tcp_pcb *pcb) {
171-
LWIPMutex m;
172-
return __real_tcp_listen(pcb);
173-
}
174-
175169
extern struct tcp_pcb *__real_tcp_listen_with_backlog(struct tcp_pcb *pcb, u8_t backlog);
176170
struct tcp_pcb *__wrap_tcp_listen_with_backlog(struct tcp_pcb *pcb, u8_t backlog) {
177171
LWIPMutex m;

‎include/lwipopts.h‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ extern unsigned long __lwip_rand(void);
3838
#define TCP_MSS 1460
3939
#define TCP_SND_BUF (8 * TCP_MSS)
4040
#define TCP_SND_QUEUELEN ((4 * (TCP_SND_BUF) + (TCP_MSS - 1)) / (TCP_MSS))
41+
#define TCP_LISTEN_BACKLOG 1
42+
#define TCP_DEFAULT_LISTEN_BACKLOG (2 * __LWIP_MEMMULT)
4143
#define LWIP_NETIF_STATUS_CALLBACK 1
4244
#define LWIP_NETIF_LINK_CALLBACK 1
4345
#define LWIP_NETIF_HOSTNAME 1
@@ -80,35 +82,37 @@ extern void __setSystemTime(unsigned long long sec, unsigned long us);
8082
//#define SNTP_SERVER_ADDRESS "pool.ntp.org"
8183
#define SNTP_SERVER_DNS 1
8284

85+
#ifndef LWIP_DEBUG
8386
#define LWIP_DEBUG 0
84-
#define ETHARP_DEBUG LWIP_DBG_OFF
85-
#define NETIF_DEBUG LWIP_DBG_OFF
86-
#define PBUF_DEBUG LWIP_DBG_OFF
87-
#define API_LIB_DEBUG LWIP_DBG_OFF
88-
#define API_MSG_DEBUG LWIP_DBG_OFF
89-
#define SOCKETS_DEBUG LWIP_DBG_OFF
90-
#define ICMP_DEBUG LWIP_DBG_OFF
91-
#define INET_DEBUG LWIP_DBG_OFF
92-
#define IP_DEBUG LWIP_DBG_OFF
93-
#define IP_REASS_DEBUG LWIP_DBG_OFF
94-
#define RAW_DEBUG LWIP_DBG_OFF
95-
#define MEM_DEBUG LWIP_DBG_OFF
96-
#define MEMP_DEBUG LWIP_DBG_OFF
97-
#define SYS_DEBUG LWIP_DBG_OFF
98-
#define TCP_DEBUG LWIP_DBG_OFF
99-
#define TCP_INPUT_DEBUG LWIP_DBG_OFF
100-
#define TCP_OUTPUT_DEBUG LWIP_DBG_OFF
101-
#define TCP_RTO_DEBUG LWIP_DBG_OFF
102-
#define TCP_CWND_DEBUG LWIP_DBG_OFF
103-
#define TCP_WND_DEBUG LWIP_DBG_OFF
104-
#define TCP_FR_DEBUG LWIP_DBG_OFF
105-
#define TCP_QLEN_DEBUG LWIP_DBG_OFF
106-
#define TCP_RST_DEBUG LWIP_DBG_OFF
107-
#define UDP_DEBUG LWIP_DBG_OFF
108-
#define TCPIP_DEBUG LWIP_DBG_OFF
109-
#define PPP_DEBUG LWIP_DBG_OFF
110-
#define SLIP_DEBUG LWIP_DBG_OFF
111-
#define DHCP_DEBUG LWIP_DBG_OFF
87+
#endif
88+
#define ETHARP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
89+
#define NETIF_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
90+
#define PBUF_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
91+
#define API_LIB_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
92+
#define API_MSG_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
93+
#define SOCKETS_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
94+
#define ICMP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
95+
#define INET_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
96+
#define IP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
97+
#define IP_REASS_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
98+
#define RAW_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
99+
#define MEM_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
100+
#define MEMP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
101+
#define SYS_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
102+
#define TCP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
103+
#define TCP_INPUT_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
104+
#define TCP_OUTPUT_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
105+
#define TCP_RTO_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
106+
#define TCP_CWND_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
107+
#define TCP_WND_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
108+
#define TCP_FR_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
109+
#define TCP_QLEN_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
110+
#define TCP_RST_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
111+
#define UDP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
112+
#define TCPIP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
113+
#define PPP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
114+
#define SLIP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
115+
#define DHCP_DEBUG (LWIP_DEBUG ? LWIP_DBG_ON : LWIP_DBG_OFF)
112116

113117
#ifdef __cplusplus
114118
}

‎lib/core_wrap.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
-Wl,--wrap=tcp_arg
2222
-Wl,--wrap=tcp_new
2323
-Wl,--wrap=tcp_bind
24-
-Wl,--wrap=tcp_listen
2524
-Wl,--wrap=tcp_listen_with_backlog
2625
-Wl,--wrap=tcp_accept
2726
-Wl,--wrap=tcp_connect

0 commit comments

Comments
 (0)