Changeset 1344

Timestamp:

Apr 7, 2004, 1:25:56 AM (21 years ago)

Author:

bird

Message:

#732: SOL_SOCKET+SO_ERROR needed error number wrapping.

Location:

branches/GCC_3-2-2_BETA4_BRANCH/src/emx/src/libsocket

Files:

• getsockopt.c (modified) (1 diff, 1 prop)
• setsockopt.c (modified) (2 diffs, 1 prop)

branches/GCC_3-2-2_BETA4_BRANCH/src/emx/src/libsocket/getsockopt.c

@@ -46 +46 @@
         rc = __libsocket_getsockopt(pFHSocket->iSocket, level, optname, optval, optlen);
         if (rc >= 0)
+        {
+            switch (level)
+            {
+                case SOL_SOCKET:
+                    switch (optname)
+                    {
+                        case SO_ERROR:
+                        {
+                            int err = *(int*)optval;
+                            if (err >= EOS2_TCPIP_OFFSET && err < EOS2_TCPIP_OFFSET + 1000)
+                            {
+                                err -= EOS2_TCPIP_OFFSET;
+                                *(int*)optval = err;
+                            }
+                            LIBCLOG_MSG("err: %d\n", err);
+                            break;
+                        }
+                    }
+                    break;
+            }
             LIBCLOG_RETURN_INT(rc);
+        }
         __libsocket_setLibcErrno();
     }

branches/GCC_3-2-2_BETA4_BRANCH/src/emx/src/libsocket/setsockopt.c

@@ -38 +38 @@
 int setsockopt(int socket, int level, int optname, const void *optval, int optlen)
 {
-    LIBCLOG_ENTER("socket=%d level=%#x optname=%#x optval=%p optlen=%p\n",
+    LIBCLOG_ENTER("socket=%d level=%#x optname=%#x optval=%p optlen=%d\n",
                   socket, level, optname, optval, optlen);
     PLIBCSOCKETFH   pFHSocket = __libsocket_FH(socket);
@@ -44 +44 @@
     {
         int rc;
-        rc = __libsocket_setsockopt(pFHSocket->iSocket, level, optname, optval, optlen);
+        if (    level == SOL_SOCKET
+            &&  optname == SO_ERROR
+            &&  optlen == 4
+            &&  optval)
+        {
+            int err = *(int*)optval;
+            if (err > 0 && err <= 1000)
+                err += EOS2_TCPIP_OFFSET;
+            LIBCLOG_MSG("err: %d\n", err);
+            rc = __libsocket_setsockopt(pFHSocket->iSocket, SOL_SOCKET, SO_ERROR, &err, 4);
+        }
+        else
+            rc = __libsocket_setsockopt(pFHSocket->iSocket, level, optname, optval, optlen);
         if (rc >= 0)
             LIBCLOG_RETURN_INT(rc);