[ros-diffs] [cgutman] 53039: [IP] - Correct the error number comments for lwIP 1.4.0 - Translate ERR_WOULDBLOCK - Translate ERR_IF and ERR_CONN to a more accurate status [LWIP] - Remove another debug print

Author: cgutman
Date: Tue Aug  2 23:46:32 2011
New Revision: 53039

URL: http://svn.reactos.org/svn/reactos?rev=53039&view=rev
Log:
[IP]
- Correct the error number comments for lwIP 1.4.0
- Translate ERR_WOULDBLOCK
- Translate ERR_IF and ERR_CONN to a more accurate status
[LWIP]
- Remove another debug print

Modified:
    branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c
    branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c

Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive…
==============================================================================
--- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1]
(original)
+++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Tue Aug
 2 23:46:32 2011
@@ -200,16 +200,17 @@
         case ERR_BUF: Status = STATUS_BUFFER_TOO_SMALL; break; //-2
         case ERR_TIMEOUT: Status = STATUS_TIMEOUT; break; // -3
         case ERR_RTE: Status = STATUS_NETWORK_UNREACHABLE; break; //-4
-        case ERR_ABRT: Status = STATUS_LOCAL_DISCONNECT; break; //-5
-        case ERR_RST: Status = STATUS_REMOTE_DISCONNECT; break; //-6
-        case ERR_CLSD: Status = STATUS_FILE_CLOSED; break; //-7
-        case ERR_CONN: Status = STATUS_UNSUCCESSFUL; break; //-8 (FIXME)
-        case ERR_VAL: Status = STATUS_INVALID_PARAMETER; break; //-9
-        case ERR_ARG: Status = STATUS_INVALID_PARAMETER; break; //-10
-        case ERR_USE: Status = STATUS_ADDRESS_ALREADY_EXISTS; break; //-11
-        case ERR_IF: Status = STATUS_NETWORK_UNREACHABLE; break; //-12
-        case ERR_ISCONN: Status = STATUS_UNSUCCESSFUL; break; //-13 (FIXME)
-        case ERR_INPROGRESS: Status = STATUS_PENDING; return Status; //-14
+        case ERR_INPROGRESS: Status = STATUS_PENDING; return Status; //-5
+        case ERR_VAL: Status = STATUS_INVALID_PARAMETER; break; //-6
+        case ERR_WOULDBLOCK: Status = STATUS_CANT_WAIT; break; //-7
+        case ERR_USE: Status = STATUS_ADDRESS_ALREADY_EXISTS; break; //-8
+        case ERR_ISCONN: Status = STATUS_UNSUCCESSFUL; break; //-9 (FIXME)
+        case ERR_ABRT: Status = STATUS_LOCAL_DISCONNECT; break; //-10
+        case ERR_RST: Status = STATUS_REMOTE_DISCONNECT; break; //-11
+        case ERR_CLSD: Status = STATUS_FILE_CLOSED; break; //-12
+        case ERR_CONN: Status = STATUS_INVALID_CONNECTION; break; //-13
+        case ERR_ARG: Status = STATUS_INVALID_PARAMETER; break; //-14
+        case ERR_IF: Status = STATUS_UNEXPECTED_NETWORK_ERROR; break; //-15
         default:
             DbgPrint("Invalid error value: %d\n", err);
             ASSERT(FALSE);

Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive…
==============================================================================
--- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original)
+++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Tue Aug  2
23:46:32 2011
@@ -236,9 +236,6 @@
 void
 InternalErrorEventHandler(void *arg, const err_t err)
 {
-    DbgPrint("[lwIP, InternalErrorEventHandler] ErrorEvent(0x%x, %d)\n",
-        arg, (unsigned int)err);
-    
     /* Make sure the socket didn't get closed */
     if (!arg) return;