Changeset 2960 in vbox for trunk

Timestamp:

May 31, 2007 11:26:17 AM (18 years ago)

Author:

vboxsync

Message:

Implement Windows host variant of determining domain name to pass in NAT DHCP. This required bumping the Windows API version.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/slirp/slirp.c (modified) (4 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -334 +334 @@
 Storage/DrvHostDVD.cpp_SDKS.win = W2K3DDK
 Drivers_DEFS       = IN_IDE_R3
+Drivers_DEFS.win.x86    += _WIN32_WINNT=0x0500
+Drivers_DEFS.win.amd64  += _WIN32_WINNT=0x0510
 Drivers_INCS      := \
         $(PATH_SUB_CURRENT) \

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -16 +16 @@
                                const char **ppszDomain)
 {
+    int rc = 0;
     FIXED_INFO *FixedInfo=NULL;
     ULONG    BufLen;
@@ -21 +22 @@
     IP_ADDR_STRING *pIPAddr;
     struct in_addr tmp_addr;
-
-    *ppszDomain = NULL;
-    /** @todo implement search list for Windows host. */
 
     FixedInfo = (FIXED_INFO *)GlobalAlloc(GPTR, sizeof(FIXED_INFO));
@@ -42 +40 @@
             FixedInfo = NULL;
         }
-        return -1;
+        rc = -1;
+        goto get_dns_prefix;
     }
 
@@ -60 +59 @@
         FixedInfo = NULL;
     }
-    return 0;
+
+get_dns_prefix:
+    *ppszDomain = NULL;
+    {
+        OSVERSIONINFO ver;
+        char szDnsDomain[256];
+        DWORD dwSize = sizeof(szDnsDomain);
+
+        GetVersionEx(&ver);
+        if (ver.dwMajorVersion >= 5)
+        {
+            /* GetComputerNameEx exists in Windows versions starting with 2000. */
+            if (GetComputerNameEx(ComputerNameDnsDomain, szDnsDomain, &dwSize))
+            {
+                if (szDnsDomain[0])
+                {
+                    /* Just non-empty strings are valid. */
+                    *ppszDomain = RTStrDup(szDnsDomain);
+                    if (pData->fPassDomain)
+                        LogRel(("NAT: passing domain name %s\n", szDnsDomain));
+                    else
+                        Log(("nat: ignoring domain %s\n", szDnsDomain));
+                }
+            }
+            else
+                Log(("nat: GetComputerNameEx failed (%d)\n", GetLastError()));
+        }
+    }
+    return rc;
 }