Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1597)

Unified Diff: chrome/browser/media/router/discovery/discovery_network_monitor.h

Issue 2750453002: Add DiscoveryNetworkMonitor implementation (Closed)
Patch Set: Respond to mfoltz' and imcheng's comments Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/router/discovery/discovery_network_monitor.h
diff --git a/chrome/browser/media/router/discovery/discovery_network_monitor.h b/chrome/browser/media/router/discovery/discovery_network_monitor.h
new file mode 100644
index 0000000000000000000000000000000000000000..b568bb576548f116e7ff0fb8510510532a79b80b
--- /dev/null
+++ b/chrome/browser/media/router/discovery/discovery_network_monitor.h
@@ -0,0 +1,122 @@
+// Copyright (c) 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_DISCOVERY_NETWORK_MONITOR_H_
+#define CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_DISCOVERY_NETWORK_MONITOR_H_
+
+#include <string>
+#include <vector>
+
+#include "base/bind.h"
+#include "base/lazy_instance.h"
+#include "base/macros.h"
+#include "base/observer_list_threadsafe.h"
+#include "base/synchronization/lock.h"
+#include "content/public/browser/browser_thread.h"
+#include "net/base/ip_address.h"
+#include "net/base/network_change_notifier.h"
+
+// Represents a single network interface that can be used for discovery.
+struct NetworkInfo {
+ public:
+ NetworkInfo();
+ NetworkInfo(uint32_t index,
+ net::NetworkChangeNotifier::ConnectionType connection_type,
+ std::string name,
+ std::string network_id,
+ net::IPAddress ip_address);
+ ~NetworkInfo() = default;
+
+ NetworkInfo(const NetworkInfo&);
+ NetworkInfo& operator=(const NetworkInfo&);
+
+ bool operator==(const NetworkInfo&) const;
+ bool operator!=(const NetworkInfo&) const;
+
+ // The index of the network interface.
+ uint32_t index = 0;
+ // The connection type. Must be CONNECTION_ETHERNET or CONNECTION_WIFI.
+ net::NetworkChangeNotifier::ConnectionType connection_type =
+ net::NetworkChangeNotifier::ConnectionType::CONNECTION_UNKNOWN;
+ // The name of the network interface.
+ std::string name;
+ // A unique identifier for the network interface.
+ // For WiFi networks, this is the SSID.
+ // For Ethernet networks, this is the MAC address.
+ std::string network_id;
+ // The IP address that is currently assigned to the interface.
+ // Currently local discovery is only supported over IPv4.
mark a. foltz 2017/04/18 20:37:01 I believe mDNS is supported over IPv6 - but am not
btolsch 2017/04/20 04:03:50 It is although I don't know if chromium uses it.
+ net::IPAddress ip_address;
+};
+
+class NetworkInfoStrategy {
+ public:
+ virtual std::vector<NetworkInfo> GetNetworkInfo();
+};
+
+// Tracks the set of active network interfaces that can be used for local
+// discovery. If the list of interfaces changes, then
+// DiscoveryNetworkMonitor::Observer is called with the instance of the manager.
+// Only one instance of this should be created per browser process.
+class DiscoveryNetworkMonitor
+ : public net::NetworkChangeNotifier::NetworkChangeObserver {
+ public:
+ using NetworkInfoCallback = base::Callback<std::vector<NetworkInfo>()>;
+ using NetworkRefreshCompleteCallback = base::Callback<void()>;
+ class Observer {
+ public:
+ // Called when the list of active networks has changed.
+ virtual void OnNetworksChanged(const DiscoveryNetworkMonitor& manager) = 0;
+
+ protected:
+ ~Observer() = default;
+ };
+
+ static DiscoveryNetworkMonitor* GetInstance();
+ static DiscoveryNetworkMonitor* GetInstanceForTest(NetworkInfoCallback);
+
+ void RebindNetworkChangeObserverForTest();
+
+ void AddObserver(Observer* const observer);
+ void RemoveObserver(Observer* const observer);
+
+ void ForceNetworkInfoRefresh(NetworkRefreshCompleteCallback callback);
mark a. foltz 2017/04/18 20:37:01 Refresh() and document forcing behavior?
btolsch 2017/04/20 04:03:50 Done.
+
+ // Returns the current list of active networks.
+ const std::vector<NetworkInfo>& GetNetworks() const {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+ return networks_;
+ }
+
+ // Computes a stable string identifier from the list of active networks.
mark a. foltz 2017/04/18 20:37:01 s/active networks/connected interfaces/
btolsch 2017/04/20 04:03:50 Done.
+ // Returns "disconnected" if there are no active networks or "unknown" if the
mark a. foltz 2017/04/18 20:37:01 Declare kConstant constexprs for these special val
btolsch 2017/04/20 04:03:50 Done.
+ // identifier could not be computed.
+ const std::string GetNetworkId() const {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+ return network_id_;
+ }
+
+ // net::NetworkChangeNotifier::NetworkChangeObserver
+ void OnNetworkChanged(
+ net::NetworkChangeNotifier::ConnectionType type) override;
+
+ private:
+ friend struct base::LazyInstanceTraitsBase<DiscoveryNetworkMonitor>;
+
+ DiscoveryNetworkMonitor();
+ ~DiscoveryNetworkMonitor() override;
+
+ std::string ComputeNetworkId(
+ const std::vector<NetworkInfo>& network_info_list);
+ void UpdateNetworkInfo(const NetworkRefreshCompleteCallback& callback);
+
+ std::string network_id_;
+ std::vector<NetworkInfo> networks_;
+ scoped_refptr<base::ObserverListThreadSafe<Observer>> observers_;
+ NetworkInfoCallback network_info_callback_;
+
+ DISALLOW_COPY_AND_ASSIGN(DiscoveryNetworkMonitor);
+};
+
+#endif // CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_DISCOVERY_NETWORK_MONITOR_H_

Powered by Google App Engine
This is Rietveld 408576698