Changeset 3260 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

socket error fixes

Location:

trunk/src/wsock32

Files:

• asyncapi.cpp (modified) (2 diffs)
• wsa.cpp (modified) (4 diffs)
• wsock32.cpp (modified) (3 diffs)

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.3 2000-03-24 19:28:03 sandervl Exp $ */
+/* $Id: asyncapi.cpp,v 1.4 2000-03-28 17:13:05 sandervl Exp $ */
 
 /*
@@ -461 +461 @@
                 int selecterr = sock_errno();
                 dprintf(("WSAsyncSelectThreadProc %x rds=%d, wrs=%d, oos =%d, pending = %x select returned %x", pThreadParm->u.asyncselect.s, noread, nowrite, noexcept, lEventsPending, selecterr));
+                if(selecterr && selecterr < SOCBASEERR) {
+                        selecterr += SOCBASEERR;
+                }
                 switch(selecterr) 
                 {
                 case SOCEINTR:
+                        state = ioctl(s, FIOBSTATUS, (char *)&tmp, sizeof(tmp));
+                        dprintf(("SOCEINTR; state = %x", state));
                         goto asyncloopstart;    //so_cancel was called
 

trunk/src/wsock32/wsa.cpp

@@ -1 @@
-/* $Id: wsa.cpp,v 1.3 2000-03-24 19:28:08 sandervl Exp $ */
+/* $Id: wsa.cpp,v 1.4 2000-03-28 17:13:06 sandervl Exp $ */
 
 /*
@@ -157 +157 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(int,__WSAFDIsSet,SOCKET, s,
-                                  ws_fd_set*,set)
+ODINFUNCTION2(int,__WSAFDIsSet,SOCKET, s, ws_fd_set*,set)
 {
   int i = set->fd_count;
@@ -173 +172 @@
  int loc_errno = sock_errno();
 
+    //Warp 4 returns errors with base 0
+    if(loc_errno && loc_errno < SOCBASEERR) {
+        loc_errno += SOCBASEERR;
+    }
     switch(loc_errno)
     {
@@ -215 +218 @@
         case SOCEHOSTUNREACH:   return WSAEHOSTUNREACH;
         case SOCENOTEMPTY:      return WSAENOTEMPTY;
-#ifdef EPROCLIM
-        case SOCEPROCLIM:       return WSAEPROCLIM;
-#endif
-#ifdef EUSERS
-        case SOCEUSERS:         return WSAEUSERS;
-#endif
-#ifdef EDQUOT
-        case SOCEDQUOT:         return WSAEDQUOT;
-#endif
-#ifdef ESTALE
-        case SOCESTALE:         return WSAESTALE;
-#endif
-#ifdef EREMOTE
-        case SOCEREMOTE:        return WSAEREMOTE;
-#endif
+        case SOCENXIO:
+        case SOCESRCH:
+        case SOCEOS2ERR:        return WSAEFAULT;
 
         /* just in case we ever get here and there are no problems */

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