Changeset 11857 in vbox for trunk/src

Timestamp:

Aug 29, 2008 11:39:12 PM (16 years ago)

Author:

vboxsync

Message:

Main/iokit: Use the service name instead of the interface name (darwin).

File:

• trunk/src/VBox/Main/darwin/iokit.cpp (modified) (5 diffs)

trunk/src/VBox/Main/darwin/iokit.cpp

@@ -1433 +1433 @@
 
     /*
+     * Get the current preferences and make a copy of the network services so we
+     * can look up the right interface names. The IfsRef is just for fallback.
+     */
+    CFArrayRef ServicesRef = NULL;
+    CFIndex cServices = 0;
+    SCPreferencesRef PrefsRef = SCPreferencesCreate(kCFAllocatorDefault, CFSTR("org.virtualbox.VBoxSVC"), NULL);
+    if (PrefsRef)
+    {
+        SCNetworkSetRef SetRef = SCNetworkSetCopyCurrent(PrefsRef);
+        CFRelease(PrefsRef);
+        if (SetRef)
+        {
+            ServicesRef = SCNetworkSetCopyServices(SetRef);
+            CFRelease(SetRef);
+            cServices = ServicesRef ? CFArrayGetCount(ServicesRef) : 0;
+        }
+    }
+
+    /*
      * Enumerate the ethernet controller services.
      */
@@ -1515 +1534 @@
                         *psz++ = ' ';
                         size_t cchLeft = sizeof(szTmp) - (psz - &szTmp[0]) - (sizeof(" (Wireless)") - 1);
+                        bool fFound = false;
                         CFIndex i;
-                        for (i = 0; i < cIfs; i++)
+
+                        /* look it up among the current services */
+                        for (CFIndex i = 0; i < cServices; i++)
                         {
-                            SCNetworkInterfaceRef IfRef = (SCNetworkInterfaceRef)CFArrayGetValueAtIndex(IfsRef, i);
-                            CFStringRef BSDNameRef = SCNetworkInterfaceGetBSDName(IfRef);
-                            if (     BSDNameRef
-                                &&   CFStringGetCString(BSDNameRef, psz, cchLeft, kCFStringEncodingUTF8)
-                                &&  !strcmp(psz, szBSDName))
+                            SCNetworkServiceRef ServiceRef = (SCNetworkServiceRef)CFArrayGetValueAtIndex(ServicesRef, i);
+                            SCNetworkInterfaceRef IfRef = SCNetworkServiceGetInterface(ServiceRef);
+                            if (IfRef)
                             {
-                                CFStringRef DisplayNameRef = SCNetworkInterfaceGetLocalizedDisplayName(IfRef);
-                                if (    DisplayNameRef
-                                    &&  CFStringGetCString(DisplayNameRef, psz, cchLeft, kCFStringEncodingUTF8))
-                                    break;
+                                CFStringRef BSDNameRef = SCNetworkInterfaceGetBSDName(IfRef);
+                                if (     BSDNameRef
+                                    &&   CFStringGetCString(BSDNameRef, psz, cchLeft, kCFStringEncodingUTF8)
+                                    &&  !strcmp(psz, szBSDName))
+                                {
+                                    CFStringRef ServiceNameRef = SCNetworkServiceGetName(ServiceRef);
+                                    if (    ServiceNameRef
+                                        &&  CFStringGetCString(ServiceNameRef, psz, cchLeft, kCFStringEncodingUTF8))
+                                    {
+                                        fFound = true;
+                                        break;
+                                    }
+                                }
                             }
                         }
+                        /* Look it up in the interface list. */
+                        if (!fFound)
+                            for (i = 0; i < cIfs; i++)
+                            {
+                                SCNetworkInterfaceRef IfRef = (SCNetworkInterfaceRef)CFArrayGetValueAtIndex(IfsRef, i);
+                                CFStringRef BSDNameRef = SCNetworkInterfaceGetBSDName(IfRef);
+                                if (     BSDNameRef
+                                    &&   CFStringGetCString(BSDNameRef, psz, cchLeft, kCFStringEncodingUTF8)
+                                    &&  !strcmp(psz, szBSDName))
+                                {
+                                    CFStringRef DisplayNameRef = SCNetworkInterfaceGetLocalizedDisplayName(IfRef);
+                                    if (    DisplayNameRef
+                                        &&  CFStringGetCString(DisplayNameRef, psz, cchLeft, kCFStringEncodingUTF8))
+                                    {
+                                        fFound = true;
+                                        break;
+                                    }
+                                }
+                            }
                         /* Generate a half plausible name if we for some silly reason didn't find the interface. */
-                        if (i >= cIfs)
+                        if (!fFound)
                             RTStrPrintf(szTmp, sizeof(szTmp), "%s: %s%s(?)",
                                         szBSDName,
@@ -1538 +1586 @@
                         /* If we did find it and it's wireless but without "AirPort" or "Wireless", fix it */
                         else if (   fWireless
-                                 && !strstr(szTmp, "AirPort")
-                                 && !strstr(szTmp, "Wireless"))
-                            strcat(szTmp, " (Wireless)");
+                                 && !strstr(psz, "AirPort")
+                                 && !strstr(psz, "Wireless"))
+                            strcat(szTmp, fAirPort ? " (AirPort)" : " (Wireless)");
 
                         /*
@@ -1624 +1672 @@
 
     IOObjectRelease(EtherIfServices);
-    CFRelease(IfsRef);
+    if (ServicesRef)
+        CFRelease(ServicesRef);
+    if (IfsRef)
+        CFRelease(IfsRef);
     return pHead;
 }
@@ -1685 +1736 @@
                 }
 
+                CFRelease(ServicesRef);
                 CFRelease(SetRef);
             }