From aba6a08b701af7f1fcf6962ea7c37b35e7c9dc62 Mon Sep 17 00:00:00 2001
From: Stefan Lankes <lankes@lfbs.rwth-aachen.de>
Date: Thu, 13 Oct 2011 15:21:45 -0700
Subject: [PATCH] use errno to determine socket failures

---
 apps/netio.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/netio.c b/apps/netio.c
index 4469cd1a..bb63c89c 100644
--- a/apps/netio.c
+++ b/apps/netio.c
@@ -46,6 +46,7 @@
 
 #ifdef CONFIG_LWIP
 #include <lwip/sockets.h>
+#include <lwip/err.h>
 
 typedef struct
 {
@@ -75,7 +76,7 @@ static int send_data(int socket, void *buffer, size_t size, int flags)
 
 	if (rc < 0)
 	{
-		kprintf("send failed: %d\n", rc);
+		kprintf("send failed: %d\n", errno);
 		return -1;
 	}
 
@@ -90,7 +91,7 @@ static int recv_data(int socket, void *buffer, size_t size, int flags)
 	size_t rc = recv(socket, buffer, size, flags);
 
 	if (rc < 0) {
-		kprintf("recv failed: %d\n", rc);
+		kprintf("recv failed: %d\n", errno);
 		return -1;
 	}
 
@@ -158,7 +159,7 @@ static int TCPServer(void* arg)
 
 	if ((err = bind(server, (struct sockaddr *) &sa_server, sizeof(sa_server))) < 0)
 	{
-		kprintf("bind failed: %d\n", err);
+		kprintf("bind failed: %d\n", errno);
 		closesocket(server);
 		kfree(cBuffer, TMAXSIZE);
 		return -1;
@@ -166,7 +167,7 @@ static int TCPServer(void* arg)
 
 	if ((err = listen(server, 2)) != 0)
 	{
-		kprintf("listen failed: %d\n", err);
+		kprintf("listen failed: %d\n", errno);
 		closesocket(server);
 		kfree(cBuffer, TMAXSIZE);
 		return -1;
@@ -183,7 +184,7 @@ static int TCPServer(void* arg)
 
 		if ((rc = select(FD_SETSIZE, &fds, 0, 0, &tv)) < 0)
 		{
-			kprintf("select failed: %d\n", rc);
+			kprintf("select failed: %d\n", errno);
 			break;
 		}
 
@@ -222,7 +223,7 @@ static int TCPServer(void* arg)
 
 						if (rc < 0)
 						{
-							kprintf("recv failed: %d\n", rc);
+							kprintf("recv failed: %d\n", errno);
 							break;
 						}
             
@@ -252,7 +253,7 @@ static int TCPServer(void* arg)
 
 						if (rc < 0)
 						{
-							kprintf("send failed: %d\n", rc);
+							kprintf("send failed: %d\n", errno);
 							break;
 						}
 
@@ -310,7 +311,7 @@ int TCP_Bench(void)
 
 	if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0)
 	{
-		kprintf("socket failed: %d\n", server);
+		kprintf("socket failed: %d\n", errno);
 		kfree(cBuffer, TMAXSIZE);
 		return -2;
 	}
@@ -324,7 +325,7 @@ int TCP_Bench(void)
 
 	if ((err = connect(server, (struct sockaddr *) &sa_server, sizeof(sa_server))) < 0)
 	{
-		kprintf("connect failed: %d\n", err);
+		kprintf("connect failed: %d\n", errno);
 		closesocket(server);
 		kfree(cBuffer, TMAXSIZE);
 		return -2;
@@ -360,8 +361,8 @@ int TCP_Bench(void)
 
 				if (rc < 0)
 				{
-					kprintf("send failed: %d\n", rc);
-					break;
+					kprintf("send failed: %d\n", errno);
+					return -1;
 				}
           
 				if (rc > 0)
@@ -404,8 +405,8 @@ int TCP_Bench(void)
 
 				if (rc < 0)
 				{
-					kprintf("recv failed: %d\n", rc);
-					break;
+					kprintf("recv failed: %d\n", errno);
+					return -1;
 				}
           
 				if (rc > 0)
@@ -448,6 +449,7 @@ int netio_init(void)
 	} else if (RCCE_ue() == 0) {
 		sleep(3);
 		err = TCP_Bench();
+		stats_display();
 	}
 #else
 	err = create_kernel_task(NULL, TCPServer, NULL, NORMAL_PRIO);