Changeset 67804 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 5, 2017 2:53:27 PM (8 years ago)

Author:

vboxsync

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

116727

Message:

Main/Net (bugref:8905) canonicalize bridged interface name upon modification

File:

• trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp (modified) (2 diffs)

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

@@ -487 +487 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (mData->strBridgedName != aBridgedInterface)
+    Bstr canonicalName = aBridgedInterface;
+#ifdef RT_OS_DARWIN
+    com::SafeIfaceArray<IHostNetworkInterface> hostNetworkInterfaces;
+    ComPtr<IHost> host;
+    HRESULT rc = mParent->i_getVirtualBox()->COMGETTER(Host)(host.asOutParam());
+    if (SUCCEEDED(rc))
+    {
+        host->FindHostNetworkInterfacesOfType(HostNetworkInterfaceType_Bridged,
+                                              ComSafeArrayAsOutParam(hostNetworkInterfaces));
+        for (size_t i = 0; i < hostNetworkInterfaces.size(); ++i)
+        {
+            Bstr shortName;
+            ComPtr<IHostNetworkInterface> ni = hostNetworkInterfaces[i];
+            ni->COMGETTER(ShortName)(shortName.asOutParam());
+            if (shortName == aBridgedInterface)
+            {
+                ni->COMGETTER(Name)(canonicalName.asOutParam());
+                break;
+            }
+        }
+    }
+#endif /* RT_OS_DARWIN */
+    if (Bstr(mData->strBridgedName) != canonicalName)
     {
         /* if an empty/null string is to be set, bridged interface must be
          * turned off */
-        if (aBridgedInterface.isEmpty()
+        if (canonicalName.isEmpty()
             && mData->mode == NetworkAttachmentType_Bridged)
         {
@@ -499 +521 @@
 
         mData.backup();
-        mData->strBridgedName = aBridgedInterface;
+        mData->strBridgedName = canonicalName;
 
         // leave the lock before informing callbacks