Check for MacOS iBridge MAC address and fall back

badaix · Feb 19, 2021 · a30ac29 · a30ac29
1 parent 66c5331
commit a30ac29
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/common/utils.hpp b/common/utils.hpp
@@ -421,9 +421,11 @@ static std::string getHostId(const std::string defaultId = "")
 {
     std::string result = strutils::trim_copy(defaultId);
 
-    /// the Android API will return "02:00:00:00:00:00" for WifiInfo.getMacAddress().
-    /// Maybe this could also happen with native code
-    if (!result.empty() && (result != "02:00:00:00:00:00") && (result != "00:00:00:00:00:00"))
+    if (!result.empty()                    // default provided
+        && (result != "00:00:00:00:00:00") // default mac returned by getMaxAddress if it fails
+        && (result != "02:00:00:00:00:00") // the Android API will return "02:00:00:00:00:00" for WifiInfo.getMacAddress()
+        && (result != "ac:de:48:00:11:22") // iBridge interface on new MacBook Pro (later 2016)
+    )
         return result;
 
 #ifdef MACOS