summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/net/lwip-2.0.2/src/apps/README.md6
-rw-r--r--components/net/lwip-2.0.2/src/apps/SConscript13
-rw-r--r--components/net/lwip-2.0.2/src/apps/ping/ping.c (renamed from components/net/lwip-2.0.2/apps/ping.c)0
-rw-r--r--components/net/lwip-2.0.2/src/apps/tftp/tftp_port.c (renamed from components/net/lwip-2.0.2/apps/tftp_server.c)10
-rw-r--r--components/net/netutils/README.md1
-rw-r--r--components/net/netutils/SConscript10
-rw-r--r--components/net/netutils/telnet.c (renamed from components/net/lwip-2.0.2/apps/telnet.c)0
7 files changed, 37 insertions, 3 deletions
diff --git a/components/net/lwip-2.0.2/src/apps/README.md b/components/net/lwip-2.0.2/src/apps/README.md
new file mode 100644
index 0000000000..26670858c5
--- /dev/null
+++ b/components/net/lwip-2.0.2/src/apps/README.md
@@ -0,0 +1,6 @@
+Some net apps for current version LwIP.
+
+The RT-Thread develop team ported apps. It's easy to use it on finsh/msh.
+
+- ping
+- tftp
diff --git a/components/net/lwip-2.0.2/src/apps/SConscript b/components/net/lwip-2.0.2/src/apps/SConscript
new file mode 100644
index 0000000000..2bc01cc16e
--- /dev/null
+++ b/components/net/lwip-2.0.2/src/apps/SConscript
@@ -0,0 +1,13 @@
+from building import *
+
+cwd = GetCurrentDir()
+src = Glob('tftp/*.c')
+
+if GetDepend(['RT_LWIP_ICMP', 'RT_LWIP_RAW']):
+ src += Glob('ping/*.c')
+
+CPPPATH = [cwd]
+
+group = DefineGroup('LwIP', src, depend = ['RT_USING_NETUTILS', 'RT_USING_LWIP202'], CPPPATH = CPPPATH)
+
+Return('group') \ No newline at end of file
diff --git a/components/net/lwip-2.0.2/apps/ping.c b/components/net/lwip-2.0.2/src/apps/ping/ping.c
index 4b934f0cac..4b934f0cac 100644
--- a/components/net/lwip-2.0.2/apps/ping.c
+++ b/components/net/lwip-2.0.2/src/apps/ping/ping.c
diff --git a/components/net/lwip-2.0.2/apps/tftp_server.c b/components/net/lwip-2.0.2/src/apps/tftp/tftp_port.c
index f5667ef0ad..129cc7da17 100644
--- a/components/net/lwip-2.0.2/apps/tftp_server.c
+++ b/components/net/lwip-2.0.2/src/apps/tftp/tftp_port.c
@@ -1,5 +1,5 @@
/*
- * File : tftp_server.c
+ * File : tftp_port.c
* This file is part of RT-Thread RTOS
* COPYRIGHT (C) 2006 - 2017, RT-Thread Development Team
*
@@ -59,7 +59,7 @@ static int tftp_write(void* handle, struct pbuf* p)
return write(fd, p->payload, p->len);
}
-#if defined(RT_USING_FINSH) && defined(FINSH_USING_MSH)
+#if defined(RT_USING_FINSH)
#include <finsh.h>
static void tftp_server(uint8_t argc, char **argv)
@@ -78,6 +78,10 @@ static void tftp_server(uint8_t argc, char **argv)
rt_kprintf("TFTP server start failed.\n");
}
}
+FINSH_FUNCTION_EXPORT(tftp_server, start tftp server.);
+
+#if defined(FINSH_USING_MSH)
MSH_CMD_EXPORT(tftp_server, start tftp server.);
+#endif /* defined(FINSH_USING_MSH) */
-#endif /* defined(RT_USING_FINSH) && defined(FINSH_USING_MSH) */
+#endif /* defined(RT_USING_FINSH) */
diff --git a/components/net/netutils/README.md b/components/net/netutils/README.md
new file mode 100644
index 0000000000..49545bab32
--- /dev/null
+++ b/components/net/netutils/README.md
@@ -0,0 +1 @@
+Some net utils which using standard interface such as BSD Sockets. \ No newline at end of file
diff --git a/components/net/netutils/SConscript b/components/net/netutils/SConscript
new file mode 100644
index 0000000000..853b94a857
--- /dev/null
+++ b/components/net/netutils/SConscript
@@ -0,0 +1,10 @@
+from building import *
+
+cwd = GetCurrentDir()
+src = Glob('*.c')
+
+CPPPATH = [cwd]
+
+group = DefineGroup('LwIP', src, depend = ['RT_USING_NETUTILS'], CPPPATH = CPPPATH)
+
+Return('group') \ No newline at end of file
diff --git a/components/net/lwip-2.0.2/apps/telnet.c b/components/net/netutils/telnet.c
index d5c127b713..d5c127b713 100644
--- a/components/net/lwip-2.0.2/apps/telnet.c
+++ b/components/net/netutils/telnet.c