Use Netlink instead of NetworkManager (via D-bus) to monitor network

net/base/address_tracker_linux_unittest.cc

Index: net/base/address_tracker_linux_unittest.cc
diff --git a/net/base/address_tracker_linux_unittest.cc b/net/base/address_tracker_linux_unittest.cc
index c366f5aa2c3edcbebaf24667eac35149eb99cbac..f185fd0d01ac2d44d85ec313d250f167cc7c6c0c 100644
--- a/net/base/address_tracker_linux_unittest.cc
+++ b/net/base/address_tracker_linux_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "net/base/address_tracker_linux.h"
 
+#include <linux/if.h>
+
 #include <vector>
 
 #include "base/bind.h"
@@ -12,27 +14,45 @@
 namespace net {
 namespace internal {
 
+typedef std::vector<char> Buffer;
+
 void Noop() {}
 
 class AddressTrackerLinuxTest : public testing::Test {
  protected:
-  AddressTrackerLinuxTest() : tracker_(base::Bind(&Noop)) {}
+  AddressTrackerLinuxTest() : tracker_(base::Bind(&Noop), base::Bind(&Noop)) {}
+
+  bool HandleAddressMessage(const Buffer& buf) {
+    bool address_changed = false;
+    bool link_changed = false;
+    tracker_.HandleMessage(&buf[0], buf.size(),
+                           &address_changed, &link_changed);
+    EXPECT_FALSE(link_changed);
+    return address_changed;
+  }
 
-  bool HandleMessage(char* buf, size_t length) {
-    return tracker_.HandleMessage(buf, length);
+  bool HandleLinkMessage(const Buffer& buf) {
+    bool address_changed = false;
+    bool link_changed = false;
+    tracker_.HandleMessage(&buf[0], buf.size(),
+                           &address_changed, &link_changed);
+    EXPECT_FALSE(address_changed);
+    return link_changed;
   }
 
   AddressTrackerLinux::AddressMap GetAddressMap() {
     return tracker_.GetAddressMap();
   }
 
+  const base::hash_set<int>* GetOnlineLinks() const {
+    return &tracker_.online_links_;
+  }
+
   AddressTrackerLinux tracker_;
 };
 
 namespace {
 
-typedef std::vector<char> Buffer;
-
 class NetlinkMessage {
  public:
   explicit NetlinkMessage(uint16 type) : buffer_(NLMSG_HDRLEN) {
@@ -83,12 +103,12 @@ class NetlinkMessage {
   Buffer buffer_;
 };
 
-void MakeMessage(uint16 type,
-                 uint8 flags,
-                 uint8 family,
-                 const IPAddressNumber& address,
-                 const IPAddressNumber& local,
-                 Buffer* output) {
+void MakeAddrMessage(uint16 type,
+                     uint8 flags,
+                     uint8 family,
+                     const IPAddressNumber& address,
+                     const IPAddressNumber& local,
+                     Buffer* output) {
   NetlinkMessage nlmsg(type);
   struct ifaddrmsg msg = {};
   msg.ifa_family = family;
@@ -101,6 +121,16 @@ void MakeMessage(uint16 type,
   nlmsg.AppendTo(output);
 }
 
+void MakeLinkMessage(uint16 type, uint32 flags, uint32 index, Buffer* output) {
+  NetlinkMessage nlmsg(type);
+  struct ifinfomsg msg = {};
+  msg.ifi_index = index;
+  msg.ifi_flags = flags;
+  nlmsg.AddPayload(&msg, sizeof(msg));
+  output->clear();
+  nlmsg.AppendTo(output);
+}
+
 const unsigned char kAddress0[] = { 127, 0, 0, 1 };
 const unsigned char kAddress1[] = { 10, 0, 0, 1 };
 const unsigned char kAddress2[] = { 192, 168, 0, 1 };
@@ -117,16 +147,18 @@ TEST_F(AddressTrackerLinuxTest, NewAddress) {
   const IPAddressNumber kAddr3(kAddress3, kAddress3 + arraysize(kAddress3));
 
   Buffer buffer;
-  MakeMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kEmpty, &buffer);
-  EXPECT_TRUE(HandleMessage(&buffer[0], buffer.size()));
+  MakeAddrMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kEmpty,
+                  &buffer);
+  EXPECT_TRUE(HandleAddressMessage(buffer));
   AddressTrackerLinux::AddressMap map = GetAddressMap();
   EXPECT_EQ(1u, map.size());
   EXPECT_TRUE(map.find(kAddr0) != map.end());

[szym, 2012/11/26 17:34:20]

ugh, I suggested using EXPECT_EQ(1u, count(key)), but now I see I used
EXPECT_TRUE(find(key) != end()) myself.

If it's not too much hassle, could you fix all the uses in this file to be the
same? I still think count(key) is the better way.

   EXPECT_EQ(IFA_F_TEMPORARY, map[kAddr0].ifa_flags);
 
   buffer.clear();
-  MakeMessage(RTM_NEWADDR, IFA_F_HOMEADDRESS, AF_INET, kAddr1, kAddr2, &buffer);
-  EXPECT_TRUE(HandleMessage(&buffer[0], buffer.size()));
+  MakeAddrMessage(RTM_NEWADDR, IFA_F_HOMEADDRESS, AF_INET, kAddr1, kAddr2,
+                  &buffer);
+  EXPECT_TRUE(HandleAddressMessage(buffer));
   map = GetAddressMap();
   EXPECT_EQ(2u, map.size());
   EXPECT_TRUE(map.find(kAddr0) != map.end());
@@ -134,8 +166,8 @@ TEST_F(AddressTrackerLinuxTest, NewAddress) {
   EXPECT_EQ(IFA_F_HOMEADDRESS, map[kAddr2].ifa_flags);
 
   buffer.clear();
-  MakeMessage(RTM_NEWADDR, 0, AF_INET6, kEmpty, kAddr3, &buffer);
-  EXPECT_TRUE(HandleMessage(&buffer[0], buffer.size()));
+  MakeAddrMessage(RTM_NEWADDR, 0, AF_INET6, kEmpty, kAddr3, &buffer);
+  EXPECT_TRUE(HandleAddressMessage(buffer));
   map = GetAddressMap();
   EXPECT_EQ(3u, map.size());
   EXPECT_TRUE(map.find(kAddr3) != map.end());
@@ -146,16 +178,18 @@ TEST_F(AddressTrackerLinuxTest, NewAddressChange) {
   const IPAddressNumber kAddr0(kAddress0, kAddress0 + arraysize(kAddress0));
 
   Buffer buffer;
-  MakeMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kEmpty, &buffer);
-  EXPECT_TRUE(HandleMessage(&buffer[0], buffer.size()));
+  MakeAddrMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kEmpty,
+                  &buffer);
+  EXPECT_TRUE(HandleAddressMessage(buffer));
   AddressTrackerLinux::AddressMap map = GetAddressMap();
   EXPECT_EQ(1u, map.size());
   EXPECT_TRUE(map.find(kAddr0) != map.end());
   EXPECT_EQ(IFA_F_TEMPORARY, map[kAddr0].ifa_flags);
 
   buffer.clear();
-  MakeMessage(RTM_NEWADDR, IFA_F_HOMEADDRESS, AF_INET, kAddr0, kEmpty, &buffer);
-  EXPECT_TRUE(HandleMessage(&buffer[0], buffer.size()));
+  MakeAddrMessage(RTM_NEWADDR, IFA_F_HOMEADDRESS, AF_INET, kAddr0, kEmpty,
+                  &buffer);
+  EXPECT_TRUE(HandleAddressMessage(buffer));
   map = GetAddressMap();
   EXPECT_EQ(1u, map.size());
   EXPECT_TRUE(map.find(kAddr0) != map.end());
@@ -163,9 +197,11 @@ TEST_F(AddressTrackerLinuxTest, NewAddressChange) {
 
   // Both messages in one buffer.
   buffer.clear();
-  MakeMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kEmpty, &buffer);
-  MakeMessage(RTM_NEWADDR, IFA_F_HOMEADDRESS, AF_INET, kAddr0, kEmpty, &buffer);
-  EXPECT_TRUE(HandleMessage(&buffer[0], buffer.size()));
+  MakeAddrMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kEmpty,
+                  &buffer);
+  MakeAddrMessage(RTM_NEWADDR, IFA_F_HOMEADDRESS, AF_INET, kAddr0, kEmpty,
+                  &buffer);
+  EXPECT_TRUE(HandleAddressMessage(buffer));
   map = GetAddressMap();
   EXPECT_EQ(1u, map.size());
   EXPECT_EQ(IFA_F_HOMEADDRESS, map[kAddr0].ifa_flags);
@@ -175,14 +211,15 @@ TEST_F(AddressTrackerLinuxTest, NewAddressDuplicate) {
   const IPAddressNumber kAddr0(kAddress0, kAddress0 + arraysize(kAddress0));
 
   Buffer buffer;
-  MakeMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kAddr0, &buffer);
-  EXPECT_TRUE(HandleMessage(&buffer[0], buffer.size()));
+  MakeAddrMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kAddr0,
+                  &buffer);
+  EXPECT_TRUE(HandleAddressMessage(buffer));
   AddressTrackerLinux::AddressMap map = GetAddressMap();
   EXPECT_EQ(1u, map.size());
   EXPECT_TRUE(map.find(kAddr0) != map.end());
   EXPECT_EQ(IFA_F_TEMPORARY, map[kAddr0].ifa_flags);
 
-  EXPECT_FALSE(HandleMessage(&buffer[0], buffer.size()));
+  EXPECT_FALSE(HandleAddressMessage(buffer));
   map = GetAddressMap();
   EXPECT_EQ(1u, map.size());
   EXPECT_EQ(IFA_F_TEMPORARY, map[kAddr0].ifa_flags);
@@ -195,30 +232,30 @@ TEST_F(AddressTrackerLinuxTest, DeleteAddress) {
   const IPAddressNumber kAddr2(kAddress2, kAddress2 + arraysize(kAddress2));
 
   Buffer buffer;
-  MakeMessage(RTM_NEWADDR, 0, AF_INET, kAddr0, kEmpty, &buffer);
-  MakeMessage(RTM_NEWADDR, 0, AF_INET, kAddr1, kAddr2, &buffer);
-  EXPECT_TRUE(HandleMessage(&buffer[0], buffer.size()));
+  MakeAddrMessage(RTM_NEWADDR, 0, AF_INET, kAddr0, kEmpty, &buffer);
+  MakeAddrMessage(RTM_NEWADDR, 0, AF_INET, kAddr1, kAddr2, &buffer);
+  EXPECT_TRUE(HandleAddressMessage(buffer));
   AddressTrackerLinux::AddressMap map = GetAddressMap();
   EXPECT_EQ(2u, map.size());
 
   buffer.clear();
-  MakeMessage(RTM_DELADDR, 0, AF_INET, kEmpty, kAddr0, &buffer);
-  EXPECT_TRUE(HandleMessage(&buffer[0], buffer.size()));
+  MakeAddrMessage(RTM_DELADDR, 0, AF_INET, kEmpty, kAddr0, &buffer);
+  EXPECT_TRUE(HandleAddressMessage(buffer));
   map = GetAddressMap();
   EXPECT_EQ(1u, map.size());
   EXPECT_TRUE(map.find(kAddr0) == map.end());
   EXPECT_TRUE(map.find(kAddr2) != map.end());
 
   buffer.clear();
-  MakeMessage(RTM_DELADDR, 0, AF_INET, kAddr2, kAddr1, &buffer);
+  MakeAddrMessage(RTM_DELADDR, 0, AF_INET, kAddr2, kAddr1, &buffer);
   // kAddr1 does not exist in the map.
-  EXPECT_FALSE(HandleMessage(&buffer[0], buffer.size()));
+  EXPECT_FALSE(HandleAddressMessage(buffer));
   map = GetAddressMap();
   EXPECT_EQ(1u, map.size());
 
   buffer.clear();
-  MakeMessage(RTM_DELADDR, 0, AF_INET, kAddr2, kEmpty, &buffer);
-  EXPECT_TRUE(HandleMessage(&buffer[0], buffer.size()));
+  MakeAddrMessage(RTM_DELADDR, 0, AF_INET, kAddr2, kEmpty, &buffer);
+  EXPECT_TRUE(HandleAddressMessage(buffer));
   map = GetAddressMap();
   EXPECT_EQ(0u, map.size());
 }
@@ -230,12 +267,12 @@ TEST_F(AddressTrackerLinuxTest, IgnoredMessage) {
 
   Buffer buffer;
   // Ignored family.
-  MakeMessage(RTM_NEWADDR, 0, AF_UNSPEC, kAddr3, kAddr0, &buffer);
+  MakeAddrMessage(RTM_NEWADDR, 0, AF_UNSPEC, kAddr3, kAddr0, &buffer);
   // No address.
-  MakeMessage(RTM_NEWADDR, 0, AF_INET, kEmpty, kEmpty, &buffer);
+  MakeAddrMessage(RTM_NEWADDR, 0, AF_INET, kEmpty, kEmpty, &buffer);
   // Ignored type.
-  MakeMessage(RTM_DELROUTE, 0, AF_INET6, kAddr3, kEmpty, &buffer);
-  EXPECT_FALSE(HandleMessage(&buffer[0], buffer.size()));
+  MakeAddrMessage(RTM_DELROUTE, 0, AF_INET6, kAddr3, kEmpty, &buffer);
+  EXPECT_FALSE(HandleAddressMessage(buffer));
   EXPECT_EQ(0u, GetAddressMap().size());
 
   // Valid message after ignored messages.
@@ -249,10 +286,80 @@ TEST_F(AddressTrackerLinuxTest, IgnoredMessage) {
   nlmsg.AddAttribute(IFA_ADDRESS, &kAddr0[0], kAddr0.size());
   nlmsg.AppendTo(&buffer);
 
-  EXPECT_TRUE(HandleMessage(&buffer[0], buffer.size()));
+  EXPECT_TRUE(HandleAddressMessage(buffer));
   EXPECT_EQ(1u, GetAddressMap().size());
 }
 
+TEST_F(AddressTrackerLinuxTest, AddInterface) {
+  Buffer buffer;
+
+  // Ignores loopback

[szym, 2012/11/26 17:34:20]

nit: Add '.' at end of comments to make them more like sentences :)

+  MakeLinkMessage(RTM_NEWLINK,
+                  IFF_LOOPBACK | IFF_UP | IFF_LOWER_UP | IFF_RUNNING,
+                  0, &buffer);
+  EXPECT_FALSE(HandleLinkMessage(buffer));
+  EXPECT_TRUE(GetOnlineLinks()->empty());
+
+  // Ignores not IFF_LOWER_UP
+  MakeLinkMessage(RTM_NEWLINK, IFF_UP | IFF_RUNNING, 0, &buffer);
+  EXPECT_FALSE(HandleLinkMessage(buffer));
+  EXPECT_TRUE(GetOnlineLinks()->empty());
+
+  // Ignores deletion
+  MakeLinkMessage(RTM_DELLINK, IFF_UP | IFF_LOWER_UP | IFF_RUNNING, 0, &buffer);
+  EXPECT_FALSE(HandleLinkMessage(buffer));
+  EXPECT_TRUE(GetOnlineLinks()->empty());
+
+  // Verify success
+  MakeLinkMessage(RTM_NEWLINK, IFF_UP | IFF_LOWER_UP | IFF_RUNNING, 0, &buffer);
+  EXPECT_TRUE(HandleLinkMessage(buffer));
+  EXPECT_EQ(GetOnlineLinks()->count(0), 1u);

[szym, 2012/11/26 17:34:20]

EXPECT_EQ(expected, tested) so that when it fails it prints:
Actual: <actual>
Expected: <expected>

+  EXPECT_EQ(GetOnlineLinks()->size(), 1u);
+
+  // Ignores redundant enables
+  MakeLinkMessage(RTM_NEWLINK, IFF_UP | IFF_LOWER_UP | IFF_RUNNING, 0, &buffer);
+  EXPECT_FALSE(HandleLinkMessage(buffer));
+  EXPECT_EQ(GetOnlineLinks()->count(0), 1u);
+  EXPECT_EQ(GetOnlineLinks()->size(), 1u);
+
+  // Verify adding another online device (e.g. VPN) is considered a change
+  MakeLinkMessage(RTM_NEWLINK, IFF_UP | IFF_LOWER_UP | IFF_RUNNING, 1, &buffer);
+  EXPECT_TRUE(HandleLinkMessage(buffer));
+  EXPECT_EQ(GetOnlineLinks()->count(0), 1u);
+  EXPECT_EQ(GetOnlineLinks()->count(1), 1u);
+  EXPECT_EQ(GetOnlineLinks()->size(), 2u);
+}
+
+TEST_F(AddressTrackerLinuxTest, RemoveInterface) {
+  Buffer buffer;
+
+  // Should disappear when not IFF_LOWER_UP
+  MakeLinkMessage(RTM_NEWLINK, IFF_UP | IFF_LOWER_UP | IFF_RUNNING, 0, &buffer);
+  EXPECT_TRUE(HandleLinkMessage(buffer));
+  EXPECT_FALSE(GetOnlineLinks()->empty());
+  MakeLinkMessage(RTM_NEWLINK, IFF_UP | IFF_RUNNING, 0, &buffer);
+  EXPECT_TRUE(HandleLinkMessage(buffer));
+  EXPECT_TRUE(GetOnlineLinks()->empty());
+
+  // Ignores redundant disables
+  MakeLinkMessage(RTM_NEWLINK, IFF_UP | IFF_RUNNING, 0, &buffer);
+  EXPECT_FALSE(HandleLinkMessage(buffer));
+  EXPECT_TRUE(GetOnlineLinks()->empty());
+
+  // Ignores deleting down interfaces
+  MakeLinkMessage(RTM_DELLINK, IFF_UP | IFF_RUNNING, 0, &buffer);
+  EXPECT_FALSE(HandleLinkMessage(buffer));
+  EXPECT_TRUE(GetOnlineLinks()->empty());
+
+  // Should disappear when deleted
+  MakeLinkMessage(RTM_NEWLINK, IFF_UP | IFF_LOWER_UP | IFF_RUNNING, 0, &buffer);
+  EXPECT_TRUE(HandleLinkMessage(buffer));
+  EXPECT_FALSE(GetOnlineLinks()->empty());
+  MakeLinkMessage(RTM_DELLINK, IFF_UP | IFF_LOWER_UP | IFF_RUNNING, 0, &buffer);
+  EXPECT_TRUE(HandleLinkMessage(buffer));
+  EXPECT_TRUE(GetOnlineLinks()->empty());
+}
+
 }  // namespace
 
 }  // namespace internal