commit 2aa9707f114ab8166f45df5726bf05278df2aef6
author Chris Masone <cmasone@chromium.org> Tue Aug 09 17:35:08 2011 -0700
committer Chris Masone <cmasone@chromium.org> Wed Aug 10 15:01:03 2011 -0700
tree 4319e8717d1ca9b62f389b17b9cd50846e15f44b
parent bac96001dc1d697a6ebac3dff7c707de45444351

[shill] Migrate to RTNLMessage instead of nlmsghdr

Now, RTNLHandler deals with nlmsghdrs internally, and passes parsed RTNLMessage
objects to everyone else.

Also, move some code out of device_info_unittest.cc that was testing
RTNLHandler::ParseRTNL

BUG=chromium-os:18908
TEST=unit
STATUS=Verified

Change-Id: I8e1546ea8e996a0e2302fe5e5937b03c13cb1a61
Reviewed-on: http://gerrit.chromium.org/gerrit/5612
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>

rtnl_handler.cc

diff --git a/rtnl_handler.cc b/rtnl_handler.cc
index 8fd4167..185275f 100644
--- a/rtnl_handler.cc
+++ b/rtnl_handler.cc
@@ -150,10 +150,10 @@
     NextRequest(request_sequence_);
 }
 
-void RTNLHandler::DispatchEvent(int type, struct nlmsghdr *hdr) {
+void RTNLHandler::DispatchEvent(int type, const RTNLMessage &msg) {
   std::vector<RTNLListener *>::iterator it;
   for (it = listeners_.begin(); it != listeners_.end(); ++it) {
-    (*it)->NotifyEvent(type, hdr);
+    (*it)->NotifyEvent(type, msg);
   }
 }
 
@@ -226,37 +226,46 @@
 
   while (buf < end) {
     struct nlmsghdr *hdr = reinterpret_cast<struct nlmsghdr *>(buf);
-    struct nlmsgerr *err;
-
     if (!NLMSG_OK(hdr, static_cast<unsigned int>(end - buf)))
       break;
 
-    switch (hdr->nlmsg_type) {
-    case NLMSG_NOOP:
-    case NLMSG_OVERRUN:
-      return;
-    case NLMSG_DONE:
-      NextRequest(hdr->nlmsg_seq);
-      return;
-    case NLMSG_ERROR:
-      err = reinterpret_cast<nlmsgerr *>(NLMSG_DATA(hdr));
-      LOG(ERROR) << "error " << -err->error << " (" << strerror(-err->error) <<
-                 ")";
-      return;
-    case RTM_NEWLINK:
-    case RTM_DELLINK:
-      DispatchEvent(kRequestLink, hdr);
-      break;
-    case RTM_NEWADDR:
-    case RTM_DELADDR:
-      DispatchEvent(kRequestAddr, hdr);
-      break;
-    case RTM_NEWROUTE:
-    case RTM_DELROUTE:
-      DispatchEvent(kRequestRoute, hdr);
-      break;
-    }
+    RTNLMessage msg;
+    if (!msg.Decode(ByteString(reinterpret_cast<unsigned char *>(hdr),
+                               hdr->nlmsg_len))) {
 
+      switch (hdr->nlmsg_type) {
+        case NLMSG_NOOP:
+        case NLMSG_OVERRUN:
+          break;
+        case NLMSG_DONE:
+          NextRequest(hdr->nlmsg_seq);
+          break;
+        case NLMSG_ERROR:
+          {
+            struct nlmsgerr *err =
+                reinterpret_cast<nlmsgerr *>(NLMSG_DATA(hdr));
+            LOG(ERROR) << "error " << -err->error << " ("
+                       << strerror(-err->error) << ")";
+            break;
+          }
+        default:
+          NOTIMPLEMENTED() << "Unknown NL message type.";
+      }
+    } else {
+      switch (msg.type()) {
+        case RTNLMessage::kMessageTypeLink:
+          DispatchEvent(kRequestLink, msg);
+          break;
+        case RTNLMessage::kMessageTypeAddress:
+          DispatchEvent(kRequestAddr, msg);
+          break;
+        case RTNLMessage::kMessageTypeRoute:
+          DispatchEvent(kRequestRoute, msg);
+          break;
+        default:
+          NOTIMPLEMENTED() << "Unknown RTNL message type.";
+      }
+    }
     buf += hdr->nlmsg_len;
   }
 }