From a8804d350319c71269c752fa927d5e4c7ce3bd8b Mon Sep 17 00:00:00 2001 From: hduffddybz Date: Mon, 18 Aug 2014 00:41:03 -0800 Subject: [PATCH 1/4] correct netconn API usage --- examples/test/net_test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/test/net_test.c b/examples/test/net_test.c index e4961622c7..b9a5717b16 100644 --- a/examples/test/net_test.c +++ b/examples/test/net_test.c @@ -23,7 +23,7 @@ void udpecho_entry(void *parameter) while(1) { /* received data to buffer */ - buf = netconn_recv(conn); + netconn_recv(conn, &buf); addr = netbuf_fromaddr(buf); port = netbuf_fromport(buf); @@ -32,7 +32,7 @@ void udpecho_entry(void *parameter) netconn_connect(conn, addr, port); /* reset address, and send to client */ - buf->addr = RT_NULL; + buf->addr = *IP_ADDR_ANY; netconn_send(conn, buf); /* release buffer */ @@ -122,15 +122,15 @@ void tcpecho_entry(void *parameter) while(1) { /* Grab new connection. */ - newconn = netconn_accept(conn); + err = netconn_accept(conn, &newconn); /* Process the new connection. */ - if(newconn != NULL) + if(err == ERR_OK) { struct netbuf *buf; void *data; u16_t len; - while((buf = netconn_recv(newconn)) != NULL) + while((err = netconn_recv(newconn, buf)) == ERR_OK) { do { From c1d0db700c8daedf204b5e5144ecb763ca258bef Mon Sep 17 00:00:00 2001 From: hduffddybz Date: Sun, 24 Aug 2014 21:12:47 -0800 Subject: [PATCH 2/4] add version checking --- examples/test/net_test.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/examples/test/net_test.c b/examples/test/net_test.c index b9a5717b16..88210ba131 100644 --- a/examples/test/net_test.c +++ b/examples/test/net_test.c @@ -5,6 +5,8 @@ #include #include #include +#include + /* * UDP echo server */ @@ -23,19 +25,28 @@ void udpecho_entry(void *parameter) while(1) { /* received data to buffer */ +#if LWIP_VERSION_MINOR==3U + buf = netconn_recv(conn); +#else netconn_recv(conn, &buf); - +#endif + addr = netbuf_fromaddr(buf); port = netbuf_fromport(buf); - /* send the data to buffer */ + /* send the data to buffer */ netconn_connect(conn, addr, port); /* reset address, and send to client */ +#if LWIP_VERSION_MINOR==3U + buf->addr = RT_NULL; +#else buf->addr = *IP_ADDR_ANY; +#endif + netconn_send(conn, buf); - - /* release buffer */ + + /* release buffer */ netbuf_delete(buf); } } @@ -122,15 +133,23 @@ void tcpecho_entry(void *parameter) while(1) { /* Grab new connection. */ +#if LWIP_VERSION_MINOR==3U + newconn = netconn_accept(conn); + if(newconn != NULL) +#else err = netconn_accept(conn, &newconn); - /* Process the new connection. */ if(err == ERR_OK) +#endif + /* Process the new connection. */ { struct netbuf *buf; void *data; u16_t len; - - while((err = netconn_recv(newconn, buf)) == ERR_OK) +#if LWIP_VERSION_MINOR==3U + while((buf = netconn_recv(newconn)) != NULL) +#else + while((err = netconn_recv(newconn, &buf)) == ERR_OK) +#endif { do { @@ -214,9 +233,8 @@ void tcpecho_socket_entry(void *parameter) bytes_received = recv(connected,recv_data, TCP_SOCKET_BUFFER_SIZE, 0); if (bytes_received <= 0) { - rt_kprintf("close client connection, errno: %d, socket error: %d\n", - rt_get_errno(), - lwip_get_error()); + rt_kprintf("close client connection, errno: %d\n", + rt_get_errno()); /* connection closed. */ lwip_close(connected); break; From 6ccfe9f37411d98ff1edd5a97e59792f269ff839 Mon Sep 17 00:00:00 2001 From: hduffddybz Date: Sun, 24 Aug 2014 21:16:02 -0800 Subject: [PATCH 3/4] fix --- examples/test/net_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/test/net_test.c b/examples/test/net_test.c index 88210ba131..dc737e9e03 100644 --- a/examples/test/net_test.c +++ b/examples/test/net_test.c @@ -34,7 +34,7 @@ void udpecho_entry(void *parameter) addr = netbuf_fromaddr(buf); port = netbuf_fromport(buf); - /* send the data to buffer */ + /* send the data to buffer */ netconn_connect(conn, addr, port); /* reset address, and send to client */ @@ -46,7 +46,7 @@ void udpecho_entry(void *parameter) netconn_send(conn, buf); - /* release buffer */ + /* release buffer */ netbuf_delete(buf); } } From 7aff40f3f93a30c17b0c8b3f89740cb32e970c5d Mon Sep 17 00:00:00 2001 From: hduffddybz Date: Sun, 24 Aug 2014 21:23:52 -0800 Subject: [PATCH 4/4] fix --- examples/test/net_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/test/net_test.c b/examples/test/net_test.c index dc737e9e03..53bd2836fa 100644 --- a/examples/test/net_test.c +++ b/examples/test/net_test.c @@ -46,7 +46,7 @@ void udpecho_entry(void *parameter) netconn_send(conn, buf); - /* release buffer */ + /* release buffer */ netbuf_delete(buf); } }