Changeset 48401 in vbox

Timestamp:

Sep 10, 2013 11:34:05 AM (11 years ago)

Author:

vboxsync

Message:

lwip-nat: DHCP using system wide definition INET_ADDSTRLEN, on Windows we redefine it to BSD/Posix style.

File:

• trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp (modified) (2 diffs)

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -67 +67 @@
 # include <Windows.h>
 # include <stdlib.h>
+# ifdef INET_ADDRSTRLEN
+/* On Windows INET_ADDRSTRLEN defined as 22 Ws2ipdef.h, because it include port number */
+#  undef INET_ADDRSTRLEN
+# endif
+# define INET_ADDRSTRLEN 16 
+#else
+# include <netinet/in.h>
 #endif
 
-#ifndef INET4_ADDRLEN
-# define INET4_ADDRLEN 17
-#endif
 
 #include "Config.h"
@@ -406 +410 @@
 
                 if (   pszTerm
-                       && (pszTerm - pszLo2Off) < 16)
+                       && (pszTerm - pszLo2Off) <= INET_ADDRSTRLEN)
                 {