Changeset 18594 in vbox

Timestamp:

Apr 1, 2009 12:15:40 PM (15 years ago)

Author:

vboxsync

Message:

Fixed the problem with vboxnet0 not getting static IP on VM start.

Location:

trunk/src/VBox/Main

Files:

• HostNetworkInterfaceImpl.cpp (modified) (6 diffs)
• include/HostNetworkInterfaceImpl.h (modified) (1 diff)

trunk/src/VBox/Main/HostNetworkInterfaceImpl.cpp

@@ -86 +86 @@
     if(RT_SUCCESS(rc))
     {
-        m.IPAddress = info.IPAddress.u;
-        m.networkMask = info.IPNetMask.u;
+        m.realIPAddress = m.IPAddress = info.IPAddress.u;
+        m.realNetworkMask = m.networkMask = info.IPNetMask.u;
         m.dhcpEnabled = info.bDhcpEnabled;
-        m.IPV6Address = composeIPv6Address(&info.IPv6Address);
-        m.IPV6NetworkMaskPrefixLength = composeIPv6PrefixLenghFromAddress(&info.IPv6NetMask);
+        m.realIPV6Address = m.IPV6Address = composeIPv6Address(&info.IPv6Address);
+        m.realIPV6PrefixLength = m.IPV6NetworkMaskPrefixLength = composeIPv6PrefixLenghFromAddress(&info.IPv6NetMask);
         m.hardwareAddress = composeHardwareAddress(&info.MACAddress);
 #ifdef RT_OS_WINDOWS
@@ -129 +129 @@
     mIfType = ifType;
 
-    m.IPAddress = pIf->IPAddress.u;
-    m.networkMask = pIf->IPNetMask.u;
-    m.IPV6Address = composeIPv6Address(&pIf->IPv6Address);
-    m.IPV6NetworkMaskPrefixLength = composeIPv6PrefixLenghFromAddress(&pIf->IPv6NetMask);
+    m.realIPAddress = m.IPAddress = pIf->IPAddress.u;
+    m.realNetworkMask = m.networkMask = pIf->IPNetMask.u;
+    m.realIPV6Address = m.IPV6Address = composeIPv6Address(&pIf->IPv6Address);
+    m.realIPV6PrefixLength = m.IPV6NetworkMaskPrefixLength = composeIPv6PrefixLenghFromAddress(&pIf->IPv6NetMask);
     m.dhcpEnabled = pIf->bDhcpEnabled;
     m.hardwareAddress = composeHardwareAddress(&pIf->MACAddress);
@@ -421 +421 @@
             if (RT_SUCCESS(rc))
             {
+                m.realIPAddress = 0;
                 if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPAddress", mInterfaceName.raw())), Bstr(""))))
                     return E_FAIL;
@@ -442 +443 @@
         if(mask != INADDR_NONE)
         {
-            if (m.IPAddress == ip && m.networkMask == mask)
+            if (m.realIPAddress == ip && m.realNetworkMask == mask)
                 return S_OK;
             int rc = NetIfEnableStaticIpConfig(mVBox, this, m.IPAddress, ip, mask);
             if (RT_SUCCESS(rc))
             {
+                m.realIPAddress   = ip;
+                m.realNetworkMask = mask;
                 if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPAddress", mInterfaceName.raw())), Bstr(aIPAddress))))
                     return E_FAIL;
@@ -479 +482 @@
 
     int rc = S_OK;
-    if (m.IPV6Address != aIPV6Address || m.IPV6NetworkMaskPrefixLength != aIPV6MaskPrefixLength)
+    if (m.realIPV6Address != aIPV6Address || m.realIPV6PrefixLength != aIPV6MaskPrefixLength)
     {
         if (aIPV6MaskPrefixLength == 0)
@@ -491 +494 @@
         else
         {
+            m.realIPV6Address = aIPV6Address;
+            m.realIPV6PrefixLength = aIPV6MaskPrefixLength;
             if (FAILED(mVBox->SetExtraData(Bstr(Utf8StrFmt("HostOnly/%ls/IPV6Address", mInterfaceName.raw())), Bstr(aIPV6Address))))
                 return E_FAIL;

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

@@ -108 +108 @@
         Bstr IPV6Address;
         ULONG IPV6NetworkMaskPrefixLength;
+        ULONG realIPAddress;
+        ULONG realNetworkMask;
+        Bstr  realIPV6Address;
+        ULONG realIPV6PrefixLength;
         BOOL dhcpEnabled;
         Bstr hardwareAddress;