Changeset 36057 in vbox

Timestamp:

Feb 22, 2011 8:56:44 PM (14 years ago)

Author:

vboxsync

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

70169

Message:

Main/NetIf: Fixed host-only interface creation failure on Windows (#3873)

Location:

trunk/src/VBox/Main

Files:

• include/netif.h (modified) (1 diff)
• src-server/HostImpl.cpp (modified) (1 diff)
• src-server/HostNetworkInterfaceImpl.cpp (modified) (3 diffs)

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

@@ -147 +147 @@
 {
     /* Get the index from the name */
-    int iInstance;
-    if (sscanf(Utf8Str(bstrIfName).c_str(), "vboxnet%d", &iInstance) != 1)
-        return Bstr("0.0.0.0");
+    Utf8Str strTmp = bstrIfName;
+    const char *pszIfName = strTmp.c_str();
+    int iInstance = 0, iPos = strcspn(pszIfName, "0123456789");
+    if (pszIfName[iPos])
+        iInstance = RTStrToUInt32(pszIfName + iPos);
 
     in_addr tmp;

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

@@ -1101 +1101 @@
     int r = NetIfCreateHostOnlyNetworkInterface(m->pParent, aHostNetworkInterface, aProgress);
     if (RT_SUCCESS(r))
-    {
-        Bstr name;
-
-        HRESULT hrc = (*aHostNetworkInterface)->COMGETTER(Name)(name.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", name.raw()).raw(),
-                                    getDefaultIPv4Address(name).raw());
-        ComAssertComRCRet(hrc, hrc);
-        hrc = m->pParent->SetExtraData(BstrFmt("HostOnly/%ls/IPNetMask", name.raw()).raw(),
-                                    Bstr(VBOXNET_IPV4MASK_DEFAULT).raw());
-
-        return hrc;
-    }
+        return S_OK;
 
     return r == VERR_NOT_IMPLEMENTED ? E_NOTIMPL : E_FAIL;

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

@@ -557 +557 @@
     unconst(mVBox) = pVBox;
 
+#if !defined(RT_OS_WINDOWS)
     /* If IPv4 address hasn't been initialized */
-    if (m.IPAddress == 0)
+    if (m.IPAddress == 0 && mIfType == HostNetworkInterfaceType_HostOnly)
     {
         Bstr tmpAddr, tmpMask;
@@ -564 +565 @@
         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());
@@ -584 +605 @@
         }
     }
+#endif
 
     return S_OK;