Determine connection type in NetworkChangeNotifierLinux.

net/base/network_change_notifier_linux.cc

 // Copyright (c) 2012 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.
 
 #include "net/base/network_change_notifier_linux.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/threading/thread.h"
 #include "net/base/address_tracker_linux.h"
@@ skipping 15 matching lines @@
   const internal::AddressTrackerLinux* address_tracker() const {
     return &address_tracker_;
   }
 
  protected:
   // base::Thread
   void Init() override;
   void CleanUp() override;
 
  private:
+  void OnIPAddressChanged();
+  void OnLinkChanged();
   scoped_ptr<DnsConfigService> dns_config_service_;
   // Used to detect online/offline state and IP address changes.
   internal::AddressTrackerLinux address_tracker_;
+  NetworkChangeNotifier::ConnectionType last_type_;
 
   DISALLOW_COPY_AND_ASSIGN(Thread);
 };
 
 NetworkChangeNotifierLinux::Thread::Thread()
     : base::Thread("NetworkChangeNotifier"),
       address_tracker_(
-          base::Bind(&NetworkChangeNotifier::
-                     NotifyObserversOfIPAddressChange),
-          base::Bind(&NetworkChangeNotifier::
-                     NotifyObserversOfConnectionTypeChange),
-          base::Bind(base::DoNothing)) {
+          base::Bind(&NetworkChangeNotifierLinux::Thread::OnIPAddressChanged,
+                     base::Unretained(this)),
+          base::Bind(&NetworkChangeNotifierLinux::Thread::OnLinkChanged,
+                     base::Unretained(this)),
+          base::Bind(base::DoNothing)),
+      last_type_(NetworkChangeNotifier::CONNECTION_NONE) {
 }
 
 NetworkChangeNotifierLinux::Thread::~Thread() {
   DCHECK(!Thread::IsRunning());
 }
 
 void NetworkChangeNotifierLinux::Thread::Init() {
   address_tracker_.Init();
   dns_config_service_ = DnsConfigService::CreateSystemService();
   dns_config_service_->WatchConfig(
       base::Bind(&NetworkChangeNotifier::SetDnsConfig));
 }
 
 void NetworkChangeNotifierLinux::Thread::CleanUp() {
   dns_config_service_.reset();
 }
 
+void NetworkChangeNotifierLinux::Thread::OnIPAddressChanged() {
+  NetworkChangeNotifier::NotifyObserversOfIPAddressChange();
+  // When the IP address of a network interface is added/deleted, the
+  // connection type may have changed.
+  OnLinkChanged();
+}
+
+void NetworkChangeNotifierLinux::Thread::OnLinkChanged() {
+  if (last_type_ != GetCurrentConnectionType()) {
+    NetworkChangeNotifier::NotifyObserversOfConnectionTypeChange();
+    last_type_ = GetCurrentConnectionType();
+  }
+}
+
 NetworkChangeNotifierLinux* NetworkChangeNotifierLinux::Create() {
   return new NetworkChangeNotifierLinux();
 }
 
 NetworkChangeNotifierLinux::NetworkChangeNotifierLinux()
     : NetworkChangeNotifier(NetworkChangeCalculatorParamsLinux()),
       notifier_thread_(new Thread()) {
   // We create this notifier thread because the notification implementation
   // needs a MessageLoopForIO, and there's no guarantee that
   // MessageLoop::current() meets that criterion.
@@ skipping 25 matching lines @@
 NetworkChangeNotifierLinux::GetCurrentConnectionType() const {
   return notifier_thread_->GetCurrentConnectionType();
 }
 
 const internal::AddressTrackerLinux*
 NetworkChangeNotifierLinux::GetAddressTrackerInternal() const {
   return notifier_thread_->address_tracker();
 }
 
 }  // namespace net