commit 764538d1bcb07883dab5355ff556f6f87b985ba2
author Christopher Wiley <wiley@chromium.org> Fri Nov 09 10:58:23 2012 -0800
committer Gerrit <chrome-bot@google.com> Mon Nov 12 10:08:44 2012 -0800
tree 894bee1b43ebc50b89df4e8b71360a788070163a
parent 393b93f3a7684828f32a481b34cc2e94c6825f50

shill: Refactor message types into UserBoundNlMessage

Since all UserBoundNlMessage subclasses have a particular message type
and type string, pull that functionality into the abstract super class.

BUG=None
TEST=Unit tests

Change-Id: Ib44db2acabab33c48de2ef1143de6be3e1df0acf
Reviewed-on: https://gerrit.chromium.org/gerrit/37731
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Wade Guthrie <wdg@chromium.org>
Commit-Ready: Christopher Wiley <wiley@chromium.org>

user_bound_nlmessage.cc

diff --git a/user_bound_nlmessage.cc b/user_bound_nlmessage.cc
index 62eb59c..a698cd5 100644
--- a/user_bound_nlmessage.cc
+++ b/user_bound_nlmessage.cc
@@ -63,8 +63,6 @@
     LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
-const uint8_t UserBoundNlMessage::kCommand = 0xff;
-const char UserBoundNlMessage::kCommandString[] = "<Unknown Message>";
 const char UserBoundNlMessage::kBogusMacAddress[]="XX:XX:XX:XX:XX:XX";
 
 const uint8_t Nl80211Frame::kMinimumFrameByteCount = 26;
@@ -1968,13 +1966,13 @@
   bool doit = false;
 
   map<uint8_t, bool>::const_iterator node;
-  node = need_to_print.find(message.GetMessageType());
+  node = need_to_print.find(message.message_type());
   if (node != need_to_print.end())
     doit = node->second;
 
   if (doit) {
     LOG(INFO) << "@@const unsigned char "
-               << "k" << message.GetMessageTypeString()
+               << "k" << message.message_type_string()
                << "[] = {";
 
     int payload_bytes = nlmsg_datalen(msg);
@@ -1987,7 +1985,7 @@
                  << + rawdata[i] << ",";
     }
     LOG(INFO) << "};";
-    need_to_print[message.GetMessageType()] = false;
+    need_to_print[message.message_type()] = false;
   }
 }