Determine connection type in NetworkChangeNotifierLinux.

net/base/address_tracker_linux.h

 // 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.
 
 #ifndef NET_BASE_ADDRESS_TRACKER_LINUX_H_
 #define NET_BASE_ADDRESS_TRACKER_LINUX_H_
 
 #include <sys/socket.h>  // Needed to include netlink.
 // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38.
 #define net net_kernel
@@ skipping 65 matching lines @@
                            base::Lock& lock);
     ~AddressTrackerAutoLock();
 
    private:
     const AddressTrackerLinux& tracker_;
     base::Lock& lock_;
     DISALLOW_COPY_AND_ASSIGN(AddressTrackerAutoLock);
   };
 
   // A function that returns the name of an interface given the interface index
   // in |interface_index|.

[pauljensen, 2015/01/13 13:14:29]

Please explain |ifname| argument. e.g. what size should it be and how it relates
to the return value.

[derekjchow1, 2015/01/13 21:32:35]

Done.

-  typedef const char* (*GetInterfaceNameFunction)(int interface_index);
-
+  typedef char* (*GetInterfaceNameFunction)(unsigned int interface_index,
+                                            char* ifname);
   // Sets |*address_changed| to indicate whether |address_map_| changed and
   // sets |*link_changed| to indicate if |online_links_| changed and sets
   // |*tunnel_changed| to indicate if |online_links_| changed with regards to a
   // tunnel interface while reading messages from |netlink_fd_|.
   void ReadMessages(bool* address_changed,
                     bool* link_changed,
                     bool* tunnel_changed);
 
   // Sets |*address_changed| to true if |address_map_| changed, sets
   // |*link_changed| to true if |online_links_| changed, sets |*tunnel_changed|
@@ skipping 11 matching lines @@
   // MessageLoopForIO::Watcher:
   void OnFileCanReadWithoutBlocking(int fd) override;
   void OnFileCanWriteWithoutBlocking(int /* fd */) override;
 
   // Close |netlink_fd_|
   void CloseSocket();
 
   // Does |msg| refer to a tunnel interface?
   bool IsTunnelInterface(const struct ifinfomsg* msg) const;
 
+  // Gets the current connection type from online_links_. Returns
+  // CONNECTION_UNKNOWN if two interfaces have different connection types.
+  NetworkChangeNotifier::ConnectionType GetNewConnectionType();

[pauljensen, 2015/01/13 13:14:30]

I think "New" in the name is confusing, can we replace that with "Current"?

[derekjchow1, 2015/01/13 21:32:35]

I changed the function to UpdateCurrentConnectionType (GetCurrentConnectionType
is already defined above).

+
   // Gets the name of an interface given the interface index |interface_index|.
   // May return empty string if it fails but should not return NULL. This is
   // overridden by tests.
   GetInterfaceNameFunction get_interface_name_;
 
   base::Closure address_callback_;
   base::Closure link_callback_;
   base::Closure tunnel_callback_;
 
   int netlink_fd_;
   base::MessageLoopForIO::FileDescriptorWatcher watcher_;
 
   mutable base::Lock address_map_lock_;
   AddressMap address_map_;
 
   // Set of interface indices for links that are currently online.
   mutable base::Lock online_links_lock_;
   base::hash_set<int> online_links_;
 
-  base::Lock is_offline_lock_;
-  bool is_offline_;
-  bool is_offline_initialized_;
-  base::ConditionVariable is_offline_initialized_cv_;
+  base::Lock connection_type_lock_;
+  bool is_initialized_;

[pauljensen, 2015/01/13 13:14:30]

Can you rename this to be more precise?  i.e.
is_current_connection_type_initialized_

[derekjchow1, 2015/01/13 21:32:35]

Done.

+  base::ConditionVariable is_initialized_cv_;

[pauljensen, 2015/01/13 13:14:29]

Ditto.

[derekjchow1, 2015/01/13 21:32:35]

Done.

+  NetworkChangeNotifier::ConnectionType current_connection_type_;
   bool tracking_;
 
   // Used to verify single-threaded access in non-tracking mode.
   base::ThreadChecker thread_checker_;
 };
 
 }  // namespace internal
 }  // namespace net
 
 #endif  // NET_BASE_ADDRESS_TRACKER_LINUX_H_