Changeset 3260 for trunk/src/wsock32/wsock32.cpp

Timestamp:

Mar 28, 2000, 7:13:06 PM (25 years ago)

Author:

sandervl

Message:

socket error fixes

File:

• trunk/src/wsock32/wsock32.cpp (modified) (3 diffs)

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.25 2000-03-24 23:14:29 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.26 2000-03-28 17:13:06 sandervl Exp $ */
 
 /*
@@ -262 +262 @@
    // map BSD error codes
    if(ret == SOCKET_ERROR) {
-        if(sock_errno() == SOCEINPROGRESS) {
+        int sockerror = sock_errno();
+        if(sockerror && sockerror < SOCBASEERR) {
+                sockerror += SOCBASEERR;
+        }
+        if(sockerror == SOCEINPROGRESS) {
                 WSASetLastError(WSAEWOULDBLOCK);
         } 
         else 
-        if (sock_errno() == SOCEOPNOTSUPP) {
+        if(sockerror == SOCEOPNOTSUPP) {
                 WSASetLastError(WSAEINVAL);
         }
@@ -324 +328 @@
 
    // Map EOPNOTSUPP to EINVAL
-   if(ret == SOCKET_ERROR && sock_errno() == SOCEOPNOTSUPP)
+   int sockerror = sock_errno();
+   if(sockerror && sockerror < SOCBASEERR) {
+        sockerror += SOCBASEERR;
+   }
+
+   if(ret == SOCKET_ERROR && sockerror == SOCEOPNOTSUPP)
         WSASetLastError(WSAEINVAL);
    else