[ros-diffs] [cgutman] 48519: [MSWSOCK] - Implement FIONBIO and fix the error case to not cause a deadlock later

[cgutman]

Author: cgutman
Date: Thu Aug 12 03:51:12 2010
New Revision: 48519

URL: http://svn.reactos.org/svn/reactos?rev=48519&view=rev
Log:
[MSWSOCK]
- Implement FIONBIO and fix the error case to not cause a deadlock later

Modified:
    branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c

Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c
URL: 
http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c?rev=48519&r1=48518&r2=48519&view=diff
==============================================================================
--- branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c 
[iso-8859-1] (original)
+++ branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c 
[iso-8859-1] Thu Aug 12 03:51:12 2010
@@ -213,7 +213,8 @@
     PSOCKET_INFORMATION Socket;
     INT ErrorCode;
     PWINSOCK_TEB_DATA ThreadData;
-
+       BOOLEAN Blocking;
+       
     /* Enter prolog */
     ErrorCode = SockEnterApiFast(&ThreadData);
     if (ErrorCode != NO_ERROR)
@@ -222,7 +223,7 @@
         *lpErrno = ErrorCode;
         return SOCKET_ERROR;
     }
-
+       
     /* Get the socket structure */
     Socket = SockFindAndReferenceSocket(Handle, TRUE);
     if (!Socket)
@@ -231,14 +232,13 @@
         ErrorCode = WSAENOTSOCK;
         goto error;
     }
-
+       
     /* Lock the socket */
     EnterCriticalSection(&Socket->Lock);
-
+       
     switch(dwIoControlCode) {
-        
-        case FIONBIO:
-
+                       
+        case FIONBIO:                  
             /* Check if the Buffer is OK */
             if(cbInBuffer < sizeof(ULONG))
             {
@@ -246,16 +246,25 @@
                 ErrorCode = WSAEFAULT;
                 goto error;
             }
-
-            return 0;
-
+                       
+                       Blocking = (*(PULONG)lpvInBuffer) ? TRUE : FALSE;
+                       
+                       Socket->SharedData.NonBlocking = Blocking;
+                       
+                       ErrorCode = SockSetInformation(Socket,
+                                                                               
   AFD_INFO_BLOCKING_MODE,
+                                                                               
   &Blocking,
+                                                                               
   NULL,
+                                                                               
   NULL);
+            break;
+                       
         default:
-
+                       
             /* Unsupported for now */
-            *lpErrno = WSAEINVAL;
-            return SOCKET_ERROR;
-    }
-
+            ErrorCode = WSAEINVAL;
+                       break;
+    }
+       
 error:
     /* Check if we had a socket */
     if (Socket)
@@ -264,7 +273,7 @@
         LeaveCriticalSection(&Socket->Lock);
         SockDereferenceSocket(Socket);
     }
-
+       
     /* Check for error */
     if (ErrorCode != NO_ERROR)
     {
@@ -272,7 +281,7 @@
         *lpErrno = ErrorCode;
         return SOCKET_ERROR;
     }
-
+       
     /* Return to caller */
     return NO_ERROR;
 }