Create network change notifier.

webrtc/base/network.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 11 matching lines @@
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sigslot.h"
 
 #if defined(WEBRTC_POSIX)
 struct ifaddrs;
 #endif  // defined(WEBRTC_POSIX)
 
 namespace rtc {
 
 class Network;
+class NetworkChangeNotifier;
 class Thread;
 
 enum AdapterType {
   // This enum resembles the one in Chromium net::ConnectionType.
   ADAPTER_TYPE_UNKNOWN = 0,
   ADAPTER_TYPE_ETHERNET = 1 << 0,
   ADAPTER_TYPE_WIFI = 1 << 1,
   ADAPTER_TYPE_CELLULAR = 1 << 2,
   ADAPTER_TYPE_VPN = 1 << 3,
   ADAPTER_TYPE_LOOPBACK = 1 << 4
@@ skipping 98 matching lines @@
   void MergeNetworkList(const NetworkList& list,
                         bool* changed,
                         NetworkManager::Stats* stats);
 
   void set_enumeration_permission(EnumerationPermission state) {
     enumeration_permission_ = state;
   }
 
  private:
   friend class NetworkTest;
-  void DoUpdateNetworks();
 
   EnumerationPermission enumeration_permission_;
 
   NetworkList networks_;
   int max_ipv6_networks_;
 
   NetworkMap networks_map_;
   bool ipv6_enabled_;
 
   rtc::scoped_ptr<rtc::Network> ipv4_any_address_network_;
   rtc::scoped_ptr<rtc::Network> ipv6_any_address_network_;
 };
 
 // Basic implementation of the NetworkManager interface that gets list
 // of networks using OS APIs.
 class BasicNetworkManager : public NetworkManagerBase,
-                            public MessageHandler {
+                            public MessageHandler,
+                            public sigslot::has_slots<> {
  public:
   BasicNetworkManager();
   ~BasicNetworkManager() override;
 
   void StartUpdating() override;
   void StopUpdating() override;
 
   // Logs the available networks.
   void DumpNetworks(bool include_ignored) override;
 
@@ skipping 37 matching lines @@
   // Creates a network object for each network available on the machine.
   bool CreateNetworks(bool include_ignored, NetworkList* networks) const;
 
   // Determines if a network should be ignored. This should only be determined
   // based on the network's property instead of any individual IP.
   bool IsIgnoredNetwork(const Network& network) const;
 
  private:
   friend class NetworkTest;
 
+  // Creates the network change notifier and starts to listen to the update.
+  void StartNetworkChangeNotifier();
+  // Removes the network change notifier.
+  void StopNetworkChangeNotifier();
+  // Called when it receives the update from the network change notifier.
+  void OnNetworkChangeNotified();
+
+  // Updates the network and reschedule the next update.
+  void UpdateNetworks();
+  // Only updates the network; do not reschedule the next update.

[pthatcher1, 2015/10/09 23:11:29]

do not => does not

[honghaiz3, 2015/10/13 23:19:56]

Done.

   void DoUpdateNetworks();

[pthatcher1, 2015/10/09 23:11:29]

I think a better name pair would be UpdateNetworksContinually/UpdateNetworksOnce
rather than UpdateNetworks/DoUpdateNetworks.

[honghaiz3, 2015/10/13 23:19:56]

Done.

 
   Thread* thread_;
   bool sent_first_update_;
   int start_count_;
   std::vector<std::string> network_ignore_list_;
   int network_ignore_mask_;
   bool ignore_non_default_routes_;
+  scoped_ptr<NetworkChangeNotifier> network_change_notifier_;
 };
 
 // Represents a Unix-type network interface, with a name and single address.
 class Network {
  public:
   Network(const std::string& name, const std::string& description,
           const IPAddress& prefix, int prefix_length);
 
   Network(const std::string& name, const std::string& description,
           const IPAddress& prefix, int prefix_length, AdapterType type);
@@ skipping 78 matching lines @@
   bool ignored_;
   AdapterType type_;
   int preference_;
 
   friend class NetworkManager;
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_NETWORK_H_