commit 4178023c4d627410777bdc259bfc7a31f2a4b8e9
author Gary Morain <gmorain@chromium.org> Tue Jul 31 15:08:31 2012 -0700
committer Gerrit <chrome-bot@google.com> Wed Aug 15 17:45:17 2012 -0700
tree 90a55e0cee937ae857e12ac90ac587029c189fee
parent ff96a841975e53376769e45cfa14dfadde91d34a

shill: Clean up of DeviceInfo::GetMACAddressFromKernel

- Simplified GetMACAddressFromKernel by removing unnecessary code.
- Use the Sockets class.
- Add unit tests for GetMACAddressFromKernel.
- Add comments and a unit test for a "gotcha" case in ByteString.
- Add HANDLE_EINTR to Sockets.

BUG=None
TEST=All unit tests pass.  Mobile, WiFi, and Ethernet work on alex.

Change-Id: I3f55daf916edb62332b4c6a2aee224d53eefd2df
Reviewed-on: https://gerrit.chromium.org/gerrit/28865
Commit-Ready: Gary Morain <gmorain@chromium.org>
Reviewed-by: Gary Morain <gmorain@chromium.org>
Tested-by: Gary Morain <gmorain@chromium.org>

byte_string.h

diff --git a/byte_string.h b/byte_string.h
index bd370e7..e66f6c7 100644
--- a/byte_string.h
+++ b/byte_string.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SHILL_BYTE_STRING_
-#define SHILL_BYTE_STRING_
+#ifndef SHILL_BYTE_STRING_H_
+#define SHILL_BYTE_STRING_H_
 
 #include <string>
 #include <vector>
@@ -18,8 +18,16 @@
   ByteString() {}
   ByteString(const ByteString &b) : data_(b.data_) {}
   explicit ByteString(size_t length) : data_(length) {}
+
   ByteString(const unsigned char *data, size_t length)
       : data_(data, data + length) {}
+
+  ByteString(const char *data, size_t length)
+      : data_(data, data + length) {}
+
+  ByteString(const signed char *data, size_t length)
+      : data_(data, data + length) {}
+
   ByteString(const std::string &data, bool copy_terminator)
     : data_(reinterpret_cast<const unsigned char *>(data.c_str()),
             reinterpret_cast<const unsigned char *>(data.c_str() +
@@ -91,4 +99,4 @@
 }  // namespace shill
 
 
-#endif  // SHILL_BYTE_STRING_
+#endif  // SHILL_BYTE_STRING_H_