commit e3e1cfaadc69ea67db55f11e55f404b11a70e354
author Darin Petkov <petkov@chromium.org> Thu Aug 11 13:41:17 2011 -0700
committer Darin Petkov <petkov@chromium.org> Thu Aug 11 14:51:20 2011 -0700
tree 5d8fac48b1557f037c95919a876c615eefa28e20
parent e6193c042652831cac90c3bbf2233877754b1eef

shill: DeviceInfo::GetAddress can be used now to lookup the device MAC address.

Also enhance ByteString with a HexEncode method used for logging.

BUG=chromium-os:19028
TEST=unit tests, tested on device

Change-Id: Ie64ebb0d009ce7fb3ed16948a7789ef721b56039
Reviewed-on: http://gerrit.chromium.org/gerrit/5766
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

device_info.cc

diff --git a/device_info.cc b/device_info.cc
index d6a680b..c6ba786 100644
--- a/device_info.cc
+++ b/device_info.cc
@@ -149,6 +149,11 @@
 
   DeviceRefPtr device = GetDevice(dev_index);
   if (!device.get()) {
+    if (msg.HasAttribute(IFLA_ADDRESS)) {
+      infos_[dev_index].address = msg.GetAttribute(IFLA_ADDRESS);
+      VLOG(2) << "link index " << dev_index << " address "
+              << infos_[dev_index].address.HexEncode();
+    }
     if (!msg.HasAttribute(IFLA_IFNAME)) {
       LOG(ERROR) << "Add Link message does not have IFLA_IFNAME!";
       return;
@@ -195,13 +200,22 @@
   RemoveInfo(msg.interface_index());
 }
 
-DeviceRefPtr DeviceInfo::GetDevice(int interface_index) {
-  Info *info = GetInfo(interface_index);
+DeviceRefPtr DeviceInfo::GetDevice(int interface_index) const {
+  const Info *info = GetInfo(interface_index);
   return info ? info->device : NULL;
 }
 
-bool DeviceInfo::GetFlags(int interface_index, unsigned int *flags) {
-  Info *info = GetInfo(interface_index);
+bool DeviceInfo::GetAddress(int interface_index, ByteString *address) const {
+  const Info *info = GetInfo(interface_index);
+  if (!info) {
+    return false;
+  }
+  *address = info->address;
+  return true;
+}
+
+bool DeviceInfo::GetFlags(int interface_index, unsigned int *flags) const {
+  const Info *info = GetInfo(interface_index);
   if (!info) {
     return false;
   }
@@ -209,8 +223,8 @@
   return true;
 }
 
-DeviceInfo::Info *DeviceInfo::GetInfo(int interface_index) {
-  map<int, Info>::iterator iter = infos_.find(interface_index);
+const DeviceInfo::Info *DeviceInfo::GetInfo(int interface_index) const {
+  map<int, Info>::const_iterator iter = infos_.find(interface_index);
   if (iter == infos_.end()) {
     return NULL;
   }