shill: Rename address -> mac_address
Rename the "address" field in DeviceInfo::Info to "mac_address",
since this struct will now also hold IP addresses.
BUG=chromium-os:19744
TEST=Rerun unit tests
Change-Id: I724e389c32ca6a730d476d825f916461161e1442
Reviewed-on: http://gerrit.chromium.org/gerrit/7179
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
diff --git a/device_info.cc b/device_info.cc
index 23777d4..638f88f 100644
--- a/device_info.cc
+++ b/device_info.cc
@@ -156,9 +156,9 @@
DeviceRefPtr device = GetDevice(dev_index);
if (!device.get()) {
if (msg.HasAttribute(IFLA_ADDRESS)) {
- infos_[dev_index].address = msg.GetAttribute(IFLA_ADDRESS);
+ infos_[dev_index].mac_address = msg.GetAttribute(IFLA_ADDRESS);
VLOG(2) << "link index " << dev_index << " address "
- << infos_[dev_index].address.HexEncode();
+ << infos_[dev_index].mac_address.HexEncode();
} else {
LOG(ERROR) << "Add Link message does not have IFLA_ADDRESS!";
return;
@@ -178,7 +178,7 @@
technology = GetDeviceTechnology(link_name);
}
}
- string address = infos_[dev_index].address.HexEncode();
+ string address = infos_[dev_index].mac_address.HexEncode();
switch (technology) {
case Device::kCellular:
// Cellular devices are managed by ModemInfo.
@@ -222,12 +222,12 @@
return info ? info->device : NULL;
}
-bool DeviceInfo::GetAddress(int interface_index, ByteString *address) const {
+bool DeviceInfo::GetMACAddress(int interface_index, ByteString *address) const {
const Info *info = GetInfo(interface_index);
if (!info) {
return false;
}
- *address = info->address;
+ *address = info->mac_address;
return true;
}