Changeset 38406 in vbox

Timestamp:

Aug 10, 2011 3:40:47 PM (13 years ago)

Author:

vboxsync

Message:

vboxnetadp: moved SetExtraData calls to Host::CreateHostOnlyNetworkInterface (#5817)

Location:

trunk/src/VBox/Main/src-server

Files:

• HostImpl.cpp (modified) (1 diff)
• HostNetworkInterfaceImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -1102 +1102 @@
     int r = NetIfCreateHostOnlyNetworkInterface(m->pParent, aHostNetworkInterface, aProgress);
     if (RT_SUCCESS(r))
+    {
+#if !defined(RT_OS_WINDOWS)
+        Bstr tmpAddr, tmpMask, tmpName;
+        HRESULT hrc;
+        hrc = (*aHostNetworkInterface)->COMGETTER(Name)(tmpName.asOutParam());
+        ComAssertComRCRet(hrc, hrc);
+        hrc = (*aHostNetworkInterface)->COMGETTER(IPAddress)(tmpAddr.asOutParam());
+        ComAssertComRCRet(hrc, hrc);
+        hrc = (*aHostNetworkInterface)->COMGETTER(NetworkMask)(tmpMask.asOutParam());
+        ComAssertComRCRet(hrc, hrc);
+        /*
+         * We need to write the default IP address and mask to extra data now,
+         * so the interface gets re-created after vboxnetadp.ko reload.
+         * Note that we avoid calling EnableStaticIpConfig since it would
+         * change the address on host's interface as well and we want to
+         * postpone the change until VM actually starts.
+         */
+        hrc = m->pParent->SetExtraData(BstrFmt("HostOnly/%ls/IPAddress",
+                                               tmpName.raw()).raw(),
+                                       tmpAddr.raw());
+        ComAssertComRCRet(hrc, hrc);
+
+        hrc = m->pParent->SetExtraData(BstrFmt("HostOnly/%ls/IPNetMask",
+                                               tmpName.raw()).raw(),
+                                       tmpMask.raw());
+        ComAssertComRCRet(hrc, hrc);
+#endif
         return S_OK;
+    }
 
     return r == VERR_NOT_IMPLEMENTED ? E_NOTIMPL : E_FAIL;

trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp

@@ -564 +564 @@
         hrc = mVBox->GetExtraData(BstrFmt("HostOnly/%ls/IPNetMask", mInterfaceName.raw()).raw(), tmpMask.asOutParam());
         if (tmpAddr.isEmpty())
-        {
             tmpAddr = getDefaultIPv4Address(mInterfaceName);
-            /*
-             * We need to write the default IP address and mask to extra data now,
-             * so the interface gets re-created after vboxnetadp.ko reload.
-             * Note that we avoid calling EnableStaticIpConfig since it would
-             * change the address on host's interface as well and we want to
-             * postpone the change until VM actually starts.
-             */
-            hrc = mVBox->SetExtraData(BstrFmt("HostOnly/%ls/IPAddress",
-                                              mInterfaceName.raw()).raw(),
-                                      tmpAddr.raw());
-            ComAssertComRCRet(hrc, hrc);
-        }
 
         if (tmpMask.isEmpty())
-        {
             tmpMask = Bstr(VBOXNET_IPV4MASK_DEFAULT);
-            hrc = mVBox->SetExtraData(BstrFmt("HostOnly/%ls/IPNetMask",
-                                              mInterfaceName.raw()).raw(),
-                                      Bstr(VBOXNET_IPV4MASK_DEFAULT).raw());
-            ComAssertComRCRet(hrc, hrc);
-        }
+
         m.IPAddress = inet_addr(Utf8Str(tmpAddr).c_str());
         m.networkMask = inet_addr(Utf8Str(tmpMask).c_str());