Changeset 6253 for trunk/src

Timestamp:

Jul 8, 2001, 5:44:27 PM (24 years ago)

Author:

achimha

Message:

IPPROTO_IP support for setsockopt, WSAEnumNetworkEvents fixes

Location:

trunk/src/wsock32

Files:

• asyncapi.cpp (modified) (2 diffs)
• wsock32.cpp (modified) (7 diffs)

trunk/src/wsock32/asyncapi.cpp

@@ -1 @@
-/* $Id: asyncapi.cpp,v 1.14 2001-07-07 18:49:13 achimha Exp $ */
+/* $Id: asyncapi.cpp,v 1.15 2001-07-08 15:44:27 achimha Exp $ */
 
 /*
@@ -671 +671 @@
         return SOCKET_ERROR;
    }
-#if 0
-// AH: null sempahore is ok when clearing request
-   else
-   if ((mode == WSA_SELECT_HEVENT) && !(WSAEVENT)notifyHandle)
-   {
-        dprintf(("invalid event semaphore handle"));
-        WSASetLastError(WSAEINVAL);             // invalid parameter
-        return SOCKET_ERROR;
-   }
-#endif
-
-   //Set socket to non-blocking mode
-   ret = ioctl(s, FIONBIO, (char *) &nonblock, sizeof(nonblock));
+
+   // Set socket to non-blocking mode
+   ret = ioctl(s, FIONBIO, (char *)&nonblock, sizeof(nonblock));
    if(ret == SOCKET_ERROR) {
         dprintf(("setting socket to non blocking mode failed"));

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.36 2001-07-07 10:44:10 achimha Exp $ */
+/* $Id: wsock32.cpp,v 1.37 2001-07-08 15:44:27 achimha Exp $ */
 
 /*
@@ -151 +151 @@
 void WIN32API WSASetLastError(int iError)
 {
-  // according to the docs, WSASetLastError() is just a call-through
-  // to SetLastError()
-  if(iError) {
-        dprintf(("WSASetLastError 0x%x", iError));
-  }
-  SetLastError(iError);
+#ifdef DEBUG
+    char msg[20];
+#endif
+    // according to the docs, WSASetLastError() is just a call-through
+    // to SetLastError()
+    SetLastError(iError);
+#ifdef DEBUG
+    switch (iError)
+    {
+        case NO_ERROR:
+            strcpy(msg, "no error");
+            break;
+        case WSAEINTR:
+            strcpy(msg, "WSAEINTR");
+            break;
+        case WSAEBADF:
+            strcpy(msg, "WSAEBADF");
+            break;
+        case WSAEACCES:
+            strcpy(msg, "WSAEACCES");
+            break;
+        case WSAEFAULT:
+            strcpy(msg, "WSAEFAULT");
+            break;
+        case WSAEINVAL:
+            strcpy(msg, "WSAEINVAL");
+            break;
+        case WSAEMFILE:
+            strcpy(msg, "WSAEMFILE");
+            break;
+        case WSAEWOULDBLOCK:
+            strcpy(msg, "WSAEWOULDBLOCK");
+            break;
+        case WSAEINPROGRESS:
+            strcpy(msg, "WSAEINPROGRESS");
+            break;
+        case WSAEALREADY:
+            strcpy(msg, "WSAEALREADY");
+            break;
+        default:
+            strcpy(msg, "unknown");
+    }
+    if (iError != 0)
+    {
+        dprintf(("WSASetLastError 0x%x - %s", iError, msg));
+    }
+#endif
 }
 //******************************************************************************
@@ -884 +925 @@
    optval = safeoptval;
 
-   if (level == SOL_SOCKET) {
-        switch(optname) {
+   if (level == SOL_SOCKET)
+   {
+        switch(optname)
+        {
         case SO_DONTLINGER:
         case SO_LINGER:
-                if(optlen < (int)sizeof(ws_linger)) {
+                if(optlen < (int)sizeof(ws_linger))
+                {
                         dprintf(("SOL_SOCKET, SO_LINGER, optlen too small"));
                         WSASetLastError(WSAEFAULT);
@@ -901 +945 @@
         case SO_SNDBUF:
         case SO_RCVBUF:
-                if(optlen < (int)sizeof(int)) {
+                if(optlen < (int)sizeof(int))
+                {
                         dprintf(("SOL_SOCKET, SO_RCVBUF, optlen too small"));
                         WSASetLastError(WSAEFAULT);
@@ -934 +979 @@
                 break;
         default:
-                dprintf(("setsockopt: unknown option %x", optname));
+                dprintf(("setsockopt: SOL_SOCKET, unknown option %x", optname));
                 WSASetLastError(WSAENOPROTOOPT);
                 return SOCKET_ERROR;
@@ -940 +985 @@
    }
    else
-   if(level == IPPROTO_TCP) {
+   if(level == IPPROTO_TCP)
+   {
         if(optname == TCP_NODELAY) {
                 if(optlen < (int)sizeof(int)) {
@@ -950 +996 @@
         }
         else {
-                dprintf(("setsockopt: unknown option %x", optname));
+                dprintf(("setsockopt: IPPROTO_TCP, unknown option %x", optname));
                 WSASetLastError(WSAENOPROTOOPT);
                 return SOCKET_ERROR;
         }
+   }
+   else
+   if (level == IPPROTO_IP)
+   {
+       switch (optname)
+       {
+           case IP_MULTICAST_IF:
+           {
+               if (optlen < sizeof(in_addr))
+               {
+                   dprintf(("IPPROTO_IP, IP_MULTICAST_IP, optlen too small"));
+                   WSASetLastError(WSAEFAULT);
+                   return SOCKET_ERROR;
+               }
+               //TODO convert common interface names!
+               ret = setsockopt(s, level, optname, (char *)optval, optlen);
+               break;
+           }
+
+           default:
+                dprintf(("setsockopt: IPPROTO_IP, unknown option %x", optname));
+                WSASetLastError(WSAENOPROTOOPT);
+                return SOCKET_ERROR;
+       }
    }
    else {