| 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 641220731b71bbbe43b54f4e8b564921494f5b64..273c28e3880ea076e213a5ae1ae8178a074ed725 100644
|
| --- a/net/base/address_tracker_linux_unittest.cc
|
| +++ b/net/base/address_tracker_linux_unittest.cc
|
| @@ -53,8 +53,11 @@ class AddressTrackerLinuxTest : public testing::Test {
|
| bool address_changed = false;
|
| bool link_changed = false;
|
| bool tunnel_changed = false;
|
| - tracker_->HandleMessage(&writable_buf[0], buf.size(),
|
| - &address_changed, &link_changed, &tunnel_changed);
|
| + tracker_->HandleMessage(&writable_buf[0],
|
| + buf.size(),
|
| + &address_changed,
|
| + &link_changed,
|
| + &tunnel_changed);
|
| EXPECT_FALSE(link_changed);
|
| return address_changed;
|
| }
|
| @@ -64,8 +67,11 @@ class AddressTrackerLinuxTest : public testing::Test {
|
| bool address_changed = false;
|
| bool link_changed = false;
|
| bool tunnel_changed = false;
|
| - tracker_->HandleMessage(&writable_buf[0], buf.size(),
|
| - &address_changed, &link_changed, &tunnel_changed);
|
| + tracker_->HandleMessage(&writable_buf[0],
|
| + buf.size(),
|
| + &address_changed,
|
| + &link_changed,
|
| + &tunnel_changed);
|
| EXPECT_FALSE(address_changed);
|
| return link_changed;
|
| }
|
| @@ -75,8 +81,11 @@ class AddressTrackerLinuxTest : public testing::Test {
|
| bool address_changed = false;
|
| bool link_changed = false;
|
| bool tunnel_changed = false;
|
| - tracker_->HandleMessage(&writable_buf[0], buf.size(),
|
| - &address_changed, &link_changed, &tunnel_changed);
|
| + tracker_->HandleMessage(&writable_buf[0],
|
| + buf.size(),
|
| + &address_changed,
|
| + &link_changed,
|
| + &tunnel_changed);
|
| EXPECT_FALSE(address_changed);
|
| return tunnel_changed;
|
| }
|
| @@ -103,8 +112,8 @@ class NetlinkMessage {
|
| }
|
|
|
| void AddPayload(const void* data, size_t length) {
|
| - CHECK_EQ(static_cast<size_t>(NLMSG_HDRLEN),
|
| - buffer_.size()) << "Payload must be added first";
|
| + CHECK_EQ(static_cast<size_t>(NLMSG_HDRLEN), buffer_.size())
|
| + << "Payload must be added first";
|
| Append(data, length);
|
| Align();
|
| }
|
| @@ -133,8 +142,8 @@ class NetlinkMessage {
|
|
|
| void Align() {
|
| header()->nlmsg_len = buffer_.size();
|
| - buffer_.insert(buffer_.end(), NLMSG_ALIGN(buffer_.size()) - buffer_.size(),
|
| - 0);
|
| + buffer_.insert(
|
| + buffer_.end(), NLMSG_ALIGN(buffer_.size()) - buffer_.size(), 0);
|
| CHECK(NLMSG_OK(header(), buffer_.size()));
|
| }
|
|
|
| @@ -176,8 +185,8 @@ void MakeAddrMessage(uint16 type,
|
| const IPAddressNumber& address,
|
| const IPAddressNumber& local,
|
| Buffer* output) {
|
| - MakeAddrMessageWithCacheInfo(type, flags, family, address, local,
|
| - INFINITY_LIFE_TIME, output);
|
| + MakeAddrMessageWithCacheInfo(
|
| + type, flags, family, address, local, INFINITY_LIFE_TIME, output);
|
| }
|
|
|
| void MakeLinkMessage(uint16 type, uint32 flags, uint32 index, Buffer* output) {
|
| @@ -190,11 +199,11 @@ void MakeLinkMessage(uint16 type, uint32 flags, uint32 index, Buffer* output) {
|
| 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 };
|
| -const unsigned char kAddress3[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
| - 0, 0, 0, 1 };
|
| +const unsigned char kAddress0[] = {127, 0, 0, 1};
|
| +const unsigned char kAddress1[] = {10, 0, 0, 1};
|
| +const unsigned char kAddress2[] = {192, 168, 0, 1};
|
| +const unsigned char kAddress3[] =
|
| + {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
|
|
|
| TEST_F(AddressTrackerLinuxTest, NewAddress) {
|
| InitializeAddressTracker(true);
|
| @@ -206,8 +215,8 @@ TEST_F(AddressTrackerLinuxTest, NewAddress) {
|
| const IPAddressNumber kAddr3(kAddress3, kAddress3 + arraysize(kAddress3));
|
|
|
| Buffer buffer;
|
| - MakeAddrMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kEmpty,
|
| - &buffer);
|
| + MakeAddrMessage(
|
| + RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kEmpty, &buffer);
|
| EXPECT_TRUE(HandleAddressMessage(buffer));
|
| AddressTrackerLinux::AddressMap map = GetAddressMap();
|
| EXPECT_EQ(1u, map.size());
|
| @@ -215,8 +224,8 @@ TEST_F(AddressTrackerLinuxTest, NewAddress) {
|
| EXPECT_EQ(IFA_F_TEMPORARY, map[kAddr0].ifa_flags);
|
|
|
| buffer.clear();
|
| - MakeAddrMessage(RTM_NEWADDR, IFA_F_HOMEADDRESS, AF_INET, kAddr1, kAddr2,
|
| - &buffer);
|
| + MakeAddrMessage(
|
| + RTM_NEWADDR, IFA_F_HOMEADDRESS, AF_INET, kAddr1, kAddr2, &buffer);
|
| EXPECT_TRUE(HandleAddressMessage(buffer));
|
| map = GetAddressMap();
|
| EXPECT_EQ(2u, map.size());
|
| @@ -239,8 +248,8 @@ TEST_F(AddressTrackerLinuxTest, NewAddressChange) {
|
| const IPAddressNumber kAddr0(kAddress0, kAddress0 + arraysize(kAddress0));
|
|
|
| Buffer buffer;
|
| - MakeAddrMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kEmpty,
|
| - &buffer);
|
| + MakeAddrMessage(
|
| + RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kEmpty, &buffer);
|
| EXPECT_TRUE(HandleAddressMessage(buffer));
|
| AddressTrackerLinux::AddressMap map = GetAddressMap();
|
| EXPECT_EQ(1u, map.size());
|
| @@ -248,8 +257,8 @@ TEST_F(AddressTrackerLinuxTest, NewAddressChange) {
|
| EXPECT_EQ(IFA_F_TEMPORARY, map[kAddr0].ifa_flags);
|
|
|
| buffer.clear();
|
| - MakeAddrMessage(RTM_NEWADDR, IFA_F_HOMEADDRESS, 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());
|
| @@ -258,10 +267,10 @@ TEST_F(AddressTrackerLinuxTest, NewAddressChange) {
|
|
|
| // Both messages in one buffer.
|
| buffer.clear();
|
| - MakeAddrMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kEmpty,
|
| - &buffer);
|
| - MakeAddrMessage(RTM_NEWADDR, IFA_F_HOMEADDRESS, AF_INET, kAddr0, kEmpty,
|
| - &buffer);
|
| + 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());
|
| @@ -274,8 +283,8 @@ TEST_F(AddressTrackerLinuxTest, NewAddressDuplicate) {
|
| const IPAddressNumber kAddr0(kAddress0, kAddress0 + arraysize(kAddress0));
|
|
|
| Buffer buffer;
|
| - MakeAddrMessage(RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kAddr0,
|
| - &buffer);
|
| + MakeAddrMessage(
|
| + RTM_NEWADDR, IFA_F_TEMPORARY, AF_INET, kAddr0, kAddr0, &buffer);
|
| EXPECT_TRUE(HandleAddressMessage(buffer));
|
| AddressTrackerLinux::AddressMap map = GetAddressMap();
|
| EXPECT_EQ(1u, map.size());
|
| @@ -341,8 +350,8 @@ TEST_F(AddressTrackerLinuxTest, DeprecatedLifetime) {
|
|
|
| // Verify 0 preferred lifetime implies deprecated.
|
| buffer.clear();
|
| - MakeAddrMessageWithCacheInfo(RTM_NEWADDR, 0, AF_INET6, kEmpty, kAddr3, 0,
|
| - &buffer);
|
| + MakeAddrMessageWithCacheInfo(
|
| + RTM_NEWADDR, 0, AF_INET6, kEmpty, kAddr3, 0, &buffer);
|
| EXPECT_TRUE(HandleAddressMessage(buffer));
|
| map = GetAddressMap();
|
| EXPECT_EQ(1u, map.size());
|
| @@ -350,8 +359,8 @@ TEST_F(AddressTrackerLinuxTest, DeprecatedLifetime) {
|
|
|
| // Verify properly flagged message doesn't imply change.
|
| buffer.clear();
|
| - MakeAddrMessageWithCacheInfo(RTM_NEWADDR, IFA_F_DEPRECATED, AF_INET6, kEmpty,
|
| - kAddr3, 0, &buffer);
|
| + MakeAddrMessageWithCacheInfo(
|
| + RTM_NEWADDR, IFA_F_DEPRECATED, AF_INET6, kEmpty, kAddr3, 0, &buffer);
|
| EXPECT_FALSE(HandleAddressMessage(buffer));
|
| map = GetAddressMap();
|
| EXPECT_EQ(1u, map.size());
|
| @@ -359,8 +368,8 @@ TEST_F(AddressTrackerLinuxTest, DeprecatedLifetime) {
|
|
|
| // Verify implied deprecated doesn't imply change.
|
| buffer.clear();
|
| - MakeAddrMessageWithCacheInfo(RTM_NEWADDR, 0, AF_INET6, kEmpty, kAddr3, 0,
|
| - &buffer);
|
| + MakeAddrMessageWithCacheInfo(
|
| + RTM_NEWADDR, 0, AF_INET6, kEmpty, kAddr3, 0, &buffer);
|
| EXPECT_FALSE(HandleAddressMessage(buffer));
|
| map = GetAddressMap();
|
| EXPECT_EQ(1u, map.size());
|
| @@ -407,7 +416,8 @@ TEST_F(AddressTrackerLinuxTest, AddInterface) {
|
| // Ignores loopback.
|
| MakeLinkMessage(RTM_NEWLINK,
|
| IFF_LOOPBACK | IFF_UP | IFF_LOWER_UP | IFF_RUNNING,
|
| - 0, &buffer);
|
| + 0,
|
| + &buffer);
|
| EXPECT_FALSE(HandleLinkMessage(buffer));
|
| EXPECT_TRUE(GetOnlineLinks().empty());
|
|
|
| @@ -481,37 +491,43 @@ TEST_F(AddressTrackerLinuxTest, TunnelInterface) {
|
| // Ignores without "tun" prefixed name.
|
| MakeLinkMessage(RTM_NEWLINK,
|
| IFF_UP | IFF_LOWER_UP | IFF_RUNNING | IFF_POINTOPOINT,
|
| - 0, &buffer);
|
| + 0,
|
| + &buffer);
|
| EXPECT_FALSE(HandleTunnelMessage(buffer));
|
|
|
| // Verify success.
|
| MakeLinkMessage(RTM_NEWLINK,
|
| IFF_UP | IFF_LOWER_UP | IFF_RUNNING | IFF_POINTOPOINT,
|
| - kTestInterfaceTun, &buffer);
|
| + kTestInterfaceTun,
|
| + &buffer);
|
| EXPECT_TRUE(HandleTunnelMessage(buffer));
|
|
|
| // Ignores redundant enables.
|
| MakeLinkMessage(RTM_NEWLINK,
|
| IFF_UP | IFF_LOWER_UP | IFF_RUNNING | IFF_POINTOPOINT,
|
| - kTestInterfaceTun, &buffer);
|
| + kTestInterfaceTun,
|
| + &buffer);
|
| EXPECT_FALSE(HandleTunnelMessage(buffer));
|
|
|
| // Ignores deleting without "tun" prefixed name.
|
| MakeLinkMessage(RTM_DELLINK,
|
| IFF_UP | IFF_LOWER_UP | IFF_RUNNING | IFF_POINTOPOINT,
|
| - 0, &buffer);
|
| + 0,
|
| + &buffer);
|
| EXPECT_FALSE(HandleTunnelMessage(buffer));
|
|
|
| // Verify successful deletion
|
| MakeLinkMessage(RTM_DELLINK,
|
| IFF_UP | IFF_LOWER_UP | IFF_RUNNING | IFF_POINTOPOINT,
|
| - kTestInterfaceTun, &buffer);
|
| + kTestInterfaceTun,
|
| + &buffer);
|
| EXPECT_TRUE(HandleTunnelMessage(buffer));
|
|
|
| // Ignores redundant deletions.
|
| MakeLinkMessage(RTM_DELLINK,
|
| IFF_UP | IFF_LOWER_UP | IFF_RUNNING | IFF_POINTOPOINT,
|
| - kTestInterfaceTun, &buffer);
|
| + kTestInterfaceTun,
|
| + &buffer);
|
| EXPECT_FALSE(HandleTunnelMessage(buffer));
|
| }
|
|
|
|
|