Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b2ca002

Browse files
ESP-YJMdongheng
authored andcommitted
feat(lwip): Bring lwip sub from esp-idf
Commit ID: 785cc699
1 parent c6aefa9 commit b2ca002

File tree

396 files changed

+5316
-129728
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+5316
-129728
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,7 @@
55
[submodule "components/mbedtls/mbedtls"]
66
path = components/mbedtls/mbedtls
77
url = ../../espressif/mbedtls.git
8+
9+
[submodule "components/lwip/lwip"]
10+
path = components/lwip/lwip
11+
url = ../../espressif/esp-lwip.git

components/lwip/CMakeLists.txt

Lines changed: 144 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,153 @@
1-
set(COMPONENT_ADD_INCLUDEDIRS
2-
"include/lwip"
3-
"include/lwip/apps"
4-
"lwip/src/include"
5-
"lwip/src/include/posix"
6-
"port/esp8266/include"
7-
"port/esp8266/include/port"
1+
set(include_dirs
2+
include/apps
3+
include/apps/sntp
4+
lwip/src/include
5+
port/esp32/include
6+
port/esp32/include/arch
87
)
98

10-
set(COMPONENT_SRCDIRS
11-
"apps/dhcpserver"
12-
"apps/multi-threads"
13-
"apps/ping"
14-
"lwip/src/api"
15-
"lwip/src/apps/sntp"
16-
"lwip/src/core"
17-
"lwip/src/core/ipv4"
18-
"lwip/src/core/ipv6"
19-
"lwip/src/netif"
20-
"port/esp8266/freertos"
21-
"port/esp8266/netif"
22-
)
9+
set(srcs
10+
"apps/dhcpserver/dhcpserver.c"
11+
"apps/ping/esp_ping.c"
12+
"apps/ping/ping.c"
13+
"apps/ping/ping_sock.c"
14+
"apps/sntp/sntp.c"
15+
"lwip/src/api/api_lib.c"
16+
"lwip/src/api/api_msg.c"
17+
"lwip/src/api/err.c"
18+
"lwip/src/api/if_api.c"
19+
"lwip/src/api/netbuf.c"
20+
"lwip/src/api/netdb.c"
21+
"lwip/src/api/netifapi.c"
22+
"lwip/src/api/sockets.c"
23+
"lwip/src/api/tcpip.c"
24+
"lwip/src/apps/sntp/sntp.c"
25+
"lwip/src/apps/netbiosns/netbiosns.c"
26+
"lwip/src/core/def.c"
27+
"lwip/src/core/dns.c"
28+
"lwip/src/core/inet_chksum.c"
29+
"lwip/src/core/init.c"
30+
"lwip/src/core/ip.c"
31+
"lwip/src/core/mem.c"
32+
"lwip/src/core/memp.c"
33+
"lwip/src/core/netif.c"
34+
"lwip/src/core/pbuf.c"
35+
"lwip/src/core/raw.c"
36+
"lwip/src/core/stats.c"
37+
"lwip/src/core/sys.c"
38+
"lwip/src/core/tcp.c"
39+
"lwip/src/core/tcp_in.c"
40+
"lwip/src/core/tcp_out.c"
41+
"lwip/src/core/timeouts.c"
42+
"lwip/src/core/udp.c"
43+
"lwip/src/core/ipv4/autoip.c"
44+
"lwip/src/core/ipv4/dhcp.c"
45+
"lwip/src/core/ipv4/etharp.c"
46+
"lwip/src/core/ipv4/icmp.c"
47+
"lwip/src/core/ipv4/igmp.c"
48+
"lwip/src/core/ipv4/ip4.c"
49+
"lwip/src/core/ipv4/ip4_addr.c"
50+
"lwip/src/core/ipv4/ip4_frag.c"
51+
"lwip/src/core/ipv6/dhcp6.c"
52+
"lwip/src/core/ipv6/ethip6.c"
53+
"lwip/src/core/ipv6/icmp6.c"
54+
"lwip/src/core/ipv6/inet6.c"
55+
"lwip/src/core/ipv6/ip6.c"
56+
"lwip/src/core/ipv6/ip6_addr.c"
57+
"lwip/src/core/ipv6/ip6_frag.c"
58+
"lwip/src/core/ipv6/mld6.c"
59+
"lwip/src/core/ipv6/nd6.c"
60+
"lwip/src/netif/ethernet.c"
61+
"lwip/src/netif/lowpan6.c"
62+
"lwip/src/netif/slipif.c"
63+
"lwip/src/netif/ppp/auth.c"
64+
"lwip/src/netif/ppp/ccp.c"
65+
"lwip/src/netif/ppp/chap-md5.c"
66+
"lwip/src/netif/ppp/chap-new.c"
67+
"lwip/src/netif/ppp/chap_ms.c"
68+
"lwip/src/netif/ppp/demand.c"
69+
"lwip/src/netif/ppp/eap.c"
70+
"lwip/src/netif/ppp/ecp.c"
71+
"lwip/src/netif/ppp/eui64.c"
72+
"lwip/src/netif/ppp/fsm.c"
73+
"lwip/src/netif/ppp/ipcp.c"
74+
"lwip/src/netif/ppp/ipv6cp.c"
75+
"lwip/src/netif/ppp/lcp.c"
76+
"lwip/src/netif/ppp/magic.c"
77+
"lwip/src/netif/ppp/mppe.c"
78+
"lwip/src/netif/ppp/multilink.c"
79+
"lwip/src/netif/ppp/ppp.c"
80+
"lwip/src/netif/ppp/pppapi.c"
81+
"lwip/src/netif/ppp/pppcrypt.c"
82+
"lwip/src/netif/ppp/pppoe.c"
83+
"lwip/src/netif/ppp/pppol2tp.c"
84+
"lwip/src/netif/ppp/pppos.c"
85+
"lwip/src/netif/ppp/upap.c"
86+
"lwip/src/netif/ppp/utils.c"
87+
"lwip/src/netif/ppp/vj.c"
88+
"port/esp32/vfs_lwip.c"
89+
"port/esp32/debug/lwip_debug.c"
90+
"port/esp32/freertos/sys_arch.c"
91+
"port/esp32/netif/dhcp_state.c"
92+
"port/esp32/netif/nettestif.c"
93+
"port/esp32/netif/wlanif.c")
2394

24-
if(CONFIG_LWIP_SOCKET_MULTITHREAD)
25-
set(COMPONENT_OBJEXCLUDE lwip/src/api/sockets.c)
95+
if(CONFIG_LWIP_PPP_SUPPORT)
96+
list(APPEND srcs
97+
"lwip/src/netif/ppp/auth.c"
98+
"lwip/src/netif/ppp/ccp.c"
99+
"lwip/src/netif/ppp/chap-md5.c"
100+
"lwip/src/netif/ppp/chap-new.c"
101+
"lwip/src/netif/ppp/chap_ms.c"
102+
"lwip/src/netif/ppp/demand.c"
103+
"lwip/src/netif/ppp/eap.c"
104+
"lwip/src/netif/ppp/ecp.c"
105+
"lwip/src/netif/ppp/eui64.c"
106+
"lwip/src/netif/ppp/fsm.c"
107+
"lwip/src/netif/ppp/ipcp.c"
108+
"lwip/src/netif/ppp/ipv6cp.c"
109+
"lwip/src/netif/ppp/lcp.c"
110+
"lwip/src/netif/ppp/magic.c"
111+
"lwip/src/netif/ppp/mppe.c"
112+
"lwip/src/netif/ppp/multilink.c"
113+
"lwip/src/netif/ppp/ppp.c"
114+
"lwip/src/netif/ppp/pppapi.c"
115+
"lwip/src/netif/ppp/pppcrypt.c"
116+
"lwip/src/netif/ppp/pppoe.c"
117+
"lwip/src/netif/ppp/pppol2tp.c"
118+
"lwip/src/netif/ppp/pppos.c"
119+
"lwip/src/netif/ppp/upap.c"
120+
"lwip/src/netif/ppp/utils.c"
121+
"lwip/src/netif/ppp/vj.c"
122+
"lwip/src/netif/ppp/polarssl/arc4.c"
123+
"lwip/src/netif/ppp/polarssl/des.c"
124+
"lwip/src/netif/ppp/polarssl/md4.c"
125+
"lwip/src/netif/ppp/polarssl/md5.c"
126+
"lwip/src/netif/ppp/polarssl/sha1.c")
26127
endif()
27128

28-
if(CONFIG_USING_ESP_VFS)
29-
set(COMPONENT_SRCDIRS ${COMPONENT_SRCDIRS} "port")
129+
if(CONFIG_ETH_ENABLED)
130+
list(APPEND srcs "port/esp32/netif/ethernetif.c")
30131
endif()
31132

32-
set(COMPONENT_REQUIRES vfs)
33-
set(COMPONENT_PRIV_REQUIRES tcpip_adapter)
34-
35-
set(COMPONENT_ADD_LDFRAGMENTS "linker.lf")
36-
37-
register_component()
133+
idf_component_register(SRCS "${srcs}"
134+
INCLUDE_DIRS "${include_dirs}"
135+
LDFRAGMENTS linker.lf
136+
REQUIRES vfs esp_wifi
137+
PRIV_REQUIRES ${priv_requires} esp_eth tcpip_adapter nvs_flash)
38138

39-
component_compile_options(-Wno-address)
139+
# lots of LWIP source files evaluate macros that check address of stack variables
140+
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-address)
40141

41-
# patch around warnings in third-party files
42-
set_source_files_properties(lwip/src/apps/sntp/sntp.c lwip/src/core/ipv4/ip4.c
43-
PROPERTIES COMPILE_FLAGS
44-
-Wno-implicit-function-declaration
45-
)
142+
if(GCC_NOT_5_2_0)
143+
set_source_files_properties(
144+
lwip/src/netif/ppp/ppp.c
145+
PROPERTIES COMPILE_FLAGS
146+
-Wno-uninitialized
147+
)
148+
set_source_files_properties(
149+
lwip/src/netif/ppp/pppos.c
150+
PROPERTIES COMPILE_FLAGS
151+
-Wno-implicit-fallthrough
152+
)
153+
endif()

0 commit comments

Comments
 (0)