Changeset 48363 in vbox for trunk/src/VBox

Timestamp:

Sep 6, 2013 3:47:40 PM (11 years ago)

Author:

vboxsync

Message:

Port-forwarding/win: INET6_ADDRSTRLEN is defined in ws2ipdef.h and has value 65, opositely to BSD where it defined as 47.

XXX: including in VBoxManageNATNetwork.cpp winsock*.h and ws2* produce hard to fix mess of definitions, that why value locally defined as 65.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageNATNetwork.cpp (modified) (1 diff)
• NetworkServices/NetLib/VBoxNetPortForwardString.cpp (modified) (1 diff)
• NetworkServices/NetLib/VBoxPortForwardString.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageNATNetwork.cpp

@@ -30 +30 @@
 #ifndef RT_OS_WINDOWS
 # include <netinet/in.h>
+#else
+/* from  <ws2ipdef.h> */
+# define INET6_ADDRSTRLEN 65
 #endif
 

trunk/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp

@@ -23 +23 @@
 #else
 # include <Winsock2.h>
+# include <Ws2ipdef.h>
 #endif
 

trunk/src/VBox/NetworkServices/NetLib/VBoxPortForwardString.h

@@ -23 +23 @@
 
 RT_C_DECLS_BEGIN
-
-#ifndef INET6_ADDRSTRLEN
-  /* from netinet6/in6.h */
-# define INET6_ADDRSTRLEN 46
-#endif
 
 #define PF_NAMELEN 64