Changeset 18014 in vbox

Timestamp:

Mar 17, 2009 11:59:31 AM (16 years ago)

Author:

vboxsync

Message:

Host-only static IP persistency and defaults for all platforms except windows.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl2.cpp (modified) (2 diffs)
• HostNetworkInterfaceImpl.cpp (modified) (5 diffs)
• include/netif.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -78 +78 @@
 # include <Ntddndis.h>
 # include <devguid.h>
+#endif
+
+#if !defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
+# include <HostNetworkInterfaceImpl.h>
+# include <netif.h>
 #endif
 
@@ -1801 +1806 @@
                 networkName = Bstr("HostInterfaceNetworking-vboxnet0");
 #endif
+#ifndef RT_OS_WINDOWS
+                Bstr HifName;
+                hrc = networkAdapter->COMGETTER(HostInterface)(HifName.asOutParam());
+                if(FAILED(hrc))
+                {
+                    LogRel(("NetworkAttachmentType_HostOnly: COMGETTER(HostInterface) failed, hrc (0x%x)", hrc));
+                    H();
+                }
+
+                Utf8Str HifNameUtf8(HifName);
+                const char *pszHifName = HifNameUtf8.raw();
+                ComPtr<IHostNetworkInterface> hostInterface;
+                rc = host->FindHostNetworkInterfaceByName(HifName, hostInterface.asOutParam());
+                if (!SUCCEEDED(rc))
+                {
+                    LogRel(("NetworkAttachmentType_HostOnly: FindByName failed, rc (0x%x)", rc));
+                    return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
+                                      N_("Inexistent host networking interface, name '%ls'"),
+                                      HifName.raw());
+                }
+                Bstr tmpAddr, tmpMask;
+                hrc = virtualBox->GetExtraData(Bstr("HostOnly/vboxnet0/IPAddress"), tmpAddr.asOutParam());
+                if (SUCCEEDED(hrc) && !tmpAddr.isNull())
+                {
+                    hrc = virtualBox->GetExtraData(Bstr("HostOnly/vboxnet0/IPNetMask"), tmpMask.asOutParam());
+                    if (SUCCEEDED(hrc) && !tmpAddr.isEmpty())
+                        hrc = hostInterface->EnableStaticIpConfig(tmpAddr, tmpMask);
+                }
+                else
+                    hrc = hostInterface->EnableStaticIpConfig(Bstr(VBOXNET_IPV4ADDR_DEFAULT),
+                                                              Bstr(VBOXNET_IPV4MASK_DEFAULT));
+                
+                
+                hrc = virtualBox->GetExtraData(Bstr("HostOnly/vboxnet0/IPV6Address"), tmpAddr.asOutParam());
+                if (SUCCEEDED(hrc))
+                    hrc = virtualBox->GetExtraData(Bstr("HostOnly/vboxnet0/IPV6NetMask"), tmpMask.asOutParam());
+                if (SUCCEEDED(hrc) && !tmpAddr.isEmpty())
+                    hrc = hostInterface->EnableStaticIpConfigV6(tmpAddr, Utf8Str(tmpMask).toUInt32());
+#endif 
                 break;
             }

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -217 +217 @@
     if (m.IPAddress == 0)
     {
-        Bstr("").detachTo(aIPAddress);
+        Bstr(VBOXNET_IPV4ADDR_DEFAULT).detachTo(aIPAddress);
         return S_OK;
     }
@@ -250 +250 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    if (m.IPAddress == 0 || m.networkMask == 0)
-    {
-        Bstr("").detachTo(aNetworkMask);
+    if (m.networkMask == 0)
+    {
+        Bstr(VBOXNET_IPV4MASK_DEFAULT).detachTo(aNetworkMask);
         return S_OK;
     }
@@ -417 +417 @@
     {
         if (m.IPAddress)
-            return NetIfEnableStaticIpConfig(mVBox, this, m.IPAddress, 0, 0);
+        {
+            int rc = NetIfEnableStaticIpConfig(mVBox, this, m.IPAddress, 0, 0);
+            if (RT_SUCCESS(rc))
+            {
+                if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPAddress", mInterfaceName.raw())), Bstr(""))))
+                    return E_FAIL;
+                if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPNetMask", mInterfaceName.raw())), Bstr(""))))
+                    return E_FAIL;
+                return S_OK;
+            }
+        }
         else
             return S_OK;
@@ -432 +442 @@
         if(mask != INADDR_NONE)
         {
-            int rc = S_OK;
-            if (m.IPAddress != ip || m.networkMask != mask)
-                rc = NetIfEnableStaticIpConfig(mVBox, this, m.IPAddress, ip, mask);
+            if (m.IPAddress == ip && m.networkMask == mask)
+                return S_OK;
+            int rc = NetIfEnableStaticIpConfig(mVBox, this, m.IPAddress, ip, mask);
             if (RT_SUCCESS(rc))
             {
+                if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPAddress", mInterfaceName.raw())), Bstr(aIPAddress))))
+                    return E_FAIL;
+                if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPNetMask", mInterfaceName.raw())), Bstr(aNetMask))))
+                    return E_FAIL;
                 return S_OK;
             }
@@ -470 +484 @@
             aIPV6MaskPrefixLength = 64;
         rc = NetIfEnableStaticIpConfigV6(mVBox, this, m.IPV6Address, aIPV6Address, aIPV6MaskPrefixLength);
-    }
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("Failed to EnableStaticIpConfigV6 with rc=%Vrc\n", rc));
-        return rc == VERR_NOT_IMPLEMENTED ? E_NOTIMPL : E_FAIL;
+        if (RT_FAILURE(rc))
+        {
+            LogRel(("Failed to EnableStaticIpConfigV6 with rc=%Vrc\n", rc));
+            return rc == VERR_NOT_IMPLEMENTED ? E_NOTIMPL : E_FAIL;
+        }
+        else
+        {
+            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())), 
+                                           Bstr(Utf8StrFmt("%u", aIPV6MaskPrefixLength)))))
+                return E_FAIL;
+        }
+
     }
     return S_OK;

trunk/src/VBox/Main/include/netif.h

@@ -27 +27 @@
 #include <iprt/asm.h>
 
-//#include "VBox/com/ptr.h"
-//#include <list>
+#define VBOXNET_IPV4ADDR_DEFAULT "192.168.56.1"
+#define VBOXNET_IPV4MASK_DEFAULT "255.255.255.0"
 
 #if 1