chinky/rtt-f030
chinky
/
rtt-f030
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #315 from hduffddybz/fix 

correct netconn API usage
This commit is contained in:
Bernard Xiong 2014-08-28 09:40:02 +08:00
parent a072c60cc9 7aff40f3f9
commit 46d01d3406
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
examples/test/net_test.c
View File

@ -5,6 +5,8 @@
#include <finsh.h> #include <finsh.h>
#include <lwip/api.h> #include <lwip/api.h>
#include <lwip/sockets.h> #include <lwip/sockets.h>
#include <lwip/init.h>
/* /*
* UDP echo server * UDP echo server
*/ */
@ -23,19 +25,28 @@ void udpecho_entry(void *parameter)
while(1) while(1)
{ {
/* received data to buffer */ /* received data to buffer */
#if LWIP_VERSION_MINOR==3U
buf = netconn_recv(conn); buf = netconn_recv(conn);
#else
netconn_recv(conn, &buf);
#endif
addr = netbuf_fromaddr(buf); addr = netbuf_fromaddr(buf);
port = netbuf_fromport(buf); port = netbuf_fromport(buf);
/* send the data to buffer */ /* send the data to buffer */
netconn_connect(conn, addr, port); netconn_connect(conn, addr, port);
/* reset address, and send to client */ /* reset address, and send to client */
#if LWIP_VERSION_MINOR==3U
buf->addr = RT_NULL; buf->addr = RT_NULL;
#else
buf->addr = *IP_ADDR_ANY;
#endif
netconn_send(conn, buf); netconn_send(conn, buf);
/* release buffer */ /* release buffer */
netbuf_delete(buf); netbuf_delete(buf);
} }
} }
@ -122,15 +133,23 @@ void tcpecho_entry(void *parameter)
while(1) while(1)
{ {
/* Grab new connection. */ /* Grab new connection. */
#if LWIP_VERSION_MINOR==3U
newconn = netconn_accept(conn); newconn = netconn_accept(conn);
/* Process the new connection. */
if(newconn != NULL) if(newconn != NULL)
#else
err = netconn_accept(conn, &newconn);
if(err == ERR_OK)
#endif
/* Process the new connection. */
{ {
struct netbuf *buf; struct netbuf *buf;
void *data; void *data;
u16_t len; u16_t len;
#if LWIP_VERSION_MINOR==3U
while((buf = netconn_recv(newconn)) != NULL) while((buf = netconn_recv(newconn)) != NULL)
#else
while((err = netconn_recv(newconn, &buf)) == ERR_OK)
#endif
{ {
do do
{ {
@ -214,9 +233,8 @@ void tcpecho_socket_entry(void *parameter)
bytes_received = recv(connected,recv_data, TCP_SOCKET_BUFFER_SIZE, 0); bytes_received = recv(connected,recv_data, TCP_SOCKET_BUFFER_SIZE, 0);
if (bytes_received <= 0) if (bytes_received <= 0)
{ {
rt_kprintf("close client connection, errno: %d, socket error: %d\n", rt_kprintf("close client connection, errno: %d\n",
rt_get_errno(), rt_get_errno());
lwip_get_error());
/* connection closed. */ /* connection closed. */
lwip_close(connected); lwip_close(connected);
break; break;