From a20e4c121844362ae7b048af36da37af7ed46718 Mon Sep 17 00:00:00 2001 From: zhangjunhao Date: Fri, 20 Apr 2018 12:08:53 +0800 Subject: [PATCH] feat(lwip): Redefine lwip file structure --- .../core => apps/dhcpserver}/dhcpserver.c | 2 +- .../api => apps}/multi-threads/sockets_mt.c | 0 .../{source/apps => apps/sntp}/sntp_time.c | 2 +- .../lwip/{source/apps => apps/sntp}/time.c | 4 +- components/lwip/component.mk | 7 +- .../{lwip => apps/dhcpserver}/dhcpserver.h | 0 .../{lwip => apps}/multi-threads/sockets_mt.h | 0 .../include/lwip/apps/{ => sntp}/sntp_time.h | 0 .../lwip/include/lwip/apps/{ => sntp}/time.h | 0 .../lwip/include/lwip/{ => port}/arch/cc.h | 0 .../lwip/include/lwip/{ => port}/arch/perf.h | 0 .../include/lwip/{ => port}/arch/sys_arch.h | 0 .../lwip/include/lwip/{ => port}/lwipopts.h | 0 .../lwip/{source => lwip/src}/api/api_lib.c | 0 .../lwip/{source => lwip/src}/api/api_msg.c | 0 .../lwip/{source => lwip/src}/api/err.c | 0 .../lwip/{source => lwip/src}/api/netbuf.c | 0 .../lwip/{source => lwip/src}/api/netdb.c | 0 .../lwip/{source => lwip/src}/api/netifapi.c | 0 .../lwip/{source => lwip/src}/api/sockets.c | 0 .../lwip/{source => lwip/src}/api/tcpip.c | 0 .../core => lwip/src/apps}/snmp/asn1_dec.c | 0 .../core => lwip/src/apps}/snmp/asn1_enc.c | 0 .../core => lwip/src/apps}/snmp/mib2.c | 0 .../core => lwip/src/apps}/snmp/mib_structs.c | 0 .../core => lwip/src/apps}/snmp/msg_in.c | 0 .../core => lwip/src/apps}/snmp/msg_out.c | 0 .../apps => lwip/src/apps/sntp}/sntp.c | 0 .../lwip/{source => lwip/src/core}/FILES | 0 .../lwip/{source => lwip/src}/core/def.c | 0 .../lwip/{source => lwip/src}/core/dns.c | 0 .../{source => lwip/src}/core/inet_chksum.c | 0 .../lwip/{source => lwip/src}/core/init.c | 0 .../{source => lwip/src}/core/ipv4/autoip.c | 0 .../core => lwip/src/core/ipv4}/dhcp.c | 0 .../netif => lwip/src/core/ipv4}/etharp.c | 0 .../{source => lwip/src}/core/ipv4/icmp.c | 0 .../{source => lwip/src}/core/ipv4/igmp.c | 0 .../lwip/{source => lwip/src}/core/ipv4/ip4.c | 0 .../{source => lwip/src}/core/ipv4/ip4_addr.c | 0 .../{source => lwip/src}/core/ipv4/ip_frag.c | 0 .../{source => lwip/src}/core/ipv6/README | 0 .../{source => lwip/src}/core/ipv6/dhcp6.c | 0 .../{source => lwip/src}/core/ipv6/ethip6.c | 0 .../{source => lwip/src}/core/ipv6/icmp6.c | 0 .../{source => lwip/src}/core/ipv6/inet6.c | 0 .../lwip/{source => lwip/src}/core/ipv6/ip6.c | 0 .../{source => lwip/src}/core/ipv6/ip6_addr.c | 0 .../{source => lwip/src}/core/ipv6/ip6_frag.c | 0 .../{source => lwip/src}/core/ipv6/mld6.c | 0 .../lwip/{source => lwip/src}/core/ipv6/nd6.c | 0 .../lwip/{source => lwip/src}/core/mem.c | 0 .../lwip/{source => lwip/src}/core/memp.c | 0 .../lwip/{source => lwip/src}/core/netif.c | 0 .../lwip/{source => lwip/src}/core/pbuf.c | 0 .../lwip/{source => lwip/src}/core/raw.c | 0 .../lwip/{source => lwip/src}/core/stats.c | 0 .../lwip/{source => lwip/src}/core/sys.c | 0 .../lwip/{source => lwip/src}/core/tcp.c | 0 .../lwip/{source => lwip/src}/core/tcp_in.c | 0 .../lwip/{source => lwip/src}/core/tcp_out.c | 0 .../lwip/{source => lwip/src}/core/timers.c | 0 .../lwip/{source => lwip/src}/core/udp.c | 0 .../{ => lwip/src}/include/lwip/apps/sntp.h | 0 .../src}/include/lwip/apps/sntp_opts.h | 0 .../ipv4 => lwip/src/include}/lwip/autoip.h | 0 .../ipv6 => lwip/src/include}/lwip/dhcp6.h | 0 .../ipv6 => lwip/src/include}/lwip/ethip6.h | 0 .../ipv4 => lwip/src/include}/lwip/icmp.h | 0 .../ipv6 => lwip/src/include}/lwip/icmp6.h | 0 .../ipv4 => lwip/src/include}/lwip/igmp.h | 0 .../ipv4 => lwip/src/include}/lwip/inet.h | 0 .../ipv6 => lwip/src/include}/lwip/inet6.h | 0 .../lwip/ipv4 => lwip/src/include}/lwip/ip4.h | 0 .../ipv4 => lwip/src/include}/lwip/ip4_addr.h | 0 .../lwip/ipv6 => lwip/src/include}/lwip/ip6.h | 0 .../ipv6 => lwip/src/include}/lwip/ip6_addr.h | 0 .../ipv6 => lwip/src/include}/lwip/ip6_frag.h | 0 .../ipv4 => lwip/src/include}/lwip/ip_frag.h | 0 .../{ => lwip/src}/include/lwip/lwip/api.h | 0 .../src}/include/lwip/lwip/api_msg.h | 0 .../{ => lwip/src}/include/lwip/lwip/arch.h | 0 .../{ => lwip/src}/include/lwip/lwip/debug.h | 0 .../{ => lwip/src}/include/lwip/lwip/def.h | 0 .../{ => lwip/src}/include/lwip/lwip/dhcp.h | 0 .../{ => lwip/src}/include/lwip/lwip/dns.h | 0 .../{ => lwip/src}/include/lwip/lwip/err.h | 0 .../src}/include/lwip/lwip/inet_chksum.h | 0 .../{ => lwip/src}/include/lwip/lwip/init.h | 0 .../{ => lwip/src}/include/lwip/lwip/ip.h | 0 .../src}/include/lwip/lwip/ip_addr.h | 0 .../{ => lwip/src}/include/lwip/lwip/mem.h | 0 .../{ => lwip/src}/include/lwip/lwip/memp.h | 0 .../src}/include/lwip/lwip/memp_std.h | 0 .../{ => lwip/src}/include/lwip/lwip/netbuf.h | 0 .../{ => lwip/src}/include/lwip/lwip/netdb.h | 0 .../{ => lwip/src}/include/lwip/lwip/netif.h | 0 .../src}/include/lwip/lwip/netifapi.h | 0 .../{ => lwip/src}/include/lwip/lwip/opt.h | 0 .../{ => lwip/src}/include/lwip/lwip/pbuf.h | 0 .../{ => lwip/src}/include/lwip/lwip/raw.h | 0 .../{ => lwip/src}/include/lwip/lwip/sio.h | 0 .../{ => lwip/src}/include/lwip/lwip/snmp.h | 0 .../src}/include/lwip/lwip/snmp_asn1.h | 0 .../src}/include/lwip/lwip/snmp_msg.h | 0 .../src}/include/lwip/lwip/snmp_structs.h | 0 .../src}/include/lwip/lwip/sockets.h | 0 .../{ => lwip/src}/include/lwip/lwip/stats.h | 0 .../{ => lwip/src}/include/lwip/lwip/sys.h | 0 .../{ => lwip/src}/include/lwip/lwip/tcp.h | 0 .../src}/include/lwip/lwip/tcp_impl.h | 0 .../{ => lwip/src}/include/lwip/lwip/tcpip.h | 0 .../{ => lwip/src}/include/lwip/lwip/timers.h | 0 .../{ => lwip/src}/include/lwip/lwip/udp.h | 0 .../ipv6 => lwip/src/include}/lwip/mld6.h | 0 .../lwip/ipv6 => lwip/src/include}/lwip/nd6.h | 0 .../lwip => lwip/src/include}/netif/etharp.h | 0 .../src/include}/netif/ppp/auth.h | 0 .../src/include}/netif/ppp/chap.h | 0 .../src/include}/netif/ppp/chpms.h | 0 .../src/include}/netif/ppp/fsm.h | 0 .../src/include}/netif/ppp/ipcp.h | 0 .../src/include}/netif/ppp/lcp.h | 0 .../src/include}/netif/ppp/magic.h | 0 .../src/include}/netif/ppp/md5.h | 0 .../src/include}/netif/ppp/pap.h | 0 .../src/include}/netif/ppp/ppp.h | 0 .../src/include}/netif/ppp/ppp_impl.h | 0 .../src/include}/netif/ppp/pppdebug.h | 0 .../src/include}/netif/ppp/randm.h | 0 .../src/include}/netif/ppp/vj.h | 0 .../lwip => lwip/src/include}/netif/ppp_oe.h | 0 .../lwip => lwip/src/include}/netif/slipif.h | 0 .../lwip => lwip/src/include}/posix/netdb.h | 0 .../src/include}/posix/sys/socket.h | 0 .../lwip/{source => lwip/src}/netif/FILES | 0 components/lwip/lwip/src/netif/ethernetif.c | 259 ++++++++++++++++++ .../{source => lwip/src}/netif/ppp/auth.c | 0 .../{source => lwip/src}/netif/ppp/chap.c | 0 .../{source => lwip/src}/netif/ppp/chpms.c | 0 .../lwip/{source => lwip/src}/netif/ppp/fsm.c | 0 .../{source => lwip/src}/netif/ppp/ipcp.c | 0 .../lwip/{source => lwip/src}/netif/ppp/lcp.c | 0 .../{source => lwip/src}/netif/ppp/magic.c | 0 .../lwip/{source => lwip/src}/netif/ppp/md5.c | 0 .../lwip/{source => lwip/src}/netif/ppp/pap.c | 0 .../lwip/{source => lwip/src}/netif/ppp/ppp.c | 0 .../{source => lwip/src}/netif/ppp/ppp_oe.c | 0 .../{source => lwip/src}/netif/ppp/randm.c | 0 .../{source => lwip/src}/netif/ppp/readme.txt | 0 .../lwip/{source => lwip/src}/netif/ppp/vj.c | 0 .../lwip/{source => lwip/src}/netif/slipif.c | 0 .../{source/arch => port/freertos}/sys_arch.c | 0 .../lwip/{source => port}/netif/ethernetif.c | 0 .../ssl/axtls/include/ssl/ssl_os_port.h | 2 +- components/tcpip_adapter/tcpip_adapter_wifi.c | 2 +- 156 files changed, 269 insertions(+), 9 deletions(-) rename components/lwip/{source/core => apps/dhcpserver}/dhcpserver.c (99%) rename components/lwip/{source/api => apps}/multi-threads/sockets_mt.c (100%) rename components/lwip/{source/apps => apps/sntp}/sntp_time.c (99%) rename components/lwip/{source/apps => apps/sntp}/time.c (97%) rename components/lwip/include/lwip/{lwip => apps/dhcpserver}/dhcpserver.h (100%) rename components/lwip/include/lwip/{lwip => apps}/multi-threads/sockets_mt.h (100%) rename components/lwip/include/lwip/apps/{ => sntp}/sntp_time.h (100%) rename components/lwip/include/lwip/apps/{ => sntp}/time.h (100%) rename components/lwip/include/lwip/{ => port}/arch/cc.h (100%) rename components/lwip/include/lwip/{ => port}/arch/perf.h (100%) rename components/lwip/include/lwip/{ => port}/arch/sys_arch.h (100%) rename components/lwip/include/lwip/{ => port}/lwipopts.h (100%) rename components/lwip/{source => lwip/src}/api/api_lib.c (100%) rename components/lwip/{source => lwip/src}/api/api_msg.c (100%) rename components/lwip/{source => lwip/src}/api/err.c (100%) rename components/lwip/{source => lwip/src}/api/netbuf.c (100%) rename components/lwip/{source => lwip/src}/api/netdb.c (100%) rename components/lwip/{source => lwip/src}/api/netifapi.c (100%) rename components/lwip/{source => lwip/src}/api/sockets.c (100%) rename components/lwip/{source => lwip/src}/api/tcpip.c (100%) rename components/lwip/{source/core => lwip/src/apps}/snmp/asn1_dec.c (100%) rename components/lwip/{source/core => lwip/src/apps}/snmp/asn1_enc.c (100%) rename components/lwip/{source/core => lwip/src/apps}/snmp/mib2.c (100%) rename components/lwip/{source/core => lwip/src/apps}/snmp/mib_structs.c (100%) rename components/lwip/{source/core => lwip/src/apps}/snmp/msg_in.c (100%) rename components/lwip/{source/core => lwip/src/apps}/snmp/msg_out.c (100%) rename components/lwip/{source/apps => lwip/src/apps/sntp}/sntp.c (100%) rename components/lwip/{source => lwip/src/core}/FILES (100%) rename components/lwip/{source => lwip/src}/core/def.c (100%) rename components/lwip/{source => lwip/src}/core/dns.c (100%) rename components/lwip/{source => lwip/src}/core/inet_chksum.c (100%) rename components/lwip/{source => lwip/src}/core/init.c (100%) rename components/lwip/{source => lwip/src}/core/ipv4/autoip.c (100%) rename components/lwip/{source/core => lwip/src/core/ipv4}/dhcp.c (100%) rename components/lwip/{source/netif => lwip/src/core/ipv4}/etharp.c (100%) rename components/lwip/{source => lwip/src}/core/ipv4/icmp.c (100%) rename components/lwip/{source => lwip/src}/core/ipv4/igmp.c (100%) rename components/lwip/{source => lwip/src}/core/ipv4/ip4.c (100%) rename components/lwip/{source => lwip/src}/core/ipv4/ip4_addr.c (100%) rename components/lwip/{source => lwip/src}/core/ipv4/ip_frag.c (100%) rename components/lwip/{source => lwip/src}/core/ipv6/README (100%) rename components/lwip/{source => lwip/src}/core/ipv6/dhcp6.c (100%) rename components/lwip/{source => lwip/src}/core/ipv6/ethip6.c (100%) rename components/lwip/{source => lwip/src}/core/ipv6/icmp6.c (100%) rename components/lwip/{source => lwip/src}/core/ipv6/inet6.c (100%) rename components/lwip/{source => lwip/src}/core/ipv6/ip6.c (100%) rename components/lwip/{source => lwip/src}/core/ipv6/ip6_addr.c (100%) rename components/lwip/{source => lwip/src}/core/ipv6/ip6_frag.c (100%) rename components/lwip/{source => lwip/src}/core/ipv6/mld6.c (100%) rename components/lwip/{source => lwip/src}/core/ipv6/nd6.c (100%) rename components/lwip/{source => lwip/src}/core/mem.c (100%) rename components/lwip/{source => lwip/src}/core/memp.c (100%) rename components/lwip/{source => lwip/src}/core/netif.c (100%) rename components/lwip/{source => lwip/src}/core/pbuf.c (100%) rename components/lwip/{source => lwip/src}/core/raw.c (100%) rename components/lwip/{source => lwip/src}/core/stats.c (100%) rename components/lwip/{source => lwip/src}/core/sys.c (100%) rename components/lwip/{source => lwip/src}/core/tcp.c (100%) rename components/lwip/{source => lwip/src}/core/tcp_in.c (100%) rename components/lwip/{source => lwip/src}/core/tcp_out.c (100%) rename components/lwip/{source => lwip/src}/core/timers.c (100%) rename components/lwip/{source => lwip/src}/core/udp.c (100%) rename components/lwip/{ => lwip/src}/include/lwip/apps/sntp.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/apps/sntp_opts.h (100%) rename components/lwip/{include/lwip/ipv4 => lwip/src/include}/lwip/autoip.h (100%) rename components/lwip/{include/lwip/ipv6 => lwip/src/include}/lwip/dhcp6.h (100%) rename components/lwip/{include/lwip/ipv6 => lwip/src/include}/lwip/ethip6.h (100%) rename components/lwip/{include/lwip/ipv4 => lwip/src/include}/lwip/icmp.h (100%) rename components/lwip/{include/lwip/ipv6 => lwip/src/include}/lwip/icmp6.h (100%) rename components/lwip/{include/lwip/ipv4 => lwip/src/include}/lwip/igmp.h (100%) rename components/lwip/{include/lwip/ipv4 => lwip/src/include}/lwip/inet.h (100%) rename components/lwip/{include/lwip/ipv6 => lwip/src/include}/lwip/inet6.h (100%) rename components/lwip/{include/lwip/ipv4 => lwip/src/include}/lwip/ip4.h (100%) rename components/lwip/{include/lwip/ipv4 => lwip/src/include}/lwip/ip4_addr.h (100%) rename components/lwip/{include/lwip/ipv6 => lwip/src/include}/lwip/ip6.h (100%) rename components/lwip/{include/lwip/ipv6 => lwip/src/include}/lwip/ip6_addr.h (100%) rename components/lwip/{include/lwip/ipv6 => lwip/src/include}/lwip/ip6_frag.h (100%) rename components/lwip/{include/lwip/ipv4 => lwip/src/include}/lwip/ip_frag.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/api.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/api_msg.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/arch.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/debug.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/def.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/dhcp.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/dns.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/err.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/inet_chksum.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/init.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/ip.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/ip_addr.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/mem.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/memp.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/memp_std.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/netbuf.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/netdb.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/netif.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/netifapi.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/opt.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/pbuf.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/raw.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/sio.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/snmp.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/snmp_asn1.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/snmp_msg.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/snmp_structs.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/sockets.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/stats.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/sys.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/tcp.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/tcp_impl.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/tcpip.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/timers.h (100%) rename components/lwip/{ => lwip/src}/include/lwip/lwip/udp.h (100%) rename components/lwip/{include/lwip/ipv6 => lwip/src/include}/lwip/mld6.h (100%) rename components/lwip/{include/lwip/ipv6 => lwip/src/include}/lwip/nd6.h (100%) rename components/lwip/{include/lwip => lwip/src/include}/netif/etharp.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/auth.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/chap.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/chpms.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/fsm.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/ipcp.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/lcp.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/magic.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/md5.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/pap.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/ppp.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/ppp_impl.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/pppdebug.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/randm.h (100%) rename components/lwip/{source => lwip/src/include}/netif/ppp/vj.h (100%) rename components/lwip/{include/lwip => lwip/src/include}/netif/ppp_oe.h (100%) rename components/lwip/{include/lwip => lwip/src/include}/netif/slipif.h (100%) rename components/lwip/{include/lwip => lwip/src/include}/posix/netdb.h (100%) rename components/lwip/{include/lwip => lwip/src/include}/posix/sys/socket.h (100%) rename components/lwip/{source => lwip/src}/netif/FILES (100%) create mode 100644 components/lwip/lwip/src/netif/ethernetif.c rename components/lwip/{source => lwip/src}/netif/ppp/auth.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/chap.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/chpms.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/fsm.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/ipcp.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/lcp.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/magic.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/md5.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/pap.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/ppp.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/ppp_oe.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/randm.c (100%) rename components/lwip/{source => lwip/src}/netif/ppp/readme.txt (100%) rename components/lwip/{source => lwip/src}/netif/ppp/vj.c (100%) rename components/lwip/{source => lwip/src}/netif/slipif.c (100%) rename components/lwip/{source/arch => port/freertos}/sys_arch.c (100%) rename components/lwip/{source => port}/netif/ethernetif.c (100%) diff --git a/components/lwip/source/core/dhcpserver.c b/components/lwip/apps/dhcpserver/dhcpserver.c similarity index 99% rename from components/lwip/source/core/dhcpserver.c rename to components/lwip/apps/dhcpserver/dhcpserver.c index 9b809353..f902aa77 100644 --- a/components/lwip/source/core/dhcpserver.c +++ b/components/lwip/apps/dhcpserver/dhcpserver.c @@ -18,7 +18,7 @@ #include "lwip/pbuf.h" #include "lwip/udp.h" #include "lwip/mem.h" -#include "lwip/dhcpserver.h" +#include "dhcpserver/dhcpserver.h" #ifndef LWIP_OPEN_SRC #include "net80211/ieee80211_var.h" diff --git a/components/lwip/source/api/multi-threads/sockets_mt.c b/components/lwip/apps/multi-threads/sockets_mt.c similarity index 100% rename from components/lwip/source/api/multi-threads/sockets_mt.c rename to components/lwip/apps/multi-threads/sockets_mt.c diff --git a/components/lwip/source/apps/sntp_time.c b/components/lwip/apps/sntp/sntp_time.c similarity index 99% rename from components/lwip/source/apps/sntp_time.c rename to components/lwip/apps/sntp/sntp_time.c index 730476bc..e83f7d0b 100644 --- a/components/lwip/source/apps/sntp_time.c +++ b/components/lwip/apps/sntp/sntp_time.c @@ -5,7 +5,7 @@ * Author: LiuHan */ #include "apps/sntp_opts.h" -#include "apps/sntp_time.h" +#include "lwip/apps/sntp/sntp_time.h" #include "esp_timer.h" static s8_t sntp_time_timezone = 8; diff --git a/components/lwip/source/apps/time.c b/components/lwip/apps/sntp/time.c similarity index 97% rename from components/lwip/source/apps/time.c rename to components/lwip/apps/sntp/time.c index 9c9bb9a6..878eade5 100644 --- a/components/lwip/source/apps/time.c +++ b/components/lwip/apps/sntp/time.c @@ -22,8 +22,8 @@ #include "esp_timer.h" #include "lwip/apps/sntp.h" -#include "lwip/apps/time.h" -#include "lwip/apps/sntp_time.h" +#include "lwip/apps/sntp/time.h" +#include "lwip/apps/sntp/sntp_time.h" static os_timer_t micros_overflow_timer; static uint32 micros_at_last_overflow_tick = 0; diff --git a/components/lwip/component.mk b/components/lwip/component.mk index fb38e720..cb6e03f1 100644 --- a/components/lwip/component.mk +++ b/components/lwip/component.mk @@ -1,9 +1,10 @@ # # Component Makefile # -COMPONENT_ADD_INCLUDEDIRS += include/lwip/ipv4 include/lwip/ipv6 include/lwip/posix include/lwip +COMPONENT_ADD_INCLUDEDIRS += lwip/src/include lwip/src/include/lwip lwip/src/include/posix lwip/include/lwip \ + include/lwip/apps include/lwip/port apps -COMPONENT_SRCDIRS += source/api source/api/multi-threads source/apps source/arch \ - source/netif source/core source/core/ipv4 source/core/ipv6 +COMPONENT_SRCDIRS += lwip/src/api lwip/src/apps/sntp lwip/src/netif lwip/src/core lwip/src/core/ipv4 lwip/src/core/ipv6 \ + port/freertos port/netif apps/dhcpserver apps/sntp CFLAGS += -D_POSIX_SOURCE -DLWIP_OPEN_SRC -DPBUF_RSV_FOR_WLAN -DEBUF_LWIP diff --git a/components/lwip/include/lwip/lwip/dhcpserver.h b/components/lwip/include/lwip/apps/dhcpserver/dhcpserver.h similarity index 100% rename from components/lwip/include/lwip/lwip/dhcpserver.h rename to components/lwip/include/lwip/apps/dhcpserver/dhcpserver.h diff --git a/components/lwip/include/lwip/lwip/multi-threads/sockets_mt.h b/components/lwip/include/lwip/apps/multi-threads/sockets_mt.h similarity index 100% rename from components/lwip/include/lwip/lwip/multi-threads/sockets_mt.h rename to components/lwip/include/lwip/apps/multi-threads/sockets_mt.h diff --git a/components/lwip/include/lwip/apps/sntp_time.h b/components/lwip/include/lwip/apps/sntp/sntp_time.h similarity index 100% rename from components/lwip/include/lwip/apps/sntp_time.h rename to components/lwip/include/lwip/apps/sntp/sntp_time.h diff --git a/components/lwip/include/lwip/apps/time.h b/components/lwip/include/lwip/apps/sntp/time.h similarity index 100% rename from components/lwip/include/lwip/apps/time.h rename to components/lwip/include/lwip/apps/sntp/time.h diff --git a/components/lwip/include/lwip/arch/cc.h b/components/lwip/include/lwip/port/arch/cc.h similarity index 100% rename from components/lwip/include/lwip/arch/cc.h rename to components/lwip/include/lwip/port/arch/cc.h diff --git a/components/lwip/include/lwip/arch/perf.h b/components/lwip/include/lwip/port/arch/perf.h similarity index 100% rename from components/lwip/include/lwip/arch/perf.h rename to components/lwip/include/lwip/port/arch/perf.h diff --git a/components/lwip/include/lwip/arch/sys_arch.h b/components/lwip/include/lwip/port/arch/sys_arch.h similarity index 100% rename from components/lwip/include/lwip/arch/sys_arch.h rename to components/lwip/include/lwip/port/arch/sys_arch.h diff --git a/components/lwip/include/lwip/lwipopts.h b/components/lwip/include/lwip/port/lwipopts.h similarity index 100% rename from components/lwip/include/lwip/lwipopts.h rename to components/lwip/include/lwip/port/lwipopts.h diff --git a/components/lwip/source/api/api_lib.c b/components/lwip/lwip/src/api/api_lib.c similarity index 100% rename from components/lwip/source/api/api_lib.c rename to components/lwip/lwip/src/api/api_lib.c diff --git a/components/lwip/source/api/api_msg.c b/components/lwip/lwip/src/api/api_msg.c similarity index 100% rename from components/lwip/source/api/api_msg.c rename to components/lwip/lwip/src/api/api_msg.c diff --git a/components/lwip/source/api/err.c b/components/lwip/lwip/src/api/err.c similarity index 100% rename from components/lwip/source/api/err.c rename to components/lwip/lwip/src/api/err.c diff --git a/components/lwip/source/api/netbuf.c b/components/lwip/lwip/src/api/netbuf.c similarity index 100% rename from components/lwip/source/api/netbuf.c rename to components/lwip/lwip/src/api/netbuf.c diff --git a/components/lwip/source/api/netdb.c b/components/lwip/lwip/src/api/netdb.c similarity index 100% rename from components/lwip/source/api/netdb.c rename to components/lwip/lwip/src/api/netdb.c diff --git a/components/lwip/source/api/netifapi.c b/components/lwip/lwip/src/api/netifapi.c similarity index 100% rename from components/lwip/source/api/netifapi.c rename to components/lwip/lwip/src/api/netifapi.c diff --git a/components/lwip/source/api/sockets.c b/components/lwip/lwip/src/api/sockets.c similarity index 100% rename from components/lwip/source/api/sockets.c rename to components/lwip/lwip/src/api/sockets.c diff --git a/components/lwip/source/api/tcpip.c b/components/lwip/lwip/src/api/tcpip.c similarity index 100% rename from components/lwip/source/api/tcpip.c rename to components/lwip/lwip/src/api/tcpip.c diff --git a/components/lwip/source/core/snmp/asn1_dec.c b/components/lwip/lwip/src/apps/snmp/asn1_dec.c similarity index 100% rename from components/lwip/source/core/snmp/asn1_dec.c rename to components/lwip/lwip/src/apps/snmp/asn1_dec.c diff --git a/components/lwip/source/core/snmp/asn1_enc.c b/components/lwip/lwip/src/apps/snmp/asn1_enc.c similarity index 100% rename from components/lwip/source/core/snmp/asn1_enc.c rename to components/lwip/lwip/src/apps/snmp/asn1_enc.c diff --git a/components/lwip/source/core/snmp/mib2.c b/components/lwip/lwip/src/apps/snmp/mib2.c similarity index 100% rename from components/lwip/source/core/snmp/mib2.c rename to components/lwip/lwip/src/apps/snmp/mib2.c diff --git a/components/lwip/source/core/snmp/mib_structs.c b/components/lwip/lwip/src/apps/snmp/mib_structs.c similarity index 100% rename from components/lwip/source/core/snmp/mib_structs.c rename to components/lwip/lwip/src/apps/snmp/mib_structs.c diff --git a/components/lwip/source/core/snmp/msg_in.c b/components/lwip/lwip/src/apps/snmp/msg_in.c similarity index 100% rename from components/lwip/source/core/snmp/msg_in.c rename to components/lwip/lwip/src/apps/snmp/msg_in.c diff --git a/components/lwip/source/core/snmp/msg_out.c b/components/lwip/lwip/src/apps/snmp/msg_out.c similarity index 100% rename from components/lwip/source/core/snmp/msg_out.c rename to components/lwip/lwip/src/apps/snmp/msg_out.c diff --git a/components/lwip/source/apps/sntp.c b/components/lwip/lwip/src/apps/sntp/sntp.c similarity index 100% rename from components/lwip/source/apps/sntp.c rename to components/lwip/lwip/src/apps/sntp/sntp.c diff --git a/components/lwip/source/FILES b/components/lwip/lwip/src/core/FILES similarity index 100% rename from components/lwip/source/FILES rename to components/lwip/lwip/src/core/FILES diff --git a/components/lwip/source/core/def.c b/components/lwip/lwip/src/core/def.c similarity index 100% rename from components/lwip/source/core/def.c rename to components/lwip/lwip/src/core/def.c diff --git a/components/lwip/source/core/dns.c b/components/lwip/lwip/src/core/dns.c similarity index 100% rename from components/lwip/source/core/dns.c rename to components/lwip/lwip/src/core/dns.c diff --git a/components/lwip/source/core/inet_chksum.c b/components/lwip/lwip/src/core/inet_chksum.c similarity index 100% rename from components/lwip/source/core/inet_chksum.c rename to components/lwip/lwip/src/core/inet_chksum.c diff --git a/components/lwip/source/core/init.c b/components/lwip/lwip/src/core/init.c similarity index 100% rename from components/lwip/source/core/init.c rename to components/lwip/lwip/src/core/init.c diff --git a/components/lwip/source/core/ipv4/autoip.c b/components/lwip/lwip/src/core/ipv4/autoip.c similarity index 100% rename from components/lwip/source/core/ipv4/autoip.c rename to components/lwip/lwip/src/core/ipv4/autoip.c diff --git a/components/lwip/source/core/dhcp.c b/components/lwip/lwip/src/core/ipv4/dhcp.c similarity index 100% rename from components/lwip/source/core/dhcp.c rename to components/lwip/lwip/src/core/ipv4/dhcp.c diff --git a/components/lwip/source/netif/etharp.c b/components/lwip/lwip/src/core/ipv4/etharp.c similarity index 100% rename from components/lwip/source/netif/etharp.c rename to components/lwip/lwip/src/core/ipv4/etharp.c diff --git a/components/lwip/source/core/ipv4/icmp.c b/components/lwip/lwip/src/core/ipv4/icmp.c similarity index 100% rename from components/lwip/source/core/ipv4/icmp.c rename to components/lwip/lwip/src/core/ipv4/icmp.c diff --git a/components/lwip/source/core/ipv4/igmp.c b/components/lwip/lwip/src/core/ipv4/igmp.c similarity index 100% rename from components/lwip/source/core/ipv4/igmp.c rename to components/lwip/lwip/src/core/ipv4/igmp.c diff --git a/components/lwip/source/core/ipv4/ip4.c b/components/lwip/lwip/src/core/ipv4/ip4.c similarity index 100% rename from components/lwip/source/core/ipv4/ip4.c rename to components/lwip/lwip/src/core/ipv4/ip4.c diff --git a/components/lwip/source/core/ipv4/ip4_addr.c b/components/lwip/lwip/src/core/ipv4/ip4_addr.c similarity index 100% rename from components/lwip/source/core/ipv4/ip4_addr.c rename to components/lwip/lwip/src/core/ipv4/ip4_addr.c diff --git a/components/lwip/source/core/ipv4/ip_frag.c b/components/lwip/lwip/src/core/ipv4/ip_frag.c similarity index 100% rename from components/lwip/source/core/ipv4/ip_frag.c rename to components/lwip/lwip/src/core/ipv4/ip_frag.c diff --git a/components/lwip/source/core/ipv6/README b/components/lwip/lwip/src/core/ipv6/README similarity index 100% rename from components/lwip/source/core/ipv6/README rename to components/lwip/lwip/src/core/ipv6/README diff --git a/components/lwip/source/core/ipv6/dhcp6.c b/components/lwip/lwip/src/core/ipv6/dhcp6.c similarity index 100% rename from components/lwip/source/core/ipv6/dhcp6.c rename to components/lwip/lwip/src/core/ipv6/dhcp6.c diff --git a/components/lwip/source/core/ipv6/ethip6.c b/components/lwip/lwip/src/core/ipv6/ethip6.c similarity index 100% rename from components/lwip/source/core/ipv6/ethip6.c rename to components/lwip/lwip/src/core/ipv6/ethip6.c diff --git a/components/lwip/source/core/ipv6/icmp6.c b/components/lwip/lwip/src/core/ipv6/icmp6.c similarity index 100% rename from components/lwip/source/core/ipv6/icmp6.c rename to components/lwip/lwip/src/core/ipv6/icmp6.c diff --git a/components/lwip/source/core/ipv6/inet6.c b/components/lwip/lwip/src/core/ipv6/inet6.c similarity index 100% rename from components/lwip/source/core/ipv6/inet6.c rename to components/lwip/lwip/src/core/ipv6/inet6.c diff --git a/components/lwip/source/core/ipv6/ip6.c b/components/lwip/lwip/src/core/ipv6/ip6.c similarity index 100% rename from components/lwip/source/core/ipv6/ip6.c rename to components/lwip/lwip/src/core/ipv6/ip6.c diff --git a/components/lwip/source/core/ipv6/ip6_addr.c b/components/lwip/lwip/src/core/ipv6/ip6_addr.c similarity index 100% rename from components/lwip/source/core/ipv6/ip6_addr.c rename to components/lwip/lwip/src/core/ipv6/ip6_addr.c diff --git a/components/lwip/source/core/ipv6/ip6_frag.c b/components/lwip/lwip/src/core/ipv6/ip6_frag.c similarity index 100% rename from components/lwip/source/core/ipv6/ip6_frag.c rename to components/lwip/lwip/src/core/ipv6/ip6_frag.c diff --git a/components/lwip/source/core/ipv6/mld6.c b/components/lwip/lwip/src/core/ipv6/mld6.c similarity index 100% rename from components/lwip/source/core/ipv6/mld6.c rename to components/lwip/lwip/src/core/ipv6/mld6.c diff --git a/components/lwip/source/core/ipv6/nd6.c b/components/lwip/lwip/src/core/ipv6/nd6.c similarity index 100% rename from components/lwip/source/core/ipv6/nd6.c rename to components/lwip/lwip/src/core/ipv6/nd6.c diff --git a/components/lwip/source/core/mem.c b/components/lwip/lwip/src/core/mem.c similarity index 100% rename from components/lwip/source/core/mem.c rename to components/lwip/lwip/src/core/mem.c diff --git a/components/lwip/source/core/memp.c b/components/lwip/lwip/src/core/memp.c similarity index 100% rename from components/lwip/source/core/memp.c rename to components/lwip/lwip/src/core/memp.c diff --git a/components/lwip/source/core/netif.c b/components/lwip/lwip/src/core/netif.c similarity index 100% rename from components/lwip/source/core/netif.c rename to components/lwip/lwip/src/core/netif.c diff --git a/components/lwip/source/core/pbuf.c b/components/lwip/lwip/src/core/pbuf.c similarity index 100% rename from components/lwip/source/core/pbuf.c rename to components/lwip/lwip/src/core/pbuf.c diff --git a/components/lwip/source/core/raw.c b/components/lwip/lwip/src/core/raw.c similarity index 100% rename from components/lwip/source/core/raw.c rename to components/lwip/lwip/src/core/raw.c diff --git a/components/lwip/source/core/stats.c b/components/lwip/lwip/src/core/stats.c similarity index 100% rename from components/lwip/source/core/stats.c rename to components/lwip/lwip/src/core/stats.c diff --git a/components/lwip/source/core/sys.c b/components/lwip/lwip/src/core/sys.c similarity index 100% rename from components/lwip/source/core/sys.c rename to components/lwip/lwip/src/core/sys.c diff --git a/components/lwip/source/core/tcp.c b/components/lwip/lwip/src/core/tcp.c similarity index 100% rename from components/lwip/source/core/tcp.c rename to components/lwip/lwip/src/core/tcp.c diff --git a/components/lwip/source/core/tcp_in.c b/components/lwip/lwip/src/core/tcp_in.c similarity index 100% rename from components/lwip/source/core/tcp_in.c rename to components/lwip/lwip/src/core/tcp_in.c diff --git a/components/lwip/source/core/tcp_out.c b/components/lwip/lwip/src/core/tcp_out.c similarity index 100% rename from components/lwip/source/core/tcp_out.c rename to components/lwip/lwip/src/core/tcp_out.c diff --git a/components/lwip/source/core/timers.c b/components/lwip/lwip/src/core/timers.c similarity index 100% rename from components/lwip/source/core/timers.c rename to components/lwip/lwip/src/core/timers.c diff --git a/components/lwip/source/core/udp.c b/components/lwip/lwip/src/core/udp.c similarity index 100% rename from components/lwip/source/core/udp.c rename to components/lwip/lwip/src/core/udp.c diff --git a/components/lwip/include/lwip/apps/sntp.h b/components/lwip/lwip/src/include/lwip/apps/sntp.h similarity index 100% rename from components/lwip/include/lwip/apps/sntp.h rename to components/lwip/lwip/src/include/lwip/apps/sntp.h diff --git a/components/lwip/include/lwip/apps/sntp_opts.h b/components/lwip/lwip/src/include/lwip/apps/sntp_opts.h similarity index 100% rename from components/lwip/include/lwip/apps/sntp_opts.h rename to components/lwip/lwip/src/include/lwip/apps/sntp_opts.h diff --git a/components/lwip/include/lwip/ipv4/lwip/autoip.h b/components/lwip/lwip/src/include/lwip/autoip.h similarity index 100% rename from components/lwip/include/lwip/ipv4/lwip/autoip.h rename to components/lwip/lwip/src/include/lwip/autoip.h diff --git a/components/lwip/include/lwip/ipv6/lwip/dhcp6.h b/components/lwip/lwip/src/include/lwip/dhcp6.h similarity index 100% rename from components/lwip/include/lwip/ipv6/lwip/dhcp6.h rename to components/lwip/lwip/src/include/lwip/dhcp6.h diff --git a/components/lwip/include/lwip/ipv6/lwip/ethip6.h b/components/lwip/lwip/src/include/lwip/ethip6.h similarity index 100% rename from components/lwip/include/lwip/ipv6/lwip/ethip6.h rename to components/lwip/lwip/src/include/lwip/ethip6.h diff --git a/components/lwip/include/lwip/ipv4/lwip/icmp.h b/components/lwip/lwip/src/include/lwip/icmp.h similarity index 100% rename from components/lwip/include/lwip/ipv4/lwip/icmp.h rename to components/lwip/lwip/src/include/lwip/icmp.h diff --git a/components/lwip/include/lwip/ipv6/lwip/icmp6.h b/components/lwip/lwip/src/include/lwip/icmp6.h similarity index 100% rename from components/lwip/include/lwip/ipv6/lwip/icmp6.h rename to components/lwip/lwip/src/include/lwip/icmp6.h diff --git a/components/lwip/include/lwip/ipv4/lwip/igmp.h b/components/lwip/lwip/src/include/lwip/igmp.h similarity index 100% rename from components/lwip/include/lwip/ipv4/lwip/igmp.h rename to components/lwip/lwip/src/include/lwip/igmp.h diff --git a/components/lwip/include/lwip/ipv4/lwip/inet.h b/components/lwip/lwip/src/include/lwip/inet.h similarity index 100% rename from components/lwip/include/lwip/ipv4/lwip/inet.h rename to components/lwip/lwip/src/include/lwip/inet.h diff --git a/components/lwip/include/lwip/ipv6/lwip/inet6.h b/components/lwip/lwip/src/include/lwip/inet6.h similarity index 100% rename from components/lwip/include/lwip/ipv6/lwip/inet6.h rename to components/lwip/lwip/src/include/lwip/inet6.h diff --git a/components/lwip/include/lwip/ipv4/lwip/ip4.h b/components/lwip/lwip/src/include/lwip/ip4.h similarity index 100% rename from components/lwip/include/lwip/ipv4/lwip/ip4.h rename to components/lwip/lwip/src/include/lwip/ip4.h diff --git a/components/lwip/include/lwip/ipv4/lwip/ip4_addr.h b/components/lwip/lwip/src/include/lwip/ip4_addr.h similarity index 100% rename from components/lwip/include/lwip/ipv4/lwip/ip4_addr.h rename to components/lwip/lwip/src/include/lwip/ip4_addr.h diff --git a/components/lwip/include/lwip/ipv6/lwip/ip6.h b/components/lwip/lwip/src/include/lwip/ip6.h similarity index 100% rename from components/lwip/include/lwip/ipv6/lwip/ip6.h rename to components/lwip/lwip/src/include/lwip/ip6.h diff --git a/components/lwip/include/lwip/ipv6/lwip/ip6_addr.h b/components/lwip/lwip/src/include/lwip/ip6_addr.h similarity index 100% rename from components/lwip/include/lwip/ipv6/lwip/ip6_addr.h rename to components/lwip/lwip/src/include/lwip/ip6_addr.h diff --git a/components/lwip/include/lwip/ipv6/lwip/ip6_frag.h b/components/lwip/lwip/src/include/lwip/ip6_frag.h similarity index 100% rename from components/lwip/include/lwip/ipv6/lwip/ip6_frag.h rename to components/lwip/lwip/src/include/lwip/ip6_frag.h diff --git a/components/lwip/include/lwip/ipv4/lwip/ip_frag.h b/components/lwip/lwip/src/include/lwip/ip_frag.h similarity index 100% rename from components/lwip/include/lwip/ipv4/lwip/ip_frag.h rename to components/lwip/lwip/src/include/lwip/ip_frag.h diff --git a/components/lwip/include/lwip/lwip/api.h b/components/lwip/lwip/src/include/lwip/lwip/api.h similarity index 100% rename from components/lwip/include/lwip/lwip/api.h rename to components/lwip/lwip/src/include/lwip/lwip/api.h diff --git a/components/lwip/include/lwip/lwip/api_msg.h b/components/lwip/lwip/src/include/lwip/lwip/api_msg.h similarity index 100% rename from components/lwip/include/lwip/lwip/api_msg.h rename to components/lwip/lwip/src/include/lwip/lwip/api_msg.h diff --git a/components/lwip/include/lwip/lwip/arch.h b/components/lwip/lwip/src/include/lwip/lwip/arch.h similarity index 100% rename from components/lwip/include/lwip/lwip/arch.h rename to components/lwip/lwip/src/include/lwip/lwip/arch.h diff --git a/components/lwip/include/lwip/lwip/debug.h b/components/lwip/lwip/src/include/lwip/lwip/debug.h similarity index 100% rename from components/lwip/include/lwip/lwip/debug.h rename to components/lwip/lwip/src/include/lwip/lwip/debug.h diff --git a/components/lwip/include/lwip/lwip/def.h b/components/lwip/lwip/src/include/lwip/lwip/def.h similarity index 100% rename from components/lwip/include/lwip/lwip/def.h rename to components/lwip/lwip/src/include/lwip/lwip/def.h diff --git a/components/lwip/include/lwip/lwip/dhcp.h b/components/lwip/lwip/src/include/lwip/lwip/dhcp.h similarity index 100% rename from components/lwip/include/lwip/lwip/dhcp.h rename to components/lwip/lwip/src/include/lwip/lwip/dhcp.h diff --git a/components/lwip/include/lwip/lwip/dns.h b/components/lwip/lwip/src/include/lwip/lwip/dns.h similarity index 100% rename from components/lwip/include/lwip/lwip/dns.h rename to components/lwip/lwip/src/include/lwip/lwip/dns.h diff --git a/components/lwip/include/lwip/lwip/err.h b/components/lwip/lwip/src/include/lwip/lwip/err.h similarity index 100% rename from components/lwip/include/lwip/lwip/err.h rename to components/lwip/lwip/src/include/lwip/lwip/err.h diff --git a/components/lwip/include/lwip/lwip/inet_chksum.h b/components/lwip/lwip/src/include/lwip/lwip/inet_chksum.h similarity index 100% rename from components/lwip/include/lwip/lwip/inet_chksum.h rename to components/lwip/lwip/src/include/lwip/lwip/inet_chksum.h diff --git a/components/lwip/include/lwip/lwip/init.h b/components/lwip/lwip/src/include/lwip/lwip/init.h similarity index 100% rename from components/lwip/include/lwip/lwip/init.h rename to components/lwip/lwip/src/include/lwip/lwip/init.h diff --git a/components/lwip/include/lwip/lwip/ip.h b/components/lwip/lwip/src/include/lwip/lwip/ip.h similarity index 100% rename from components/lwip/include/lwip/lwip/ip.h rename to components/lwip/lwip/src/include/lwip/lwip/ip.h diff --git a/components/lwip/include/lwip/lwip/ip_addr.h b/components/lwip/lwip/src/include/lwip/lwip/ip_addr.h similarity index 100% rename from components/lwip/include/lwip/lwip/ip_addr.h rename to components/lwip/lwip/src/include/lwip/lwip/ip_addr.h diff --git a/components/lwip/include/lwip/lwip/mem.h b/components/lwip/lwip/src/include/lwip/lwip/mem.h similarity index 100% rename from components/lwip/include/lwip/lwip/mem.h rename to components/lwip/lwip/src/include/lwip/lwip/mem.h diff --git a/components/lwip/include/lwip/lwip/memp.h b/components/lwip/lwip/src/include/lwip/lwip/memp.h similarity index 100% rename from components/lwip/include/lwip/lwip/memp.h rename to components/lwip/lwip/src/include/lwip/lwip/memp.h diff --git a/components/lwip/include/lwip/lwip/memp_std.h b/components/lwip/lwip/src/include/lwip/lwip/memp_std.h similarity index 100% rename from components/lwip/include/lwip/lwip/memp_std.h rename to components/lwip/lwip/src/include/lwip/lwip/memp_std.h diff --git a/components/lwip/include/lwip/lwip/netbuf.h b/components/lwip/lwip/src/include/lwip/lwip/netbuf.h similarity index 100% rename from components/lwip/include/lwip/lwip/netbuf.h rename to components/lwip/lwip/src/include/lwip/lwip/netbuf.h diff --git a/components/lwip/include/lwip/lwip/netdb.h b/components/lwip/lwip/src/include/lwip/lwip/netdb.h similarity index 100% rename from components/lwip/include/lwip/lwip/netdb.h rename to components/lwip/lwip/src/include/lwip/lwip/netdb.h diff --git a/components/lwip/include/lwip/lwip/netif.h b/components/lwip/lwip/src/include/lwip/lwip/netif.h similarity index 100% rename from components/lwip/include/lwip/lwip/netif.h rename to components/lwip/lwip/src/include/lwip/lwip/netif.h diff --git a/components/lwip/include/lwip/lwip/netifapi.h b/components/lwip/lwip/src/include/lwip/lwip/netifapi.h similarity index 100% rename from components/lwip/include/lwip/lwip/netifapi.h rename to components/lwip/lwip/src/include/lwip/lwip/netifapi.h diff --git a/components/lwip/include/lwip/lwip/opt.h b/components/lwip/lwip/src/include/lwip/lwip/opt.h similarity index 100% rename from components/lwip/include/lwip/lwip/opt.h rename to components/lwip/lwip/src/include/lwip/lwip/opt.h diff --git a/components/lwip/include/lwip/lwip/pbuf.h b/components/lwip/lwip/src/include/lwip/lwip/pbuf.h similarity index 100% rename from components/lwip/include/lwip/lwip/pbuf.h rename to components/lwip/lwip/src/include/lwip/lwip/pbuf.h diff --git a/components/lwip/include/lwip/lwip/raw.h b/components/lwip/lwip/src/include/lwip/lwip/raw.h similarity index 100% rename from components/lwip/include/lwip/lwip/raw.h rename to components/lwip/lwip/src/include/lwip/lwip/raw.h diff --git a/components/lwip/include/lwip/lwip/sio.h b/components/lwip/lwip/src/include/lwip/lwip/sio.h similarity index 100% rename from components/lwip/include/lwip/lwip/sio.h rename to components/lwip/lwip/src/include/lwip/lwip/sio.h diff --git a/components/lwip/include/lwip/lwip/snmp.h b/components/lwip/lwip/src/include/lwip/lwip/snmp.h similarity index 100% rename from components/lwip/include/lwip/lwip/snmp.h rename to components/lwip/lwip/src/include/lwip/lwip/snmp.h diff --git a/components/lwip/include/lwip/lwip/snmp_asn1.h b/components/lwip/lwip/src/include/lwip/lwip/snmp_asn1.h similarity index 100% rename from components/lwip/include/lwip/lwip/snmp_asn1.h rename to components/lwip/lwip/src/include/lwip/lwip/snmp_asn1.h diff --git a/components/lwip/include/lwip/lwip/snmp_msg.h b/components/lwip/lwip/src/include/lwip/lwip/snmp_msg.h similarity index 100% rename from components/lwip/include/lwip/lwip/snmp_msg.h rename to components/lwip/lwip/src/include/lwip/lwip/snmp_msg.h diff --git a/components/lwip/include/lwip/lwip/snmp_structs.h b/components/lwip/lwip/src/include/lwip/lwip/snmp_structs.h similarity index 100% rename from components/lwip/include/lwip/lwip/snmp_structs.h rename to components/lwip/lwip/src/include/lwip/lwip/snmp_structs.h diff --git a/components/lwip/include/lwip/lwip/sockets.h b/components/lwip/lwip/src/include/lwip/lwip/sockets.h similarity index 100% rename from components/lwip/include/lwip/lwip/sockets.h rename to components/lwip/lwip/src/include/lwip/lwip/sockets.h diff --git a/components/lwip/include/lwip/lwip/stats.h b/components/lwip/lwip/src/include/lwip/lwip/stats.h similarity index 100% rename from components/lwip/include/lwip/lwip/stats.h rename to components/lwip/lwip/src/include/lwip/lwip/stats.h diff --git a/components/lwip/include/lwip/lwip/sys.h b/components/lwip/lwip/src/include/lwip/lwip/sys.h similarity index 100% rename from components/lwip/include/lwip/lwip/sys.h rename to components/lwip/lwip/src/include/lwip/lwip/sys.h diff --git a/components/lwip/include/lwip/lwip/tcp.h b/components/lwip/lwip/src/include/lwip/lwip/tcp.h similarity index 100% rename from components/lwip/include/lwip/lwip/tcp.h rename to components/lwip/lwip/src/include/lwip/lwip/tcp.h diff --git a/components/lwip/include/lwip/lwip/tcp_impl.h b/components/lwip/lwip/src/include/lwip/lwip/tcp_impl.h similarity index 100% rename from components/lwip/include/lwip/lwip/tcp_impl.h rename to components/lwip/lwip/src/include/lwip/lwip/tcp_impl.h diff --git a/components/lwip/include/lwip/lwip/tcpip.h b/components/lwip/lwip/src/include/lwip/lwip/tcpip.h similarity index 100% rename from components/lwip/include/lwip/lwip/tcpip.h rename to components/lwip/lwip/src/include/lwip/lwip/tcpip.h diff --git a/components/lwip/include/lwip/lwip/timers.h b/components/lwip/lwip/src/include/lwip/lwip/timers.h similarity index 100% rename from components/lwip/include/lwip/lwip/timers.h rename to components/lwip/lwip/src/include/lwip/lwip/timers.h diff --git a/components/lwip/include/lwip/lwip/udp.h b/components/lwip/lwip/src/include/lwip/lwip/udp.h similarity index 100% rename from components/lwip/include/lwip/lwip/udp.h rename to components/lwip/lwip/src/include/lwip/lwip/udp.h diff --git a/components/lwip/include/lwip/ipv6/lwip/mld6.h b/components/lwip/lwip/src/include/lwip/mld6.h similarity index 100% rename from components/lwip/include/lwip/ipv6/lwip/mld6.h rename to components/lwip/lwip/src/include/lwip/mld6.h diff --git a/components/lwip/include/lwip/ipv6/lwip/nd6.h b/components/lwip/lwip/src/include/lwip/nd6.h similarity index 100% rename from components/lwip/include/lwip/ipv6/lwip/nd6.h rename to components/lwip/lwip/src/include/lwip/nd6.h diff --git a/components/lwip/include/lwip/netif/etharp.h b/components/lwip/lwip/src/include/netif/etharp.h similarity index 100% rename from components/lwip/include/lwip/netif/etharp.h rename to components/lwip/lwip/src/include/netif/etharp.h diff --git a/components/lwip/source/netif/ppp/auth.h b/components/lwip/lwip/src/include/netif/ppp/auth.h similarity index 100% rename from components/lwip/source/netif/ppp/auth.h rename to components/lwip/lwip/src/include/netif/ppp/auth.h diff --git a/components/lwip/source/netif/ppp/chap.h b/components/lwip/lwip/src/include/netif/ppp/chap.h similarity index 100% rename from components/lwip/source/netif/ppp/chap.h rename to components/lwip/lwip/src/include/netif/ppp/chap.h diff --git a/components/lwip/source/netif/ppp/chpms.h b/components/lwip/lwip/src/include/netif/ppp/chpms.h similarity index 100% rename from components/lwip/source/netif/ppp/chpms.h rename to components/lwip/lwip/src/include/netif/ppp/chpms.h diff --git a/components/lwip/source/netif/ppp/fsm.h b/components/lwip/lwip/src/include/netif/ppp/fsm.h similarity index 100% rename from components/lwip/source/netif/ppp/fsm.h rename to components/lwip/lwip/src/include/netif/ppp/fsm.h diff --git a/components/lwip/source/netif/ppp/ipcp.h b/components/lwip/lwip/src/include/netif/ppp/ipcp.h similarity index 100% rename from components/lwip/source/netif/ppp/ipcp.h rename to components/lwip/lwip/src/include/netif/ppp/ipcp.h diff --git a/components/lwip/source/netif/ppp/lcp.h b/components/lwip/lwip/src/include/netif/ppp/lcp.h similarity index 100% rename from components/lwip/source/netif/ppp/lcp.h rename to components/lwip/lwip/src/include/netif/ppp/lcp.h diff --git a/components/lwip/source/netif/ppp/magic.h b/components/lwip/lwip/src/include/netif/ppp/magic.h similarity index 100% rename from components/lwip/source/netif/ppp/magic.h rename to components/lwip/lwip/src/include/netif/ppp/magic.h diff --git a/components/lwip/source/netif/ppp/md5.h b/components/lwip/lwip/src/include/netif/ppp/md5.h similarity index 100% rename from components/lwip/source/netif/ppp/md5.h rename to components/lwip/lwip/src/include/netif/ppp/md5.h diff --git a/components/lwip/source/netif/ppp/pap.h b/components/lwip/lwip/src/include/netif/ppp/pap.h similarity index 100% rename from components/lwip/source/netif/ppp/pap.h rename to components/lwip/lwip/src/include/netif/ppp/pap.h diff --git a/components/lwip/source/netif/ppp/ppp.h b/components/lwip/lwip/src/include/netif/ppp/ppp.h similarity index 100% rename from components/lwip/source/netif/ppp/ppp.h rename to components/lwip/lwip/src/include/netif/ppp/ppp.h diff --git a/components/lwip/source/netif/ppp/ppp_impl.h b/components/lwip/lwip/src/include/netif/ppp/ppp_impl.h similarity index 100% rename from components/lwip/source/netif/ppp/ppp_impl.h rename to components/lwip/lwip/src/include/netif/ppp/ppp_impl.h diff --git a/components/lwip/source/netif/ppp/pppdebug.h b/components/lwip/lwip/src/include/netif/ppp/pppdebug.h similarity index 100% rename from components/lwip/source/netif/ppp/pppdebug.h rename to components/lwip/lwip/src/include/netif/ppp/pppdebug.h diff --git a/components/lwip/source/netif/ppp/randm.h b/components/lwip/lwip/src/include/netif/ppp/randm.h similarity index 100% rename from components/lwip/source/netif/ppp/randm.h rename to components/lwip/lwip/src/include/netif/ppp/randm.h diff --git a/components/lwip/source/netif/ppp/vj.h b/components/lwip/lwip/src/include/netif/ppp/vj.h similarity index 100% rename from components/lwip/source/netif/ppp/vj.h rename to components/lwip/lwip/src/include/netif/ppp/vj.h diff --git a/components/lwip/include/lwip/netif/ppp_oe.h b/components/lwip/lwip/src/include/netif/ppp_oe.h similarity index 100% rename from components/lwip/include/lwip/netif/ppp_oe.h rename to components/lwip/lwip/src/include/netif/ppp_oe.h diff --git a/components/lwip/include/lwip/netif/slipif.h b/components/lwip/lwip/src/include/netif/slipif.h similarity index 100% rename from components/lwip/include/lwip/netif/slipif.h rename to components/lwip/lwip/src/include/netif/slipif.h diff --git a/components/lwip/include/lwip/posix/netdb.h b/components/lwip/lwip/src/include/posix/netdb.h similarity index 100% rename from components/lwip/include/lwip/posix/netdb.h rename to components/lwip/lwip/src/include/posix/netdb.h diff --git a/components/lwip/include/lwip/posix/sys/socket.h b/components/lwip/lwip/src/include/posix/sys/socket.h similarity index 100% rename from components/lwip/include/lwip/posix/sys/socket.h rename to components/lwip/lwip/src/include/posix/sys/socket.h diff --git a/components/lwip/source/netif/FILES b/components/lwip/lwip/src/netif/FILES similarity index 100% rename from components/lwip/source/netif/FILES rename to components/lwip/lwip/src/netif/FILES diff --git a/components/lwip/lwip/src/netif/ethernetif.c b/components/lwip/lwip/src/netif/ethernetif.c new file mode 100644 index 00000000..bf11bbb7 --- /dev/null +++ b/components/lwip/lwip/src/netif/ethernetif.c @@ -0,0 +1,259 @@ +// Copyright 2018 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at + +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#if 0 +#include "lwip/pbuf.h" +#include "lwip/ethip6.h" +#include "netif/etharp.h" +#include "esp_libc.h" +#include "esp_wifi.h" +#include "tcpip_adapter.h" + + +int8_t ieee80211_output_pbuf(uint8_t fd, uint8_t* dataptr, uint16_t datalen); +int8_t wifi_get_netif(uint8_t fd); +void wifi_station_set_default_hostname(uint8_t* hwaddr); + +/** + * In this function, the hardware should be initialized. + * Called from ethernetif_init(). + * + * @param netif the already initialized lwip network interface structure + * for this ethernetif + */ +static void low_level_init(struct netif* netif) +{ + if (netif == NULL) { + TCPIP_ATAPTER_LOG("ERROR netif is NULL\n"); + return; + } + + /* set MAC hardware address length */ + netif->hwaddr_len = ETHARP_HWADDR_LEN; + + /* maximum transfer unit */ + netif->mtu = 1500; + + /* device capabilities */ + /* don't set NETIF_FLAG_ETHARP if this device is not an ethernet one */ + netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP; + +#if LWIP_IGMP + netif->flags |= NETIF_FLAG_IGMP; +#endif + /* Do whatever else is needed to initialize interface. */ +} + +/** + * This function should do the actual transmission of the packet. The packet is + * contained in the pbuf that is passed to the function. This pbuf + * might be chained. + * + * @param netif the lwip network interface structure for this ethernetif + * @param p the MAC packet to send (e.g. IP packet including MAC addresses and type) + * @return ERR_OK if the packet could be sent + * an int8_t value if the packet couldn't be sent + * + * @note Returning ERR_MEM here if a DMA queue of your MAC is full can lead to + * strange results. You might consider waiting for space in the DMA queue + * to become availale since the stack doesn't retry to send a packet + * dropped because of memory failure (except for the TCP timers). + */ + +static int8_t low_level_output(struct netif* netif, struct pbuf* p) +{ + int8_t err = ERR_OK; + + if (netif == NULL) { + TCPIP_ATAPTER_LOG("ERROR netif is NULL\n"); + return ERR_ARG; + } + +#if ETH_PAD_SIZE + pbuf_header(p, -ETH_PAD_SIZE); /* drop the padding word */ +#endif + + uint8_t* outputbuf = (uint8_t*)os_malloc(p->len + 36); + if (outputbuf == NULL) { + TCPIP_ATAPTER_LOG("ERROR no memory\n"); + return ERR_MEM; + } + + outputbuf += 36; + memcpy(outputbuf, p->payload, p->len); + + if (netif == esp_netif[TCPIP_ADAPTER_IF_STA]) { + err = ieee80211_output_pbuf(TCPIP_ADAPTER_IF_STA, outputbuf, p->len); + } else { + err = ieee80211_output_pbuf(TCPIP_ADAPTER_IF_AP, outputbuf, p->len); + } + + if (err == ERR_MEM) { + err = ERR_OK; + } + +// signal that packet should be sent(); + +#if ETH_PAD_SIZE + pbuf_header(p, ETH_PAD_SIZE); /* reclaim the padding word */ +#endif + +#if LWIP_STATS + LINK_STATS_INC(link.xmit); +#endif + return err; +} + +/** + * This function should be called when a packet is ready to be read + * from the interface. It uses the function low_level_input() that + * should handle the actual reception of bytes from the network + * interface. Then the type of the received packet is determined and + * the appropriate input function is called. + * + * @param netif the lwip network interface structure for this ethernetif + */ +void ethernetif_input(struct netif* netif, struct pbuf* p) +{ + struct eth_hdr* ethhdr; + + if (p == NULL) { + TCPIP_ATAPTER_LOG("ERROR pbuf is NULL\n"); + goto _exit; + } + + if (p->payload == NULL) { + TCPIP_ATAPTER_LOG("ERROR payload is NULL\n"); + pbuf_free(p); + goto _exit; + } + + if (netif == NULL) { + TCPIP_ATAPTER_LOG("ERROR netif is NULL\n"); + goto _exit; + } + + if (!(netif->flags & NETIF_FLAG_LINK_UP)) { + TCPIP_ATAPTER_LOG("ERROR netif is not up\n"); + pbuf_free(p); + p = NULL; + goto _exit; + } + + /* points to packet payload, which starts with an Ethernet header */ + ethhdr = p->payload; + + switch (htons(ethhdr->type)) { + /* IP or ARP packet? */ + case ETHTYPE_IP: + case ETHTYPE_IPV6: + case ETHTYPE_ARP: +#if PPPOE_SUPPORT + + /* PPPoE packet? */ + case ETHTYPE_PPPOEDISC: + case ETHTYPE_PPPOE: +#endif /* PPPOE_SUPPORT */ + + /* full packet send to tcpip_thread to process */ + if (netif->input(p, netif) != ERR_OK) { + TCPIP_ATAPTER_LOG("ERROR IP input error\n"); + pbuf_free(p); + p = NULL; + } + + break; + + default: + pbuf_free(p); + p = NULL; + break; + } + +_exit: + ; +} + +/** + * Should be called at the beginning of the program to set up the + * network interface. It calls the function low_level_init() to do the + * actual setup of the hardware. + * + * This function should be passed as a parameter to netif_add(). + * + * @param netif the lwip network interface structure for this ethernetif + * @return ERR_OK if the loopif is initialized + * ERR_MEM if private data couldn't be allocated + * any other int8_t on error + */ +int8_t ethernetif_init(struct netif* netif) +{ + uint8_t mac[NETIF_MAX_HWADDR_LEN]; + + if (netif == NULL) { + TCPIP_ATAPTER_LOG("ERROR netif is NULL\n"); + } + + /* set MAC hardware address */ + if (wifi_get_netif(TCPIP_ADAPTER_IF_STA) == TCPIP_ADAPTER_IF_STA) { + wifi_get_macaddr(TCPIP_ADAPTER_IF_STA, mac); + } else { + wifi_get_macaddr(TCPIP_ADAPTER_IF_AP, mac); + } + + memcpy(netif->hwaddr, mac, NETIF_MAX_HWADDR_LEN); + +#if LWIP_NETIF_HOSTNAME + + if (wifi_get_netif(TCPIP_ADAPTER_IF_STA) == TCPIP_ADAPTER_IF_STA) { + if (default_hostname == 1) { + wifi_station_set_default_hostname(netif->hwaddr); + } + + /* Initialize interface hostname */ + netif->hostname = hostname; + } else { + netif->hostname = NULL; + } + +#endif /* LWIP_NETIF_HOSTNAME */ + + /* + * Initialize the snmp variables and counters inside the struct netif. + * The last argument should be replaced with your link speed, in units + * of bits per second. + */ + NETIF_INIT_SNMP(netif, snmp_ifType_ethernet_csmacd, LINK_SPEED_OF_YOUR_NETIF_IN_BPS); + + netif->name[0] = IFNAME0; + netif->name[1] = IFNAME1; + /* We directly use etharp_output() here to save a function call. + * You can instead declare your own function an call etharp_output() + * from it if you have to do some checks before sending (e.g. if link + * is available...) */ + netif->output = etharp_output; +#if LWIP_IPV6 + netif->output_ip6 = ethip6_output; +#endif /* LWIP_IPV6 */ + netif->linkoutput = low_level_output; + + extern void wifi_station_dhcpc_event(void); + netif->dhcp_event = wifi_station_dhcpc_event; + + /* initialize the hardware */ + low_level_init(netif); + + return ERR_OK; +} + +#endif \ No newline at end of file diff --git a/components/lwip/source/netif/ppp/auth.c b/components/lwip/lwip/src/netif/ppp/auth.c similarity index 100% rename from components/lwip/source/netif/ppp/auth.c rename to components/lwip/lwip/src/netif/ppp/auth.c diff --git a/components/lwip/source/netif/ppp/chap.c b/components/lwip/lwip/src/netif/ppp/chap.c similarity index 100% rename from components/lwip/source/netif/ppp/chap.c rename to components/lwip/lwip/src/netif/ppp/chap.c diff --git a/components/lwip/source/netif/ppp/chpms.c b/components/lwip/lwip/src/netif/ppp/chpms.c similarity index 100% rename from components/lwip/source/netif/ppp/chpms.c rename to components/lwip/lwip/src/netif/ppp/chpms.c diff --git a/components/lwip/source/netif/ppp/fsm.c b/components/lwip/lwip/src/netif/ppp/fsm.c similarity index 100% rename from components/lwip/source/netif/ppp/fsm.c rename to components/lwip/lwip/src/netif/ppp/fsm.c diff --git a/components/lwip/source/netif/ppp/ipcp.c b/components/lwip/lwip/src/netif/ppp/ipcp.c similarity index 100% rename from components/lwip/source/netif/ppp/ipcp.c rename to components/lwip/lwip/src/netif/ppp/ipcp.c diff --git a/components/lwip/source/netif/ppp/lcp.c b/components/lwip/lwip/src/netif/ppp/lcp.c similarity index 100% rename from components/lwip/source/netif/ppp/lcp.c rename to components/lwip/lwip/src/netif/ppp/lcp.c diff --git a/components/lwip/source/netif/ppp/magic.c b/components/lwip/lwip/src/netif/ppp/magic.c similarity index 100% rename from components/lwip/source/netif/ppp/magic.c rename to components/lwip/lwip/src/netif/ppp/magic.c diff --git a/components/lwip/source/netif/ppp/md5.c b/components/lwip/lwip/src/netif/ppp/md5.c similarity index 100% rename from components/lwip/source/netif/ppp/md5.c rename to components/lwip/lwip/src/netif/ppp/md5.c diff --git a/components/lwip/source/netif/ppp/pap.c b/components/lwip/lwip/src/netif/ppp/pap.c similarity index 100% rename from components/lwip/source/netif/ppp/pap.c rename to components/lwip/lwip/src/netif/ppp/pap.c diff --git a/components/lwip/source/netif/ppp/ppp.c b/components/lwip/lwip/src/netif/ppp/ppp.c similarity index 100% rename from components/lwip/source/netif/ppp/ppp.c rename to components/lwip/lwip/src/netif/ppp/ppp.c diff --git a/components/lwip/source/netif/ppp/ppp_oe.c b/components/lwip/lwip/src/netif/ppp/ppp_oe.c similarity index 100% rename from components/lwip/source/netif/ppp/ppp_oe.c rename to components/lwip/lwip/src/netif/ppp/ppp_oe.c diff --git a/components/lwip/source/netif/ppp/randm.c b/components/lwip/lwip/src/netif/ppp/randm.c similarity index 100% rename from components/lwip/source/netif/ppp/randm.c rename to components/lwip/lwip/src/netif/ppp/randm.c diff --git a/components/lwip/source/netif/ppp/readme.txt b/components/lwip/lwip/src/netif/ppp/readme.txt similarity index 100% rename from components/lwip/source/netif/ppp/readme.txt rename to components/lwip/lwip/src/netif/ppp/readme.txt diff --git a/components/lwip/source/netif/ppp/vj.c b/components/lwip/lwip/src/netif/ppp/vj.c similarity index 100% rename from components/lwip/source/netif/ppp/vj.c rename to components/lwip/lwip/src/netif/ppp/vj.c diff --git a/components/lwip/source/netif/slipif.c b/components/lwip/lwip/src/netif/slipif.c similarity index 100% rename from components/lwip/source/netif/slipif.c rename to components/lwip/lwip/src/netif/slipif.c diff --git a/components/lwip/source/arch/sys_arch.c b/components/lwip/port/freertos/sys_arch.c similarity index 100% rename from components/lwip/source/arch/sys_arch.c rename to components/lwip/port/freertos/sys_arch.c diff --git a/components/lwip/source/netif/ethernetif.c b/components/lwip/port/netif/ethernetif.c similarity index 100% rename from components/lwip/source/netif/ethernetif.c rename to components/lwip/port/netif/ethernetif.c diff --git a/components/ssl/axtls/include/ssl/ssl_os_port.h b/components/ssl/axtls/include/ssl/ssl_os_port.h index 7b5ebf8b..bb9ae2ec 100644 --- a/components/ssl/axtls/include/ssl/ssl_os_port.h +++ b/components/ssl/axtls/include/ssl/ssl_os_port.h @@ -42,7 +42,7 @@ extern "C" { #endif #include "esp_common.h" -#include "lwip/apps/time.h" +#include "lwip/apps/sntp/time.h" #if 0 #define ssl_printf(fmt, args...) os_printf(fmt,## args) diff --git a/components/tcpip_adapter/tcpip_adapter_wifi.c b/components/tcpip_adapter/tcpip_adapter_wifi.c index f3e3bfd7..3542f6a0 100644 --- a/components/tcpip_adapter/tcpip_adapter_wifi.c +++ b/components/tcpip_adapter/tcpip_adapter_wifi.c @@ -15,12 +15,12 @@ #include "lwip/netif.h" #include "lwip/tcpip.h" #include "lwip/dhcp.h" -#include "lwip/dhcpserver.h" #include "netif/etharp.h" #include "esp_wifi.h" #include "esp_timer.h" #include "esp_misc.h" #include "tcpip_adapter.h" +#include "dhcpserver/dhcpserver.h" /* Avoid warning. No header file has include these function */ err_t ethernetif_init(struct netif* netif);