diff options
| author | Bernard Xiong <[email protected]> | 2017-08-20 11:32:13 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-08-20 11:32:13 +0800 |
| commit | 76a79f20d999bf6b2d77883967e19dad8ffc0604 (patch) | |
| tree | 2ea3c841ab17ef02d6ff8820f554a992acc14928 | |
| parent | c0338d566cce562b00cb772314e876636bc2f518 (diff) | |
| parent | 548f0e9e8f926a5406f4a7068ec98c26a666dd95 (diff) | |
Merge pull request #817 from armink/fix_lwip_tftp
[lwIP] Fix LwIP 2.0.2 tftp
| -rw-r--r-- | components/net/lwip-2.0.2/SConscript | 6 | ||||
| -rw-r--r-- | components/net/lwip-2.0.2/src/apps/tftp/tftp_server.c | 2 | ||||
| -rw-r--r-- | components/net/lwip-2.0.2/src/lwipopts.h | 18 |
3 files changed, 19 insertions, 7 deletions
diff --git a/components/net/lwip-2.0.2/SConscript b/components/net/lwip-2.0.2/SConscript index cd38ae3cfc..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(""" @@ -76,11 +75,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') 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; 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__ */ |