Merge pull request #690 from microsoft/heanzu/mac-net-detect

Heanzu/mac net detect

Author: maxgolov

lib/CMakeLists.txt

@@ -117,17 +117,11 @@ if(PAL_IMPLEMENTATION STREQUAL "CPP11")
       )
     endif()
 
-    if(BUILD_IOS)
-      list(APPEND SRCS
+    list(APPEND SRCS
         pal/posix/NetworkInformationImpl.mm
         # TODO: this unit below needs to be deprecated and removed
         ../third_party/Reachability/ODWReachability.m
-      )
-    else()
-      list(APPEND SRCS
-        pal/posix/NetworkInformationImpl.cpp
-      )
-    endif()
+    )
   else()
     list(APPEND SRCS
       http/HttpClient_Curl.cpp

lib/pal/posix/NetworkInformationImpl.mm

@@ -84,7 +84,7 @@ virtual NetworkCost GetNetworkCost()
 
     NetworkInformation::~NetworkInformation() noexcept
     {
-        if (@available(iOS 12.0, *))
+        if (@available(macOS 10.14, iOS 12.0, *))
         {
             if (m_isNetDetectEnabled)
             {
@@ -105,7 +105,36 @@ virtual NetworkCost GetNetworkCost()
     {
         auto weak_this = std::weak_ptr<NetworkInformation>(shared_from_this());
 
-        if (@available(iOS 12.0, *))
+        m_reach = [ODWReachability reachabilityForInternetConnection];
+        void (^block)(NSNotification*) = ^(NSNotification*)
+        {
+            auto strong_this = weak_this.lock();
+            if (!strong_this)
+            {
+                return;
+            }
+
+            // NetworkCost information is not available until iOS 12.
+            // Just make the best guess here.
+            switch (m_reach.currentReachabilityStatus)
+            {
+                case NotReachable:
+                    strong_this->UpdateType(NetworkType_Unknown);
+                    strong_this->UpdateCost(NetworkCost_Unknown);
+                    break;
+                case ReachableViaWiFi:
+                    strong_this->UpdateType(NetworkType_Wifi);
+                    strong_this->UpdateCost(NetworkCost_Unmetered);
+                    break;
+                case ReachableViaWWAN:
+                    strong_this->UpdateType(NetworkType_WWAN);
+                    strong_this->UpdateCost(NetworkCost_Metered);
+                    break;
+            }
+        };
+        block(nil); // Update the initial status.
+        
+        if (@available(macOS 10.14, iOS 12.0, *))
         {
             m_monitor = nw_path_monitor_create();
             nw_path_monitor_set_queue(m_monitor, dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0));
@@ -136,7 +165,7 @@ virtual NetworkCost GetNetworkCost()
                         type = NetworkType_Wired;
                     }
                     cost = nw_path_is_expensive(path) ? NetworkCost_Metered : NetworkCost_Unmetered;
-                    if (@available(iOS 13.0, *))
+                    if (@available(macOS 10.15, iOS 13.0, *))
                     {
                         if (nw_path_is_constrained(path))
                         {
@@ -157,46 +186,15 @@ virtual NetworkCost GetNetworkCost()
                 nw_path_monitor_cancel(m_monitor);
             }
         }
-        else
+        else if (m_isNetDetectEnabled)
         {
-            m_reach = [ODWReachability reachabilityForInternetConnection];
-            void (^block)(NSNotification*) = ^(NSNotification*)
-            {
-                auto strong_this = weak_this.lock();
-                if (!strong_this)
-                {
-                    return;
-                }
-
-                // NetworkCost information is not available until iOS 12.
-                // Just make the best guess here.
-                switch (m_reach.currentReachabilityStatus)
-                {
-                    case NotReachable:
-                        strong_this->UpdateType(NetworkType_Unknown);
-                        strong_this->UpdateCost(NetworkCost_Unknown);
-                        break;
-                    case ReachableViaWiFi:
-                        strong_this->UpdateType(NetworkType_Wifi);
-                        strong_this->UpdateCost(NetworkCost_Unmetered);
-                        break;
-                    case ReachableViaWWAN:
-                        strong_this->UpdateType(NetworkType_WWAN);
-                        strong_this->UpdateCost(NetworkCost_Metered);
-                        break;
-                }
-            };
-            block(nil); // Update the initial status.
-            if (m_isNetDetectEnabled)
-            {
-                m_notificationId =
-                    [[NSNotificationCenter defaultCenter]
-                    addObserverForName: kNetworkReachabilityChangedNotification
-                    object: nil
-                    queue: nil
-                    usingBlock: block];
-                [m_reach startNotifier];
-            }
+            m_notificationId =
+                [[NSNotificationCenter defaultCenter]
+                addObserverForName: kNetworkReachabilityChangedNotification
+                object: nil
+                queue: nil
+                usingBlock: block];
+            [m_reach startNotifier];
         }
     }
 

tests/functests/CMakeLists.txt

@@ -67,7 +67,7 @@ else()
     if(BUILD_IOS)
       set (PLATFORM_LIBS "${PLATFORM_LIBS} -framework UIKit -framework Network -framework SystemConfiguration")
     else()
-      set (PLATFORM_LIBS "${PLATFORM_LIBS} -framework IOKit")
+      set (PLATFORM_LIBS "${PLATFORM_LIBS} -framework IOKit -framework Network -framework SystemConfiguration")
     endif()
   endif()
 

tests/unittests/CMakeLists.txt

@@ -108,7 +108,7 @@ else()
   set (PLATFORM_LIBS "")
   # Add flags for obtaining system UUID via IOKit
   if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    set (PLATFORM_LIBS "-framework CoreFoundation -framework IOKit -framework SystemConfiguration -framework Foundation")
+    set (PLATFORM_LIBS "-framework CoreFoundation -framework IOKit -framework SystemConfiguration -framework Foundation -framework Network")
     if(BUILD_IOS)
       set (PLATFORM_LIBS "${PLATFORM_LIBS} -framework UIKit")
     endif()