shill: Naming and lint cleanup pass
Reduce some double-speak in IPAddress constants. Do a cursory
glint pass and clean up a few no-brainer issues.
BUG=None
TEST=Re-run unit tests
Change-Id: I063cd72111bd1f6321f81c6c6591b9f51d87434d
Reviewed-on: http://gerrit.chromium.org/gerrit/7181
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
diff --git a/cellular_unittest.cc b/cellular_unittest.cc
index 7526e54..5fac327 100644
--- a/cellular_unittest.cc
+++ b/cellular_unittest.cc
@@ -155,7 +155,7 @@
protected:
class TestProxyFactory : public ProxyFactory {
public:
- TestProxyFactory(CellularTest *test) : test_(test) {}
+ explicit TestProxyFactory(CellularTest *test) : test_(test) {}
virtual ModemProxyInterface *CreateModemProxy(ModemProxyListener *listener,
const string &path,
diff --git a/connection_unittest.cc b/connection_unittest.cc
index 3111db7..dd1fe4b 100644
--- a/connection_unittest.cc
+++ b/connection_unittest.cc
@@ -69,7 +69,7 @@
properties.dns_servers.push_back(kNameServer1);
properties.domain_search.push_back(kSearchDomain0);
properties.domain_search.push_back(kSearchDomain1);
- properties.address_family = IPAddress::kAddressFamilyIPv4;
+ properties.address_family = IPAddress::kFamilyIPv4;
ipconfig_->UpdateProperties(properties, true);
}
diff --git a/device_info.cc b/device_info.cc
index b905d56..611e039 100644
--- a/device_info.cc
+++ b/device_info.cc
@@ -250,6 +250,7 @@
}
void DeviceInfo::FlushAddresses(int interface_index) const {
+ VLOG(2) << __func__ << "(" << interface_index << ")";
const Info *info = GetInfo(interface_index);
if (!info) {
return;
@@ -257,7 +258,7 @@
const vector<AddressData> &addresses = info->ip_addresses;
vector<AddressData>::const_iterator iter;
for (iter = addresses.begin(); iter != addresses.end(); ++iter) {
- if (iter->address.family() == IPAddress::kAddressFamilyIPv4 ||
+ if (iter->address.family() == IPAddress::kFamilyIPv4 ||
(iter->scope == RT_SCOPE_UNIVERSE &&
(iter->flags & ~IFA_F_TEMPORARY) == 0)) {
VLOG(2) << __func__ << ": removing ip address from interface "
@@ -309,6 +310,7 @@
}
void DeviceInfo::AddressMsgHandler(const RTNLMessage &msg) {
+ VLOG(2) << __func__;
DCHECK(msg.type() == RTNLMessage::kTypeAddress);
int interface_index = msg.interface_index();
if (!ContainsKey(infos_, interface_index)) {
diff --git a/device_info.h b/device_info.h
index ea8b776..4e1e41a 100644
--- a/device_info.h
+++ b/device_info.h
@@ -30,7 +30,7 @@
public:
struct AddressData {
AddressData()
- : address(IPAddress::kAddressFamilyUnknown), flags(0), scope(0) {}
+ : address(IPAddress::kFamilyUnknown), flags(0), scope(0) {}
AddressData(const IPAddress &address_in,
unsigned char flags_in,
unsigned char scope_in)
diff --git a/device_info_unittest.cc b/device_info_unittest.cc
index 6a0a477..5c80e40 100644
--- a/device_info_unittest.cc
+++ b/device_info_unittest.cc
@@ -106,7 +106,7 @@
0,
0,
kTestDeviceIndex,
- IPAddress::kAddressFamilyIPv4);
+ IPAddress::kFamilyIPv4);
message->SetAttribute(static_cast<uint16>(IFLA_IFNAME),
ByteString(kTestDeviceName, true));
ByteString test_address(kTestMACAddress, sizeof(kTestMACAddress));
@@ -202,7 +202,7 @@
EXPECT_TRUE(addresses.empty());
// Add an address to the device address list
- IPAddress ip_address0(IPAddress::kAddressFamilyIPv4);
+ IPAddress ip_address0(IPAddress::kFamilyIPv4);
EXPECT_TRUE(ip_address0.SetAddressFromString(kTestIPAddress0));
ip_address0.set_prefix(kTestIPAddressPrefix0);
message.reset(BuildAddressMessage(RTNLMessage::kModeAdd, ip_address0, 0, 0));
@@ -218,7 +218,7 @@
EXPECT_TRUE(ip_address0.Equals(addresses[0].address));
// Adding a new address should expand the list
- IPAddress ip_address1(IPAddress::kAddressFamilyIPv6);
+ IPAddress ip_address1(IPAddress::kFamilyIPv6);
EXPECT_TRUE(ip_address1.SetAddressFromString(kTestIPAddress1));
ip_address1.set_prefix(kTestIPAddressPrefix1);
message.reset(BuildAddressMessage(RTNLMessage::kModeAdd, ip_address1, 0, 0));
@@ -264,7 +264,7 @@
scoped_ptr<RTNLMessage> message(BuildLinkMessage(RTNLMessage::kModeAdd));
SendMessageToDeviceInfo(*message);
- IPAddress address1(IPAddress::kAddressFamilyIPv6);
+ IPAddress address1(IPAddress::kFamilyIPv6);
EXPECT_TRUE(address1.SetAddressFromString(kTestIPAddress1));
address1.set_prefix(kTestIPAddressPrefix1);
message.reset(BuildAddressMessage(RTNLMessage::kModeAdd,
@@ -272,21 +272,21 @@
0,
RT_SCOPE_UNIVERSE));
SendMessageToDeviceInfo(*message);
- IPAddress address2(IPAddress::kAddressFamilyIPv6);
+ IPAddress address2(IPAddress::kFamilyIPv6);
EXPECT_TRUE(address2.SetAddressFromString(kTestIPAddress2));
message.reset(BuildAddressMessage(RTNLMessage::kModeAdd,
address2,
IFA_F_TEMPORARY,
RT_SCOPE_UNIVERSE));
SendMessageToDeviceInfo(*message);
- IPAddress address3(IPAddress::kAddressFamilyIPv6);
+ IPAddress address3(IPAddress::kFamilyIPv6);
EXPECT_TRUE(address3.SetAddressFromString(kTestIPAddress3));
message.reset(BuildAddressMessage(RTNLMessage::kModeAdd,
address3,
0,
RT_SCOPE_LINK));
SendMessageToDeviceInfo(*message);
- IPAddress address4(IPAddress::kAddressFamilyIPv6);
+ IPAddress address4(IPAddress::kFamilyIPv6);
EXPECT_TRUE(address4.SetAddressFromString(kTestIPAddress4));
message.reset(BuildAddressMessage(RTNLMessage::kModeAdd,
address4,
diff --git a/dhcp_config.cc b/dhcp_config.cc
index 581528b..3764c19 100644
--- a/dhcp_config.cc
+++ b/dhcp_config.cc
@@ -206,7 +206,7 @@
IPConfig::Properties *properties) {
VLOG(2) << __func__;
properties->method = flimflam::kTypeDHCP;
- properties->address_family = IPAddress::kAddressFamilyIPv4;
+ properties->address_family = IPAddress::kFamilyIPv4;
for (Configuration::const_iterator it = configuration.begin();
it != configuration.end(); ++it) {
const string &key = it->first;
diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index 2ec6fb6..d7ffbf5 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -54,7 +54,7 @@
protected:
class TestProxyFactory : public ProxyFactory {
public:
- TestProxyFactory(DHCPConfigTest *test) : test_(test) {}
+ explicit TestProxyFactory(DHCPConfigTest *test) : test_(test) {}
virtual DHCPProxyInterface *CreateDHCPProxy(const string &service) {
return test_->proxy_.release();
diff --git a/ip_address.cc b/ip_address.cc
index 369e7d4..d1334d0 100644
--- a/ip_address.cc
+++ b/ip_address.cc
@@ -14,11 +14,11 @@
namespace shill {
// static
-const IPAddress::Family IPAddress::kAddressFamilyUnknown = AF_UNSPEC;
+const IPAddress::Family IPAddress::kFamilyUnknown = AF_UNSPEC;
// static
-const IPAddress::Family IPAddress::kAddressFamilyIPv4 = AF_INET;
+const IPAddress::Family IPAddress::kFamilyIPv4 = AF_INET;
// static
-const IPAddress::Family IPAddress::kAddressFamilyIPv6 = AF_INET6;
+const IPAddress::Family IPAddress::kFamilyIPv6 = AF_INET6;
IPAddress::IPAddress(Family family, const ByteString &address)
: family_(family) ,
@@ -40,9 +40,9 @@
int IPAddress::GetAddressLength(Family family) {
switch (family) {
- case kAddressFamilyIPv4:
+ case kFamilyIPv4:
return sizeof(in_addr);
- case kAddressFamilyIPv6:
+ case kFamilyIPv6:
return sizeof(in6_addr);
default:
return 0;
diff --git a/ip_address.h b/ip_address.h
index 8ae07be..d6f0139 100644
--- a/ip_address.h
+++ b/ip_address.h
@@ -14,9 +14,9 @@
class IPAddress {
public:
typedef unsigned char Family;
- static const Family kAddressFamilyUnknown;
- static const Family kAddressFamilyIPv4;
- static const Family kAddressFamilyIPv6;
+ static const Family kFamilyUnknown;
+ static const Family kFamilyIPv4;
+ static const Family kFamilyIPv6;
explicit IPAddress(Family family);
IPAddress(Family family, const ByteString &address);
@@ -48,7 +48,7 @@
int GetLength() const { return address_.GetLength(); }
bool IsDefault() const { return address_.IsZero(); }
bool IsValid() const {
- return family_ != kAddressFamilyUnknown &&
+ return family_ != kFamilyUnknown &&
GetLength() == GetAddressLength(family_);
}
diff --git a/ip_address_unittest.cc b/ip_address_unittest.cc
index 07d9882..d105903 100644
--- a/ip_address_unittest.cc
+++ b/ip_address_unittest.cc
@@ -65,24 +65,24 @@
};
TEST_F(IPAddressTest, Statics) {
- EXPECT_EQ(4, IPAddress::GetAddressLength(IPAddress::kAddressFamilyIPv4));
- EXPECT_EQ(16, IPAddress::GetAddressLength(IPAddress::kAddressFamilyIPv6));
+ EXPECT_EQ(4, IPAddress::GetAddressLength(IPAddress::kFamilyIPv4));
+ EXPECT_EQ(16, IPAddress::GetAddressLength(IPAddress::kFamilyIPv6));
- IPAddress addr4(IPAddress::kAddressFamilyIPv4);
+ IPAddress addr4(IPAddress::kFamilyIPv4);
addr4.SetAddressToDefault();
EXPECT_EQ(4, addr4.GetLength());
- EXPECT_EQ(IPAddress::kAddressFamilyIPv4, addr4.family());
+ EXPECT_EQ(IPAddress::kFamilyIPv4, addr4.family());
EXPECT_TRUE(addr4.IsDefault());
EXPECT_TRUE(addr4.address().IsZero());
EXPECT_TRUE(addr4.address().Equals(ByteString(4)));
- IPAddress addr6(IPAddress::kAddressFamilyIPv6);
+ IPAddress addr6(IPAddress::kFamilyIPv6);
addr6.SetAddressToDefault();
EXPECT_EQ(16, addr6.GetLength());
- EXPECT_EQ(addr6.family(), IPAddress::kAddressFamilyIPv6);
+ EXPECT_EQ(addr6.family(), IPAddress::kFamilyIPv6);
EXPECT_TRUE(addr6.IsDefault());
EXPECT_TRUE(addr6.address().IsZero());
EXPECT_TRUE(addr6.address().Equals(ByteString(16)));
@@ -91,14 +91,14 @@
}
TEST_F(IPAddressTest, IPv4) {
- TestAddress(IPAddress::kAddressFamilyIPv4,
+ TestAddress(IPAddress::kFamilyIPv4,
kV4String1, ByteString(kV4Address1, sizeof(kV4Address1)),
kV4String2, ByteString(kV4Address2, sizeof(kV4Address2)));
}
TEST_F(IPAddressTest, IPv6) {
- TestAddress(IPAddress::kAddressFamilyIPv6,
+ TestAddress(IPAddress::kFamilyIPv6,
kV6String1, ByteString(kV6Address1, sizeof(kV6Address1)),
kV6String2, ByteString(kV6Address2, sizeof(kV6Address2)));
}
diff --git a/ipconfig.h b/ipconfig.h
index 08a7c19..7aba55b 100644
--- a/ipconfig.h
+++ b/ipconfig.h
@@ -29,7 +29,7 @@
class IPConfig : public base::RefCounted<IPConfig> {
public:
struct Properties {
- Properties() : address_family(IPAddress::kAddressFamilyUnknown),
+ Properties() : address_family(IPAddress::kFamilyUnknown),
subnet_cidr(0),
mtu(0) {}
diff --git a/modem_manager_unittest.cc b/modem_manager_unittest.cc
index 7f3154c..c57a0fe 100644
--- a/modem_manager_unittest.cc
+++ b/modem_manager_unittest.cc
@@ -44,7 +44,7 @@
protected:
class TestProxyFactory : public ProxyFactory {
public:
- TestProxyFactory(ModemManagerTest *test) : test_(test) {}
+ explicit TestProxyFactory(ModemManagerTest *test) : test_(test) {}
virtual ModemManagerProxyInterface *CreateModemManagerProxy(
ModemManager *manager,
diff --git a/modem_unittest.cc b/modem_unittest.cc
index 7710746..70306c9 100644
--- a/modem_unittest.cc
+++ b/modem_unittest.cc
@@ -64,7 +64,7 @@
protected:
class TestProxyFactory : public ProxyFactory {
public:
- TestProxyFactory(ModemTest *test) : test_(test) {}
+ explicit TestProxyFactory(ModemTest *test) : test_(test) {}
virtual DBusPropertiesProxyInterface *CreateDBusPropertiesProxy(
DBusPropertiesProxyListener *listener,
diff --git a/profile_unittest.cc b/profile_unittest.cc
index 3ae55b4..67002cf 100644
--- a/profile_unittest.cc
+++ b/profile_unittest.cc
@@ -167,4 +167,4 @@
ASSERT_EQ(profile_->EnumerateEntries().size(), 0);
}
-} // namespace shill
+} // namespace shill
diff --git a/routing_table.cc b/routing_table.cc
index 3d9d1b9..447cba0 100644
--- a/routing_table.cc
+++ b/routing_table.cc
@@ -181,14 +181,14 @@
VLOG(2) << __func__;
- if (GetDefaultRoute(interface_index, IPAddress::kAddressFamilyIPv4, &entry) &&
+ if (GetDefaultRoute(interface_index, IPAddress::kFamilyIPv4, &entry) &&
entry.metric != metric) {
entry.metric = metric;
ApplyRoute(interface_index, entry, RTNLMessage::kModeAdd,
NLM_F_CREATE | NLM_F_REPLACE);
}
- if (GetDefaultRoute(interface_index, IPAddress::kAddressFamilyIPv6, &entry) &&
+ if (GetDefaultRoute(interface_index, IPAddress::kFamilyIPv6, &entry) &&
entry.metric != metric) {
entry.metric = metric;
ApplyRoute(interface_index, entry, RTNLMessage::kModeAdd,
@@ -200,7 +200,7 @@
VLOG(2) << __func__;
if (msg.type() != RTNLMessage::kTypeRoute ||
- msg.family() == IPAddress::kAddressFamilyUnknown ||
+ msg.family() == IPAddress::kFamilyUnknown ||
!msg.HasAttribute(RTA_OIF)) {
return;
}
diff --git a/routing_table_entry.h b/routing_table_entry.h
index 727df83..9cf41de 100644
--- a/routing_table_entry.h
+++ b/routing_table_entry.h
@@ -17,9 +17,9 @@
struct RoutingTableEntry {
public:
RoutingTableEntry()
- : dst(IPAddress::kAddressFamilyUnknown),
- src(IPAddress::kAddressFamilyUnknown),
- gateway(IPAddress::kAddressFamilyUnknown),
+ : dst(IPAddress::kFamilyUnknown),
+ src(IPAddress::kFamilyUnknown),
+ gateway(IPAddress::kFamilyUnknown),
metric(0),
scope(0),
from_rtnl(false) {}
diff --git a/routing_table_unittest.cc b/routing_table_unittest.cc
index f38ca67..544ae4d 100644
--- a/routing_table_unittest.cc
+++ b/routing_table_unittest.cc
@@ -172,10 +172,10 @@
// Expect the tables to be empty by default
EXPECT_EQ(0, GetRoutingTables()->size());
- IPAddress default_address(IPAddress::kAddressFamilyIPv4);
+ IPAddress default_address(IPAddress::kFamilyIPv4);
default_address.SetAddressToDefault();
- IPAddress gateway_address0(IPAddress::kAddressFamilyIPv4);
+ IPAddress gateway_address0(IPAddress::kFamilyIPv4);
gateway_address0.SetAddressFromString(kTestNetAddress0);
int metric = 10;
@@ -216,7 +216,7 @@
test_entry = (*tables)[kTestDeviceIndex1][0];
EXPECT_TRUE(entry0.Equals(test_entry));
- IPAddress gateway_address1(IPAddress::kAddressFamilyIPv4);
+ IPAddress gateway_address1(IPAddress::kFamilyIPv4);
gateway_address1.SetAddressFromString(kTestNetAddress1);
RoutingTableEntry entry1(default_address,
@@ -266,13 +266,13 @@
// Find a matching entry
EXPECT_TRUE(routing_table_->GetDefaultRoute(kTestDeviceIndex1,
- IPAddress::kAddressFamilyIPv4,
+ IPAddress::kFamilyIPv4,
&test_entry));
EXPECT_TRUE(entry2.Equals(test_entry));
// Test that a search for a non-matching family fails
EXPECT_FALSE(routing_table_->GetDefaultRoute(kTestDeviceIndex1,
- IPAddress::kAddressFamilyIPv6,
+ IPAddress::kFamilyIPv6,
&test_entry));
// Remove last entry from an existing interface and test that we now fail
@@ -281,14 +281,14 @@
entry2);
EXPECT_FALSE(routing_table_->GetDefaultRoute(kTestDeviceIndex1,
- IPAddress::kAddressFamilyIPv4,
+ IPAddress::kFamilyIPv4,
&test_entry));
// Add a route from an IPConfig entry
MockControl control;
IPConfigRefPtr ipconfig(new IPConfig(&control, kTestDeviceName0));
IPConfig::Properties properties;
- properties.address_family = IPAddress::kAddressFamilyIPv4;
+ properties.address_family = IPAddress::kFamilyIPv4;
properties.gateway = kTestNetAddress0;
properties.address = kTestNetAddress1;
ipconfig->UpdateProperties(properties, true);
@@ -309,7 +309,7 @@
RoutingTableEntry entry3(entry0);
entry3.from_rtnl = false;
EXPECT_TRUE(routing_table_->GetDefaultRoute(kTestDeviceIndex1,
- IPAddress::kAddressFamilyIPv4,
+ IPAddress::kFamilyIPv4,
&test_entry));
EXPECT_TRUE(entry3.Equals(test_entry));
@@ -333,7 +333,7 @@
routing_table_->ResetTable(kTestDeviceIndex1);
EXPECT_FALSE(ContainsKey(*tables, kTestDeviceIndex1));
EXPECT_FALSE(routing_table_->GetDefaultRoute(kTestDeviceIndex1,
- IPAddress::kAddressFamilyIPv4,
+ IPAddress::kFamilyIPv4,
&test_entry));
EXPECT_EQ(1, GetRoutingTables()->size());
diff --git a/rtnl_handler.cc b/rtnl_handler.cc
index dc48c71..b2bbac4 100644
--- a/rtnl_handler.cc
+++ b/rtnl_handler.cc
@@ -93,7 +93,7 @@
if (!sockets_)
return;
- rtnl_handler_.reset(NULL);
+ rtnl_handler_.reset();
sockets_->Close(rtnl_socket_);
in_request_ = false;
sockets_ = NULL;
@@ -199,7 +199,7 @@
0,
0,
0,
- IPAddress::kAddressFamilyUnknown);
+ IPAddress::kFamilyUnknown);
CHECK(SendMessage(&msg));
last_dump_sequence_ = msg.seq();
@@ -216,10 +216,13 @@
if (!NLMSG_OK(hdr, static_cast<unsigned int>(end - buf)))
break;
+ VLOG(3) << __func__ << ": received payload (" << end - buf << ")";
+
RTNLMessage msg;
if (!msg.Decode(ByteString(reinterpret_cast<unsigned char *>(hdr),
hdr->nlmsg_len))) {
-
+ VLOG(3) << __func__ << ": rtnl packet type "
+ << hdr->nlmsg_type << " length " << hdr->nlmsg_len;
switch (hdr->nlmsg_type) {
case NLMSG_NOOP:
case NLMSG_OVERRUN:
diff --git a/rtnl_handler_unittest.cc b/rtnl_handler_unittest.cc
index 2eb36da..7e52bab 100644
--- a/rtnl_handler_unittest.cc
+++ b/rtnl_handler_unittest.cc
@@ -112,7 +112,7 @@
0,
0,
kTestDeviceIndex,
- IPAddress::kAddressFamilyIPv4);
+ IPAddress::kFamilyIPv4);
message.SetAttribute(static_cast<uint16>(IFLA_IFNAME),
ByteString(kTestDeviceName, true));
ByteString b(message.Encode());
diff --git a/rtnl_message.cc b/rtnl_message.cc
index 711a53e..96e3764 100644
--- a/rtnl_message.cc
+++ b/rtnl_message.cc
@@ -30,7 +30,7 @@
mode_(kModeUnknown),
flags_(0),
interface_index_(0),
- family_(IPAddress::kAddressFamilyUnknown) {}
+ family_(IPAddress::kFamilyUnknown) {}
RTNLMessage::RTNLMessage(Type type,
Mode mode,
diff --git a/rtnl_message_unittest.cc b/rtnl_message_unittest.cc
index f74136a..1657bb1 100644
--- a/rtnl_message_unittest.cc
+++ b/rtnl_message_unittest.cc
@@ -256,6 +256,24 @@
0x00, 0x00, 0x00, 0x00,
};
+// Deleted 15: if15 inet6 fe80::6a7f:74ff:feba:efc7/64 scope link
+// valid_lft forever preferred_lft forever
+
+const int kDelAddrIPV6InterfaceIndex = 15;
+const char kDelAddrIPV6Address[] = "fe80::6a7f:74ff:feba:efc7";
+const int kDelAddrIPV6AddressPrefix = 64;
+const unsigned char kDelAddrIPV6Scope = RT_SCOPE_LINK;
+
+const unsigned char kDelAddrIPV6[] = {
+ 0x40, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x0a, 0x40, 0x80, 0xfd, 0x0f, 0x00, 0x00, 0x00,
+ 0x14, 0x00, 0x01, 0x00, 0xfe, 0x80, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x6a, 0x7f, 0x74, 0xff,
+ 0xfe, 0xba, 0xef, 0xc7, 0x14, 0x00, 0x06, 0x00,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xbf, 0xdb, 0x02, 0x00, 0xbf, 0xdb, 0x02, 0x00,
+};
// Deleted ff02::1:ffa0:688 via ff02::1:ffa0:688 dev if2 metric 0
@@ -390,11 +408,11 @@
RTNLMessage::AddressStatus status = msg.address_status();
EXPECT_EQ(scope, status.scope);
- EXPECT_TRUE(msg.HasAttribute(IFA_LOCAL));
- EXPECT_EQ(address.GetLength(), msg.GetAttribute(IFA_LOCAL).GetLength());
+ EXPECT_TRUE(msg.HasAttribute(IFA_ADDRESS));
+ EXPECT_EQ(address.GetLength(), msg.GetAttribute(IFA_ADDRESS).GetLength());
EXPECT_TRUE(
IPAddress(address.family(),
- msg.GetAttribute(IFA_LOCAL),
+ msg.GetAttribute(IFA_ADDRESS),
status.prefix_len).Equals(address));
}
@@ -490,7 +508,7 @@
}
TEST_F(RTNLMessageTest, NewAddrIPv4) {
- IPAddress addr(IPAddress::kAddressFamilyIPv4);
+ IPAddress addr(IPAddress::kFamilyIPv4);
EXPECT_TRUE(addr.SetAddressFromString(kNewAddrIPV4Address));
addr.set_prefix(kNewAddrIPV4AddressPrefix);
@@ -501,10 +519,22 @@
kNewAddrIPV4Scope);
}
+TEST_F(RTNLMessageTest, DelAddrIPv6) {
+ IPAddress addr(IPAddress::kFamilyIPv6);
+
+ EXPECT_TRUE(addr.SetAddressFromString(kDelAddrIPV6Address));
+ addr.set_prefix(kDelAddrIPV6AddressPrefix);
+ TestParseAddress(ByteString(kDelAddrIPV6, sizeof(kDelAddrIPV6)),
+ RTNLMessage::kModeDelete,
+ kDelAddrIPV6InterfaceIndex,
+ addr,
+ kDelAddrIPV6Scope);
+}
+
TEST_F(RTNLMessageTest, DelRouteIPv6) {
- IPAddress dst(IPAddress::kAddressFamilyIPv6);
- IPAddress src(IPAddress::kAddressFamilyIPv6);
- IPAddress gateway(IPAddress::kAddressFamilyIPv6);
+ IPAddress dst(IPAddress::kFamilyIPv6);
+ IPAddress src(IPAddress::kFamilyIPv6);
+ IPAddress gateway(IPAddress::kFamilyIPv6);
EXPECT_TRUE(dst.SetAddressFromString(kDelRouteIPV6Address));
dst.set_prefix(kDelRouteIPV6Prefix);
@@ -513,7 +543,7 @@
TestParseRoute(ByteString(kDelRouteIPV6, sizeof(kDelRouteIPV6)),
RTNLMessage::kModeDelete,
- IPAddress::kAddressFamilyIPv6,
+ IPAddress::kFamilyIPv6,
kDelRouteIPV6InterfaceIndex,
dst,
src,
@@ -526,9 +556,9 @@
}
TEST_F(RTNLMessageTest, AddRouteIPv4) {
- IPAddress dst(IPAddress::kAddressFamilyIPv4);
- IPAddress src(IPAddress::kAddressFamilyIPv4);
- IPAddress gateway(IPAddress::kAddressFamilyIPv4);
+ IPAddress dst(IPAddress::kFamilyIPv4);
+ IPAddress src(IPAddress::kFamilyIPv4);
+ IPAddress gateway(IPAddress::kFamilyIPv4);
dst.SetAddressToDefault();
src.SetAddressToDefault();
@@ -536,7 +566,7 @@
TestParseRoute(ByteString(kAddRouteIPV4, sizeof(kAddRouteIPV4)),
RTNLMessage::kModeAdd,
- IPAddress::kAddressFamilyIPv4,
+ IPAddress::kFamilyIPv4,
kAddRouteIPV4InterfaceIndex,
dst,
src,
@@ -566,10 +596,10 @@
RTNLMessage msg(RTNLMessage::kTypeRoute,
RTNLMessage::kModeAdd,
0, 1, 2, 0,
- IPAddress::kAddressFamilyIPv4);
- IPAddress dst(IPAddress::kAddressFamilyIPv4);
- IPAddress src(IPAddress::kAddressFamilyIPv4);
- IPAddress gateway(IPAddress::kAddressFamilyIPv4);
+ IPAddress::kFamilyIPv4);
+ IPAddress dst(IPAddress::kFamilyIPv4);
+ IPAddress src(IPAddress::kFamilyIPv4);
+ IPAddress gateway(IPAddress::kFamilyIPv4);
dst.SetAddressToDefault();
src.SetAddressToDefault();
@@ -586,7 +616,7 @@
TestParseRoute(msg.Encode(),
RTNLMessage::kModeAdd,
- IPAddress::kAddressFamilyIPv4,
+ IPAddress::kFamilyIPv4,
12,
dst,
src,
diff --git a/wifi_unittest.cc b/wifi_unittest.cc
index b3872b0..0d71cbb 100644
--- a/wifi_unittest.cc
+++ b/wifi_unittest.cc
@@ -119,7 +119,7 @@
protected:
class TestProxyFactory : public ProxyFactory {
public:
- TestProxyFactory(WiFiMainTest *test) : test_(test) {}
+ explicit TestProxyFactory(WiFiMainTest *test) : test_(test) {}
virtual SupplicantProcessProxyInterface *CreateSupplicantProcessProxy(
const char *dbus_path, const char *dbus_addr) {
@@ -188,7 +188,6 @@
private:
TestProxyFactory proxy_factory_;
-
};
const char WiFiMainTest::kDeviceName[] = "wlan0";