Changeset 19130 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 23, 2009 8:19:03 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

46337

Message:

NetAdp/win: static ip settings by default, dynamic calculation

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (2 diffs)
• HostNetworkInterfaceImpl.cpp (modified) (1 diff)
• win/NetIf-win.cpp (modified) (2 diffs)

trunk/src/VBox/Main/HostImpl.cpp

@@ -22 +22 @@
 #define __STDC_LIMIT_MACROS
 #define __STDC_CONSTANT_MACROS
+
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
+# include <VBox/WinNetConfig.h>
+#endif /* #if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT) */
 
 #ifdef RT_OS_LINUX
@@ -123 +127 @@
 #include <VBox/err.h>
 #include <VBox/settings.h>
-
-#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
-# include <VBox/WinNetConfig.h>
-#endif /* #if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT) */
 
 #include <stdio.h>

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -501 +501 @@
             if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPV6Address", mInterfaceName.raw())), Bstr(aIPV6Address))))
                 return E_FAIL;
-            if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPV6NetMask", mInterfaceName.raw())), 
+            if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPV6NetMask", mInterfaceName.raw())),
                                            Bstr(Utf8StrFmt("%u", aIPV6MaskPrefixLength)))))
                 return E_FAIL;

trunk/src/VBox/Main/win/NetIf-win.cpp

@@ -1384 +1384 @@
             if (hrc == S_OK)
             {
+                ULONG ip, mask;
+                hrc = VBoxNetCfgWinGenHostOnlyNetworkNetworkIp(&ip, &mask);
+                if(hrc == S_OK)
+                {
+                    /* ip returned by VBoxNetCfgWinGenHostOnlyNetworkNetworkIp is a network ip,
+                     * i.e. 192.168.xxx.0, assign  192.168.xxx.1 for the hostonly adapter */
+                    ip = ip | (1 << 24);
+                    hrc = VBoxNetCfgWinEnableStaticIpConfig((const GUID*)guid.raw(), ip, mask);
+                }
+
                 /* write success followed by GUID */
                 vrc = aClient->write (SVCHlpMsg::CreateHostOnlyNetworkInterface_OK);
@@ -1770 +1780 @@
         if (hr == S_OK)
         {
-            return collectNetIfInfo(name, Guid(IfGuid), pInfo);
+            memset(pInfo, 0, sizeof(NETIFINFO));
+            Guid guid(IfGuid);
+            pInfo->Uuid = *(guid.raw());
+
+            return collectNetIfInfo(name, guid, pInfo);
         }
     }