commit 1619624cc1d5155dff13e42c769d1c7fa11f6909
author Wade Guthrie <wdg@chromium.org> Tue Nov 20 15:53:52 2012 -0800
committer Gerrit <chrome-bot@google.com> Wed Dec 05 18:04:03 2012 -0800
tree 4216843da8b8ab1262b6feccd09f895b8fa9240b
parent 328e19d119f3221e3c3706c7785853cc5e8339af

shill: Add Nl80211Attribute type.

This checkin is just a framework for the Nl80211Attribute type.
The Nl80211Attribute type encapsulates each attribute in an object.
This will enable the creation of an AttributeList type that can
encapsulate an arbitrary number of levels of nested attributes.

The next checkin includes all the types and all the attributes
necessary to use Nl80211Attribute.  It also passes unittests.

BUG=chromium-os:36637
TEST=unittests.

Change-Id: Ide967812e5286526d37f3ac5d478ab5a4c358bd6
Reviewed-on: https://gerrit.chromium.org/gerrit/38973
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Ready: Wade Guthrie <wdg@chromium.org>
Tested-by: Wade Guthrie <wdg@chromium.org>

user_bound_nlmessage.cc

diff --git a/user_bound_nlmessage.cc b/user_bound_nlmessage.cc
index a698cd5..9fce829 100644
--- a/user_bound_nlmessage.cc
+++ b/user_bound_nlmessage.cc
@@ -343,42 +343,40 @@
   return message_->nlmsg_seq;
 }
 
-enum UserBoundNlMessage::Type
+enum Nl80211Attribute::Type
     UserBoundNlMessage::GetAttributeType(enum nl80211_attrs name) const {
   const nlattr *attr = GetAttribute(name);
   if (!attr) {
-    return kTypeError;
+    return Nl80211Attribute::kTypeError;
   }
 
   switch (nla_type(attr)) {
-    case NLA_UNSPEC: return kTypeUnspecified;
-    case NLA_U8: return kTypeU8;
-    case NLA_U16: return kTypeU16;
-    case NLA_U32: return kTypeU32;
-    case NLA_U64: return kTypeU64;
-    case NLA_STRING: return kTypeString;
-    case NLA_FLAG: return kTypeFlag;
-    case NLA_MSECS: return kTypeMsecs;
-    case NLA_NESTED: return kTypeNested;
-    default: return kTypeError;
+    case NLA_U8: return Nl80211Attribute::kTypeU8;
+    case NLA_U16: return Nl80211Attribute::kTypeU16;
+    case NLA_U32: return Nl80211Attribute::kTypeU32;
+    case NLA_U64: return Nl80211Attribute::kTypeU64;
+    case NLA_STRING: return Nl80211Attribute::kTypeString;
+    case NLA_FLAG: return Nl80211Attribute::kTypeFlag;
+    case NLA_MSECS: return Nl80211Attribute::kTypeMsecs;
+    case NLA_NESTED: return Nl80211Attribute::kTypeNested;
+    default: return Nl80211Attribute::kTypeError;
   }
 
-  return kTypeError;
+  return Nl80211Attribute::kTypeError;
 }
 
 string UserBoundNlMessage::GetAttributeTypeString(enum nl80211_attrs name)
     const {
   switch (GetAttributeType(name)) {
-    case kTypeUnspecified: return "Unspecified Type"; break;
-    case kTypeU8: return "uint8_t"; break;
-    case kTypeU16: return "uint16_t"; break;
-    case kTypeU32: return "uint32_t"; break;
-    case kTypeU64: return "uint64_t"; break;
-    case kTypeString: return "String"; break;
-    case kTypeFlag: return "Flag"; break;
-    case kTypeMsecs: return "MSec Type"; break;
-    case kTypeNested: return "Nested Type"; break;
-    case kTypeError: return "ERROR TYPE"; break;
+    case Nl80211Attribute::kTypeU8: return "uint8_t"; break;
+    case Nl80211Attribute::kTypeU16: return "uint16_t"; break;
+    case Nl80211Attribute::kTypeU32: return "uint32_t"; break;
+    case Nl80211Attribute::kTypeU64: return "uint64_t"; break;
+    case Nl80211Attribute::kTypeString: return "String"; break;
+    case Nl80211Attribute::kTypeFlag: return "Flag"; break;
+    case Nl80211Attribute::kTypeMsecs: return "MSec Type"; break;
+    case Nl80211Attribute::kTypeNested: return "Nested Type"; break;
+    case Nl80211Attribute::kTypeError: return "ERROR TYPE"; break;
     default: return "Funky Type"; break;
   }
 }
@@ -567,35 +565,35 @@
   }
 
   switch (GetAttributeType(name)) {
-    case kTypeU8: {
+    case Nl80211Attribute::kTypeU8: {
       uint8_t value;
       if (!GetU8Attribute(name, &value))
         return false;
       *param = StringPrintf("%u", value);
       break;
     }
-    case kTypeU16: {
+    case Nl80211Attribute::kTypeU16: {
       uint16_t value;
       if (!GetU16Attribute(name, &value))
         return false;
       *param = StringPrintf("%u", value);
       break;
     }
-    case kTypeU32: {
+    case Nl80211Attribute::kTypeU32: {
       uint32_t value;
       if (!GetU32Attribute(name, &value))
         return false;
       *param = StringPrintf("%" PRIu32, value);
       break;
     }
-    case kTypeU64: {
+    case Nl80211Attribute::kTypeU64: {
       uint64_t value;
       if (!GetU64Attribute(name, &value))
         return false;
       *param = StringPrintf("%" PRIu64, value);
       break;
     }
-    case kTypeString:
+    case Nl80211Attribute::kTypeString:
       if (!GetStringAttribute(name, param))
         return false;
       break;