From 38ca426626ce9f0efe55f640adb2d8daed2f6873 Mon Sep 17 00:00:00 2001 From: armink Date: Sat, 19 Aug 2017 20:20:05 +0800 Subject: [LWIP] Fix lwip 2.0.2 TFTP server file name trans error. --- components/net/lwip-2.0.2/src/apps/tftp/tftp_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/net/lwip-2.0.2/src/apps/tftp/tftp_server.c b/components/net/lwip-2.0.2/src/apps/tftp/tftp_server.c index 8f2498a85c..afaa3bb08d 100644 --- a/components/net/lwip-2.0.2/src/apps/tftp/tftp_server.c +++ b/components/net/lwip-2.0.2/src/apps/tftp/tftp_server.c @@ -226,7 +226,7 @@ recv(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr, u16 case PP_HTONS(TFTP_WRQ): { const char tftp_null = 0; - char filename[TFTP_MAX_FILENAME_LEN] = { 0 }; + char filename[TFTP_MAX_FILENAME_LEN + 1] = { 0 }; char mode[TFTP_MAX_MODE_LEN] = { 0 }; u16_t filename_end_offset; u16_t mode_end_offset; -- cgit v1.3.1 From 83616c9f2b8e75409293ace56e319996313e1c9c Mon Sep 17 00:00:00 2001 From: armink Date: Sat, 19 Aug 2017 20:22:08 +0800 Subject: [LWIP] Add tftp max file name len config to LwIP 2.0.2 `lwipopts.h` . --- components/net/lwip-2.0.2/src/lwipopts.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/components/net/lwip-2.0.2/src/lwipopts.h b/components/net/lwip-2.0.2/src/lwipopts.h index 33861dd574..d846cf2fb0 100644 --- a/components/net/lwip-2.0.2/src/lwipopts.h +++ b/components/net/lwip-2.0.2/src/lwipopts.h @@ -446,4 +446,22 @@ #define SO_REUSE 0 #endif +/* + ------------------------------------ + ------- Applications options ------- + ------------------------------------ +*/ + +/** + * Max. length of TFTP filename + */ +#ifdef RT_LWIP_TFTP_MAX_FILENAME_LEN +#define TFTP_MAX_FILENAME_LEN RT_LWIP_TFTP_MAX_FILENAME_LEN +#elif defined(RT_DFS_ELM_MAX_LFN) +#define TFTP_MAX_FILENAME_LEN RT_DFS_ELM_MAX_LFN +#else +#define TFTP_MAX_FILENAME_LEN 64 +#endif + + #endif /* __LWIPOPTS_H__ */ -- cgit v1.3.1 From 22c7660dfb21f94f8b105803f3fd4205ef9e0e34 Mon Sep 17 00:00:00 2001 From: armink Date: Sat, 19 Aug 2017 22:46:19 +0800 Subject: [LWIP] Remove `RT_USING_NETUTILS` in LwIP 2.0.2 SConscript. --- components/net/lwip-2.0.2/SConscript | 5 ----- 1 file changed, 5 deletions(-) diff --git a/components/net/lwip-2.0.2/SConscript b/components/net/lwip-2.0.2/SConscript index cd38ae3cfc..6cc0e5378e 100644 --- a/components/net/lwip-2.0.2/SConscript +++ b/components/net/lwip-2.0.2/SConscript @@ -76,11 +76,6 @@ if GetDepend(['RT_LWIP_PPP']): src += ppp_src path += [GetCurrentDir() + '/src/netif/ppp'] -# For testing apps -if GetDepend(['RT_USING_NETUTILS']): - src += Glob('./apps/*.c') - stc += Glob('./src/apps/tftp/*.c') - group = DefineGroup('lwIP', src, depend = ['RT_USING_LWIP', 'RT_USING_LWIP202'], CPPPATH = path) Return('group') -- cgit v1.3.1 From 548f0e9e8f926a5406f4a7068ec98c26a666dd95 Mon Sep 17 00:00:00 2001 From: armink Date: Sun, 20 Aug 2017 10:08:26 +0800 Subject: [LWIP] Remove `src/netif/slipif.c` on `lwip-2.0.2/SConscript`. --- components/net/lwip-2.0.2/SConscript | 1 - 1 file changed, 1 deletion(-) diff --git a/components/net/lwip-2.0.2/SConscript b/components/net/lwip-2.0.2/SConscript index 6cc0e5378e..fa8a087c8d 100644 --- a/components/net/lwip-2.0.2/SConscript +++ b/components/net/lwip-2.0.2/SConscript @@ -29,7 +29,6 @@ src/core/udp.c src/netif/ethernet.c src/netif/ethernetif.c src/netif/lowpan6.c -src/netif/slipif.c """) ipv4_src = Split(""" -- cgit v1.3.1