move net/apps to lwip folder

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1484 bbd45198-f89e-11dd-88c7-29a3b14d5316

components/net/SConscript

@@ -1,4 +1,4 @@
-# for libc component
+# for network related component
 import os
 Import('RTT_ROOT')
 

components/net/lwip-1.4.0/SConscript

@@ -81,6 +81,12 @@ if GetDepend(['RT_LWIP_PPP']):
     src += ppp_src
     path += [RTT_ROOT + '/components/net/lwip-1.4.0/src/netif/ppp']
 
-group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'RT_LWIP_VER140'], CPPPATH = path)
+# For testing apps
+if GetDepend(['RT_USING_NETUTILS']):
+    src += Glob('./apps/*.c')
+
+# group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP'], CPPPATH = path)
+# Switch to this branch after lwip1.4 is stable enough.
+group = DefineGroup('LwIP', src, depend = ['NOT_USED'], CPPPATH = path)
 
 Return('group')

components/net/lwip-1.4.0/apps/SConscript

@@ -1,7 +1,7 @@
-Import('RTT_ROOT')
-from building import *
-
-src   = Glob('*.c')
-group = DefineGroup('netutils', src, depend = ['RT_USING_NETUTILS'])
-
-Return('group')
+Import('RTT_ROOT')
+from building import *
+
+src   = Glob('*.c')
+group = DefineGroup('netutils', src, depend = ['RT_USING_NETUTILS'])
+
+Return('group')

components/net/lwip-1.4.0/apps/tcpecho.c

@@ -1,68 +1,68 @@
-#include <lwip/api.h>
-
-#define TCP_ECHO_PORT   7
-
-void tcpecho_entry(void *parameter)
-{
-	struct netconn *conn, *newconn;
-	err_t err;
-
-	/* Create a new connection identifier. */
-	conn = netconn_new(NETCONN_TCP);
-
-	/* Bind connection to well known port number 7. */
-	netconn_bind(conn, NULL, TCP_ECHO_PORT);
-
-	/* Tell connection to go into listening mode. */
-	netconn_listen(conn);
-
-	while(1)
-	{
-		/* Grab new connection. */
-		err = netconn_accept(conn, &newconn);
-		/* Process the new connection. */
-		if(err == ERR_OK)
-		{
-			struct netbuf *buf;
-			void *data;
-			u16_t len;
-
-			while(netconn_recv(newconn, &buf) == ERR_OK)
-			{
-				do
-				{
-					netbuf_data(buf, &data, &len);
-					err = netconn_write(newconn, data, len, NETCONN_COPY);
-					if(err != ERR_OK){}
-				}
-				while(netbuf_next(buf) >= 0);
-				netbuf_delete(buf);
-			}
-			/* Close connection and discard connection identifier. */
-			netconn_delete(newconn);
-		}
-	}
-}
-
-#ifdef RT_USING_FINSH
-#include <finsh.h>
-static rt_thread_t echo_tid = RT_NULL;
-void tcpecho(rt_uint32_t startup)
-{
-    if (startup && echo_tid == RT_NULL)
-    {
-        echo_tid = rt_thread_create("echo",
-			tcpecho_entry, RT_NULL,
-            512, 30, 5);
-        if (echo_tid != RT_NULL)
-            rt_thread_startup(echo_tid);
-    }
-    else
-    {
-        if (echo_tid != RT_NULL)
-            rt_thread_delete(echo_tid); /* delete thread */
-        echo_tid = RT_NULL;
-    }
-}
-FINSH_FUNCTION_EXPORT(tcpecho, startup or stop TCP echo server);
-#endif
+#include <lwip/api.h>
+
+#define TCP_ECHO_PORT   7
+
+void tcpecho_entry(void *parameter)
+{
+	struct netconn *conn, *newconn;
+	err_t err;
+
+	/* Create a new connection identifier. */
+	conn = netconn_new(NETCONN_TCP);
+
+	/* Bind connection to well known port number 7. */
+	netconn_bind(conn, NULL, TCP_ECHO_PORT);
+
+	/* Tell connection to go into listening mode. */
+	netconn_listen(conn);
+
+	while(1)
+	{
+		/* Grab new connection. */
+		err = netconn_accept(conn, &newconn);
+		/* Process the new connection. */
+		if(err == ERR_OK)
+		{
+			struct netbuf *buf;
+			void *data;
+			u16_t len;
+
+			while(netconn_recv(newconn, &buf) == ERR_OK)
+			{
+				do
+				{
+					netbuf_data(buf, &data, &len);
+					err = netconn_write(newconn, data, len, NETCONN_COPY);
+					if(err != ERR_OK){}
+				}
+				while(netbuf_next(buf) >= 0);
+				netbuf_delete(buf);
+			}
+			/* Close connection and discard connection identifier. */
+			netconn_delete(newconn);
+		}
+	}
+}
+
+#ifdef RT_USING_FINSH
+#include <finsh.h>
+static rt_thread_t echo_tid = RT_NULL;
+void tcpecho(rt_uint32_t startup)
+{
+    if (startup && echo_tid == RT_NULL)
+    {
+        echo_tid = rt_thread_create("echo",
+			tcpecho_entry, RT_NULL,
+            512, 30, 5);
+        if (echo_tid != RT_NULL)
+            rt_thread_startup(echo_tid);
+    }
+    else
+    {
+        if (echo_tid != RT_NULL)
+            rt_thread_delete(echo_tid); /* delete thread */
+        echo_tid = RT_NULL;
+    }
+}
+FINSH_FUNCTION_EXPORT(tcpecho, startup or stop TCP echo server);
+#endif

components/net/lwip-1.4.0/apps/udpecho.c

@@ -1,56 +1,56 @@
-#include <lwip/api.h>
-
-#define UDP_ECHO_PORT   7
-
-void udpecho_entry(void *parameter)
-{
-	struct netconn *conn;
-	struct netbuf *buf;
-	struct ip_addr *addr;
-	unsigned short port;
-
-	conn = netconn_new(NETCONN_UDP);
-	netconn_bind(conn, IP_ADDR_ANY, 7);
-
-	while(1)
-	{
-        /* received data to buffer */
-		netconn_recv(conn, &buf);
-
-		addr = netbuf_fromaddr(buf);
-		port = netbuf_fromport(buf);
-
-        /* send the data to buffer */
-		netconn_connect(conn, addr, port);
-
-		/* reset address, and send to client */
-		buf->addr = *IP_ADDR_ANY;
-		netconn_send(conn, buf);
-
-        /* release buffer */
-		netbuf_delete(buf);
-	}
-}
-
-#ifdef RT_USING_FINSH
-#include <finsh.h>
-static rt_thread_t echo_tid = RT_NULL;
-void udpecho(rt_uint32_t startup)
-{
-	if (startup && echo_tid == RT_NULL)
-	{
-		echo_tid = rt_thread_create("uecho",
-									udpecho_entry, RT_NULL,
-									512, 30, 5);
-		if (echo_tid != RT_NULL)
-			rt_thread_startup(echo_tid);
-	}
-	else
-	{
-		if (echo_tid != RT_NULL)
-			rt_thread_delete(echo_tid); /* delete thread */
-		echo_tid = RT_NULL;
-	}
-}
-FINSH_FUNCTION_EXPORT(udpecho, startup or stop UDP echo server);
-#endif
+#include <lwip/api.h>
+
+#define UDP_ECHO_PORT   7
+
+void udpecho_entry(void *parameter)
+{
+	struct netconn *conn;
+	struct netbuf *buf;
+	struct ip_addr *addr;
+	unsigned short port;
+
+	conn = netconn_new(NETCONN_UDP);
+	netconn_bind(conn, IP_ADDR_ANY, 7);
+
+	while(1)
+	{
+        /* received data to buffer */
+		netconn_recv(conn, &buf);
+
+		addr = netbuf_fromaddr(buf);
+		port = netbuf_fromport(buf);
+
+        /* send the data to buffer */
+		netconn_connect(conn, addr, port);
+
+		/* reset address, and send to client */
+		buf->addr = *IP_ADDR_ANY;
+		netconn_send(conn, buf);
+
+        /* release buffer */
+		netbuf_delete(buf);
+	}
+}
+
+#ifdef RT_USING_FINSH
+#include <finsh.h>
+static rt_thread_t echo_tid = RT_NULL;
+void udpecho(rt_uint32_t startup)
+{
+	if (startup && echo_tid == RT_NULL)
+	{
+		echo_tid = rt_thread_create("uecho",
+									udpecho_entry, RT_NULL,
+									512, 30, 5);
+		if (echo_tid != RT_NULL)
+			rt_thread_startup(echo_tid);
+	}
+	else
+	{
+		if (echo_tid != RT_NULL)
+			rt_thread_delete(echo_tid); /* delete thread */
+		echo_tid = RT_NULL;
+	}
+}
+FINSH_FUNCTION_EXPORT(udpecho, startup or stop UDP echo server);
+#endif

components/net/lwip/SConscript

@@ -80,6 +80,10 @@ if GetDepend(['RT_LWIP_PPP']):
     src += ppp_src
     path += [RTT_ROOT + '/components/net/lwip/src/netif/ppp']
 
-group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP', 'RT_LWIP_VER130'], CPPPATH = path)
+# For testing apps
+if GetDepend(['RT_USING_NETUTILS']):
+    src += Glob('./apps/*.c')
+
+group = DefineGroup('LwIP', src, depend = ['RT_USING_LWIP'], CPPPATH = path)
 
 Return('group')

components/net/lwip/apps/ping.c

@@ -0,0 +1,175 @@
+/*
+ * netutils: ping implementation
+ */
+
+#include "lwip/opt.h"
+
+#include "lwip/mem.h"
+#include "lwip/icmp.h"
+#include "lwip/netif.h"
+#include "lwip/sys.h"
+#include "lwip/sockets.h"
+#include "lwip/inet.h"
+#include "lwip/inet_chksum.h"
+#include "lwip/ip.h"
+
+/**
+ * PING_DEBUG: Enable debugging for PING.
+ */
+#ifndef PING_DEBUG
+#define PING_DEBUG     LWIP_DBG_ON
+#endif
+
+/** ping receive timeout - in milliseconds */
+#define PING_RCV_TIMEO 1000
+/** ping delay - in milliseconds */
+#define PING_DELAY     100
+
+/** ping identifier - must fit on a u16_t */
+#ifndef PING_ID
+#define PING_ID        0xAFAF
+#endif
+
+/** ping additional data size to include in the packet */
+#ifndef PING_DATA_SIZE
+#define PING_DATA_SIZE 32
+#endif
+
+/* ping variables */
+static u16_t ping_seq_num;
+struct _ip_addr
+{
+	rt_uint8_t addr0, addr1, addr2, addr3;
+};
+
+/** Prepare a echo ICMP request */
+static void ping_prepare_echo( struct icmp_echo_hdr *iecho, u16_t len)
+{
+	size_t i;
+	size_t data_len = len - sizeof(struct icmp_echo_hdr);
+
+	ICMPH_TYPE_SET(iecho, ICMP_ECHO);
+	ICMPH_CODE_SET(iecho, 0);
+	iecho->chksum = 0;
+	iecho->id     = PING_ID;
+	iecho->seqno  = htons(++ping_seq_num);
+
+	/* fill the additional data buffer with some data */
+	for(i = 0; i < data_len; i++)
+	{
+		((char*)iecho)[sizeof(struct icmp_echo_hdr) + i] = (char)i;
+	}
+
+	iecho->chksum = inet_chksum(iecho, len);
+}
+
+/* Ping using the socket ip */
+static err_t ping_send(int s, struct ip_addr *addr)
+{
+	int err;
+	struct icmp_echo_hdr *iecho;
+	struct sockaddr_in to;
+	size_t ping_size = sizeof(struct icmp_echo_hdr) + PING_DATA_SIZE;
+	LWIP_ASSERT("ping_size is too big", ping_size <= 0xffff);
+
+	iecho = rt_malloc(ping_size);
+	if (iecho == RT_NULL)
+	{
+		return ERR_MEM;
+	}
+
+	ping_prepare_echo(iecho, (u16_t)ping_size);
+
+	to.sin_len = sizeof(to);
+	to.sin_family = AF_INET;
+	to.sin_addr.s_addr = addr->addr;
+
+	err = lwip_sendto(s, iecho, ping_size, 0, (struct sockaddr*)&to, sizeof(to));
+	rt_free(iecho);
+
+	return (err ? ERR_OK : ERR_VAL);
+}
+
+static void ping_recv(int s)
+{
+	char buf[64];
+	int fromlen, len;
+	struct sockaddr_in from;
+	struct ip_hdr *iphdr;
+	struct icmp_echo_hdr *iecho;
+	struct _ip_addr *addr;
+
+	while((len = lwip_recvfrom(s, buf, sizeof(buf), 0, (struct sockaddr*)&from, (socklen_t*)&fromlen)) > 0)
+	{
+		if (len >= (sizeof(struct ip_hdr)+sizeof(struct icmp_echo_hdr)))
+		{
+			addr = (struct _ip_addr *)&(from.sin_addr);
+			rt_kprintf("ping: recv %d.%d.%d.%d\n", addr->addr0, addr->addr1, addr->addr2, addr->addr3);
+
+			iphdr = (struct ip_hdr *)buf;
+			iecho = (struct icmp_echo_hdr *)(buf+(IPH_HL(iphdr) * 4));
+			if ((iecho->id == PING_ID) && (iecho->seqno == htons(ping_seq_num)))
+			{
+				return;
+			}
+			else
+			{
+				rt_kprintf("ping: drop\n");
+			}
+		}
+	}
+
+	if (len <= 0)
+	{
+		rt_kprintf("ping: timeout\n");
+	}
+}
+
+rt_err_t ping(char* target, rt_uint32_t time, rt_size_t size)
+{
+	int s;
+	int timeout = PING_RCV_TIMEO;
+	struct ip_addr ping_target;
+	rt_uint32_t send_time;
+	struct _ip_addr
+	{
+		rt_uint8_t addr0, addr1, addr2, addr3;
+	} *addr;
+
+    send_time = 0;
+
+	if (inet_aton(target, (struct in_addr*)&ping_target) == 0) return -RT_ERROR;
+	addr = (struct _ip_addr*)&ping_target;
+
+	if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
+	{
+	    rt_kprintf("create socket failled\n");
+		return -RT_ERROR;
+	}
+
+	lwip_setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
+
+	while (1)
+	{
+		if (ping_send(s, &ping_target) == ERR_OK)
+		{
+			rt_kprintf("ping: send %d.%d.%d.%d\n", addr->addr0, addr->addr1, addr->addr2, addr->addr3);
+			ping_recv(s);
+		}
+		else
+		{
+			rt_kprintf("ping: send %d.%d.%d.%d - error\n", addr->addr0, addr->addr1, addr->addr2, addr->addr3);
+		}
+
+		send_time ++;
+		if (send_time >= time) break; /* send ping times reached, stop */
+
+		rt_thread_delay(PING_DELAY); /* take a delay */
+	}
+
+	return RT_EOK;
+}
+#ifdef RT_USING_FINSH
+#include <finsh.h>
+FINSH_FUNCTION_EXPORT(ping, ping network host);
+#endif

components/net/lwip/apps/tcpecho.c

@@ -0,0 +1,68 @@
+#include <lwip/api.h>
+
+#define TCP_ECHO_PORT   7
+
+void tcpecho_entry(void *parameter)
+{
+	struct netconn *conn, *newconn;
+	err_t err;
+
+	/* Create a new connection identifier. */
+	conn = netconn_new(NETCONN_TCP);
+
+	/* Bind connection to well known port number 7. */
+	netconn_bind(conn, NULL, TCP_ECHO_PORT);
+
+	/* Tell connection to go into listening mode. */
+	netconn_listen(conn);
+
+	while(1)
+	{
+		/* Grab new connection. */
+		newconn = netconn_accept(conn);
+		/* Process the new connection. */
+		if(newconn != NULL)
+		{
+			struct netbuf *buf;
+			void *data;
+			u16_t len;
+
+			while((buf = netconn_recv(newconn)) != NULL)
+			{
+				do
+				{
+					netbuf_data(buf, &data, &len);
+					err = netconn_write(newconn, data, len, NETCONN_COPY);
+					if(err != ERR_OK){}
+				}
+				while(netbuf_next(buf) >= 0);
+				netbuf_delete(buf);
+			}
+			/* Close connection and discard connection identifier. */
+			netconn_delete(newconn);
+		}
+	}
+}
+
+#ifdef RT_USING_FINSH
+#include <finsh.h>
+static rt_thread_t echo_tid = RT_NULL;
+void tcpecho(rt_uint32_t startup)
+{
+    if (startup && echo_tid == RT_NULL)
+    {
+        echo_tid = rt_thread_create("echo",
+			tcpecho_entry, RT_NULL,
+            512, 30, 5);
+        if (echo_tid != RT_NULL)
+            rt_thread_startup(echo_tid);
+    }
+    else
+    {
+        if (echo_tid != RT_NULL)
+            rt_thread_delete(echo_tid); /* delete thread */
+        echo_tid = RT_NULL;
+    }
+}
+FINSH_FUNCTION_EXPORT(tcpecho, startup or stop TCP echo server);
+#endif

components/net/lwip/apps/udpecho.c

@@ -0,0 +1,56 @@
+#include <lwip/api.h>
+
+#define UDP_ECHO_PORT   7
+
+void udpecho_entry(void *parameter)
+{
+	struct netconn *conn;
+	struct netbuf *buf;
+	struct ip_addr *addr;
+	unsigned short port;
+
+	conn = netconn_new(NETCONN_UDP);
+	netconn_bind(conn, IP_ADDR_ANY, 7);
+
+	while(1)
+	{
+        /* received data to buffer */
+		buf = netconn_recv(conn);
+
+		addr = netbuf_fromaddr(buf);
+		port = netbuf_fromport(buf);
+
+        /* send the data to buffer */
+		netconn_connect(conn, addr, port);
+
+		/* reset address, and send to client */
+		buf->addr = RT_NULL;
+		netconn_send(conn, buf);
+
+        /* release buffer */
+		netbuf_delete(buf);
+	}
+}
+
+#ifdef RT_USING_FINSH
+#include <finsh.h>
+static rt_thread_t echo_tid = RT_NULL;
+void udpecho(rt_uint32_t startup)
+{
+	if (startup && echo_tid == RT_NULL)
+	{
+		echo_tid = rt_thread_create("uecho",
+									udpecho_entry, RT_NULL,
+									512, 30, 5);
+		if (echo_tid != RT_NULL)
+			rt_thread_startup(echo_tid);
+	}
+	else
+	{
+		if (echo_tid != RT_NULL)
+			rt_thread_delete(echo_tid); /* delete thread */
+		echo_tid = RT_NULL;
+	}
+}
+FINSH_FUNCTION_EXPORT(udpecho, startup or stop UDP echo server);
+#endif

tools/building.py

@@ -276,9 +276,6 @@ def PrepareBuilding(env, root_directory, has_libcpu=False):
     if (GetDepend('RT_USING_NEWLIB') == False and GetDepend('RT_USING_NOLIBC') == False) and rtconfig.PLATFORM == 'gcc':
         AddDepend('RT_USING_MINILIBC')
 
-    if (GetDepend('RT_USING_LWIP') == True and GetDepend('RT_LWIP_VER140') == False):
-        AddDepend('RT_LWIP_VER130')
-
     # add target option
     AddOption('--target',
                       dest='target',