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

Timestamp:

Mar 14, 2000, 3:59:43 PM (25 years ago)

Author:

sandervl

Message:

changed setsockopt bugfix

File:

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

trunk/src/wsock32/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.18 2000-03-13 20:32:24 sandervl Exp $ */
+/* $Id: wsock32.cpp,v 1.19 2000-03-14 14:59:43 sandervl Exp $ */
 
 /*
@@ -47 +47 @@
 #include <win32wnd.h>
 #include <stdlib.h>
+#include <win32api.h>
 
 #include "wsock32.h"
@@ -70 +71 @@
  * Prototypes                                                                *
  *****************************************************************************/
-
-void __stdcall SetLastError(DWORD dwError);
-
 
 /*****************************************************************************
@@ -735 +733 @@
         ULONG size;
 
-        //SvL: Limit send & receive buffer length to 64k
-        size = min(*(ULONG *)optval, 65000);
-        rc = setsockopt(s,level,optname, (char *)&size,optlen);
+        size = *(ULONG *)optval;
+tryagain:
+        rc = setsockopt(s,level,optname, (char *)&size, sizeof(ULONG));
+        if(rc == SOCKET_ERROR && size > 65535) {
+                //SvL: Limit send & receive buffer length to 64k
+                //     (only happens with 16 bits tcpip stack?)
+                size = 65000;
+                goto tryagain;
+        }
+
   }
   else {
@@ -1379 +1384 @@
   HWND  hwndOS2 = Win32ToOS2Handle(hWnd);
   ULONG ulNewID;
+
+  dprintf(("WSAAsyncGetHostByName %s", name));
 
   if (hwndRelay == NULL) // already initialized ?