From c5f818c90a4e39867b2ca88566d7da37b3e8eeba Mon Sep 17 00:00:00 2001
From: Vibhav Pant <vibhavp@gmail.com>
Date: Wed, 16 Aug 2023 19:03:47 +0530
Subject: [PATCH] Use NetworkManager object for checking connectivity.

---
 .../implementation/linux/wifi_medium.cc       | 29 ++++++++--------
 .../implementation/linux/wifi_medium.h        | 33 ++++++++++++++++---
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/internal/platform/implementation/linux/wifi_medium.cc b/internal/platform/implementation/linux/wifi_medium.cc
index beba67c4..8925356b 100644
--- a/internal/platform/implementation/linux/wifi_medium.cc
+++ b/internal/platform/implementation/linux/wifi_medium.cc
@@ -127,23 +127,25 @@ void NetworkManagerWifiMedium::onPropertiesChanged(
 
 bool NetworkManagerWifiMedium::Scan(
     const api::WifiMedium::ScanResultCallback &scan_result_callback) {
-  absl::MutexLock l(&scan_result_callback_lock_);
-  scan_result_callback_ = scan_result_callback;
+  // absl::MutexLock l(&scan_result_callback_lock_);
+  // scan_result_callback_ = scan_result_callback;
 
-  try {
-    RequestScan(std::map<std::string, sdbus::Variant>());
-  } catch (const sdbus::Error &e) {
-    scan_result_callback_ = std::nullopt;
-    DBUS_LOG_METHOD_CALL_ERROR(&getProxy(), "RequestScan", e);
-    return false;
-  }
-  return true;
+  // try {
+  //   RequestScan(std::map<std::string, sdbus::Variant>());
+  // } catch (const sdbus::Error &e) {
+  //   scan_result_callback_ = std::nullopt;
+  //   DBUS_LOG_METHOD_CALL_ERROR(&getProxy(), "RequestScan", e);
+  //   return false;
+  // }
+  return false;
 }
 
 api::WifiConnectionStatus
 NetworkManagerWifiMedium::ConnectToNetwork(absl::string_view ssid,
                                            absl::string_view password,
-                                           api::WifiAuthType auth_type) {}
+                                           api::WifiAuthType auth_type) {
+  return api::WifiConnectionStatus::kUnknown;
+}
 
 bool NetworkManagerWifiMedium::VerifyInternetConnectivity() {
   auto network_manager_proxy_ = sdbus::createProxy(
@@ -151,10 +153,7 @@ bool NetworkManagerWifiMedium::VerifyInternetConnectivity() {
   network_manager_proxy_->finishRegistration();
 
   try {
-    std::uint32_t connectivity;
-    network_manager_proxy_->callMethod("CheckConnectivity")
-        .onInterface("org.freedesktop.NetworkManager")
-        .storeResultsTo(connectivity);
+    std::uint32_t connectivity = network_manager_.CheckConnectivity();
     return connectivity == 4; // NM_CONNECTIVITY_FULL
   } catch (const sdbus::Error &e) {
     DBUS_LOG_METHOD_CALL_ERROR(network_manager_proxy_, "CheckConnectivity", e);
diff --git a/internal/platform/implementation/linux/wifi_medium.h b/internal/platform/implementation/linux/wifi_medium.h
index 116063df..9d432012 100644
--- a/internal/platform/implementation/linux/wifi_medium.h
+++ b/internal/platform/implementation/linux/wifi_medium.h
@@ -12,12 +12,30 @@
 
 #include "absl/synchronization/mutex.h"
 #include "internal/platform/implementation/linux/networkmanager_accesspoint_client_glue.h"
+#include "internal/platform/implementation/linux/networkmanager_client_glue.h"
 #include "internal/platform/implementation/linux/networkmanager_device_wireless_client_glue.h"
 #include "internal/platform/implementation/linux/networkmanager_ip4config_client_glue.h"
 #include "internal/platform/implementation/wifi.h"
 
 namespace nearby {
 namespace linux {
+class NetworkManager
+    : public sdbus::ProxyInterfaces<org::freedesktop::NetworkManager_proxy> {
+public:
+  NetworkManager(sdbus::IConnection &system_bus)
+      : ProxyInterfaces(system_bus, "org.freedesktop.NetworkManager",
+                        "/org/freedesktop/NetworkManager") {
+    registerProxy();
+  }
+  ~NetworkManager() { unregisterProxy(); }
+
+protected:
+  void onCheckPermissions() override {}
+  void onStateChanged(const uint32_t &state) override {}
+  void onDeviceAdded(const sdbus::ObjectPath &device_path) override {}
+  void onDeviceRemoved(const sdbus::ObjectPath &device_path) override {}
+};
+
 class NetworkManagerIP4Config
     : public sdbus::ProxyInterfaces<
           org::freedesktop::NetworkManager::IP4Config_proxy> {
@@ -73,10 +91,12 @@ class NetworkManagerWifiMedium
           org::freedesktop::NetworkManager::Device::Wireless_proxy,
           sdbus::Properties_proxy> {
 public:
-  NetworkManagerWifiMedium(sdbus::IConnection &system_bus,
+  NetworkManagerWifiMedium(NetworkManager &network_manager,
+                           sdbus::IConnection &system_bus,
                            const sdbus::ObjectPath &wireless_device_object_path)
       : ProxyInterfaces(system_bus, "org.freedesktop.NetworkManager",
-                        wireless_device_object_path) {
+                        wireless_device_object_path),
+        network_manager_(network_manager) {
     active_access_point_ = std::nullopt;
     registerProxy();
   }
@@ -89,14 +109,15 @@ public:
     void OnScanResults(
         const std::vector<api::WifiScanResult> &scan_results) override {
       // TODO: Add implementation at some point
-    }    
+    }
   };
 
   bool IsInterfaceValid() const override { return true; };
   api::WifiCapability &GetCapability() override;
   api::WifiInformation &GetInformation() override;
 
-  bool Scan(const api::WifiMedium::ScanResultCallback &scan_result_callback) override;
+  bool Scan(
+      const api::WifiMedium::ScanResultCallback &scan_result_callback) override;
 
   api::WifiConnectionStatus
   ConnectToNetwork(absl::string_view ssid, absl::string_view password,
@@ -112,6 +133,8 @@ protected:
       const std::vector<std::string> &invalidatedProperties) override;
 
 private:
+  NetworkManager &network_manager_;
+
   api::WifiCapability capability_;
   api::WifiInformation information_{false};
 
@@ -120,7 +143,7 @@ private:
 
   absl::Mutex scan_result_callback_lock_;
   std::optional<
-      std::reference_wrapper<const api::WifiMedium::ScanResultCallback>>      
+      std::reference_wrapper<const api::WifiMedium::ScanResultCallback>>
       scan_result_callback_;
 };