Changeset 21456

Timestamp:

Sep 23, 2010, 10:09:19 PM (15 years ago)

Author:

dmik

Message:

WinSock2: IPPROTO_IP option constants have different values than in Winsock1.1 (closes ticket:10).

Location:

trunk

Files:

• include/win/winsock.h (modified) (2 diffs)
• include/win/winsock2.h (modified) (2 diffs)
• include/win/ws2tcpip.h (added)
• include/ws2defs.h (moved) (moved from trunk/include/ws2tcpip.h ) (4 diffs)
• src/ws2_32/socketodin.cpp (modified) (1 diff)
• src/wsock32/wsock32.cpp (modified) (1 diff)

trunk/include/win/winsock.h

@@ -233 +233 @@
 typedef WSADATA *LPWSADATA;
 
+#ifndef __WINSOCK2API__
 #define IP_OPTIONS          1
 #define IP_MULTICAST_IF     2
@@ -242 +243 @@
 #define IP_TOS              8
 #define IP_DONTFRAGMENT     9
-
+#endif
 
 #define IP_DEFAULT_MULTICAST_TTL   1

trunk/include/win/winsock2.h

@@ -8 +8 @@
 #define __WINSOCK2API__
 
-#include "winsock.h"
+#include <winsock.h>
 
 /* proper 4-byte packing */
-#include "pshpack4.h"
+#include <pshpack4.h>
 
 #define SO_GROUP_ID       0x2001
@@ -372 +372 @@
 extern INT WINAPI ioctlsocket(SOCKET s, LONG cmd, ULONG *argp);
 
-#include "poppack.h"
+#include <poppack.h>
 
 #endif

trunk/include/ws2defs.h

@@ -1 @@
-#ifndef _WS2TCPIPODIN_H_
-#define _WS2TCPIPODIN_H_
+#ifndef _WS2DEFS_H_
+#define _WS2DEFS_H_
 
 #define WS2_IPPROTO_OFFSET      100
@@ -6 +6 @@
 #define WS2_IPPROTO_OPT(a)      (a+WS2_IPPROTO_OFFSET)
 
+/* These match the WinSock 2 constants */
 #define IP_OPTIONS_WS2              1 /* set/get IP options */
 #define IP_HDRINCL_WS2              2 /* header is included with data */
@@ -17 +18 @@
 #define IP_DONTFRAGMENT_WS2        14 /* don't fragment IP datagrams */
 
+/* These match the OS/2 constants */
 #define IP_OPTIONS_OS2              1    /* buf/ip_opts; set/get IP options */
 #define IP_MULTICAST_IF_OS2         2    /* u_char; set/get IP multicast i/f  */
@@ -34 +36 @@
 #define SO_REUSEPORT_OS2            0x1000          /* allow local address & port reuse */
 
-#endif  /* _WS2TCPIP_H_ */
+#endif  /* _WS2DEFS_H_ */
 
 

trunk/src/ws2_32/socketodin.cpp

@@ -1 +1 @@
 /* $Id: socketodin.cpp,v 1.3 2002-07-03 09:47:37 sandervl Exp $ */
 
-#include <odin.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <debugtools.h>
-#include <misc.h>
+#include "odin.h"
+#include "winsock2.h"
+#include "ws2defs.h"
+#include "debugtools.h"
+#include "misc.h"
 
 ODINDEBUGCHANNEL(WS2_32-SOCKETODIN)

trunk/src/wsock32/wsock32.cpp

@@ -62 +62 @@
 
 #include "wsock32.h"
-#include <ws2tcpip.h>
+#include "ws2defs.h"
 #include "wsastruct.h"
 #include "asyncthread.h"