commit 7347bf2b466ae8058e47b29aaf0583390405d866
author Wade Guthrie <wdg@chromium.org> Tue Apr 30 11:21:51 2013 -0700
committer ChromeBot <chrome-bot@google.com> Wed Jun 12 10:18:15 2013 -0700
tree 840326c950d5f5f272d28ba5faefd3f6ea3332a8
parent 9da07771df3dbbc99ff99114c26317d01f29f7fc

shill: Adds message-type-specific netlink callbacks.

SendMessage calls are now Send*Message where '*' is the message type
(e.g., Nl80211, Control).  They now take 2 response handlers: 1) a
message-type-specific handler for the expected results and 2) an
auxilliary message handler for error messages and multi-part done
messages and the like.

BUG=chromium:236882
TEST=unittest

Change-Id: I418edf8b5edeca2608e5c9f0bf67fa2fa549d7ad
Reviewed-on: https://gerrit.chromium.org/gerrit/57653
Commit-Queue: Wade Guthrie <wdg@chromium.org>
Reviewed-by: Wade Guthrie <wdg@chromium.org>
Tested-by: Wade Guthrie <wdg@chromium.org>

scan_session_unittest.cc

diff --git a/scan_session_unittest.cc b/scan_session_unittest.cc
index b55cce2..62c209d 100644
--- a/scan_session_unittest.cc
+++ b/scan_session_unittest.cc
@@ -436,8 +436,8 @@
 TEST_F(ScanSessionTest, OnTriggerScanResponse) {
   Nl80211Message::SetMessageType(kNl80211FamilyId);
 
-  EXPECT_CALL(*netlink_manager(), SendMessage(
-      IsNl80211Command(kNl80211FamilyId, NL80211_CMD_TRIGGER_SCAN), _));
+  EXPECT_CALL(*netlink_manager(), SendNl80211Message(
+      IsNl80211Command(kNl80211FamilyId, NL80211_CMD_TRIGGER_SCAN), _, _));
   scan_session()->InitiateScan();
 
   EXPECT_CALL(*this, OnScanError());
@@ -453,14 +453,14 @@
   // Perform all the progressive scans until the frequencies are exhausted.
   for (size_t i = 0; i < GetScanFrequencyCount(); ++i) {
     EXPECT_TRUE(scan_session()->HasMoreFrequencies());
-    EXPECT_CALL(*netlink_manager(), SendMessage(
-        IsNl80211Command(kNl80211FamilyId, NL80211_CMD_TRIGGER_SCAN), _));
+    EXPECT_CALL(*netlink_manager(), SendNl80211Message(
+        IsNl80211Command(kNl80211FamilyId, NL80211_CMD_TRIGGER_SCAN), _, _));
     scan_session()->InitiateScan();
   }
 
   EXPECT_FALSE(scan_session()->HasMoreFrequencies());
-  EXPECT_CALL(*netlink_manager(), SendMessage(
-      IsNl80211Command(kNl80211FamilyId, NL80211_CMD_TRIGGER_SCAN), _))
+  EXPECT_CALL(*netlink_manager(), SendNl80211Message(
+      IsNl80211Command(kNl80211FamilyId, NL80211_CMD_TRIGGER_SCAN), _, _))
       .Times(0);
   scan_session()->InitiateScan();
 }
@@ -468,13 +468,13 @@
 TEST_F(ScanSessionTest, OnError) {
   Nl80211Message::SetMessageType(kNl80211FamilyId);
 
-  EXPECT_CALL(*netlink_manager(), SendMessage(
-      IsNl80211Command(kNl80211FamilyId, NL80211_CMD_TRIGGER_SCAN), _));
+  EXPECT_CALL(*netlink_manager(), SendNl80211Message(
+      IsNl80211Command(kNl80211FamilyId, NL80211_CMD_TRIGGER_SCAN), _, _));
   scan_session()->InitiateScan();
 
   EXPECT_CALL(*this, OnScanError());
   ErrorAckMessage error_message(-EINTR);
-  scan_session()->OnTriggerScanResponse(error_message);
+  scan_session()->OnTriggerScanErrorResponse(&error_message);
 }
 
 TEST_F(ScanSessionTest, EBusy) {
@@ -482,31 +482,31 @@
   Nl80211Message::SetMessageType(kNl80211FamilyId);
   scan_session()->scan_tries_left_ = kSmallRetryNumber;
 
-  EXPECT_CALL(*netlink_manager(), SendMessage(
-      IsNl80211Command(kNl80211FamilyId, NL80211_CMD_TRIGGER_SCAN), _));
+  EXPECT_CALL(*netlink_manager(), SendNl80211Message(
+      IsNl80211Command(kNl80211FamilyId, NL80211_CMD_TRIGGER_SCAN), _, _));
   scan_session()->InitiateScan();
 
   ErrorAckMessage error_message(-EBUSY);
   for (size_t i = 0; i < kSmallRetryNumber; ++i) {
     EXPECT_CALL(*this, OnScanError()).Times(0);
     EXPECT_CALL(*dispatcher(), PostDelayedTask(_, _));
-    scan_session()->OnTriggerScanResponse(error_message);
+    scan_session()->OnTriggerScanErrorResponse(&error_message);
   }
 
   EXPECT_CALL(*this, OnScanError());
-  scan_session()->OnTriggerScanResponse(error_message);
+  scan_session()->OnTriggerScanErrorResponse(&error_message);
 }
 
 TEST_F(ScanSessionTest, ScanHidden) {
   scan_session_->AddSsid(ByteString("a", 1));
   EXPECT_CALL(netlink_manager_,
-              SendMessage(HasHiddenSSID(kNl80211FamilyId), _));
+              SendNl80211Message(HasHiddenSSID(kNl80211FamilyId), _, _));
   scan_session()->InitiateScan();
 }
 
 TEST_F(ScanSessionTest, ScanNoHidden) {
   EXPECT_CALL(netlink_manager_,
-              SendMessage(HasNoHiddenSSID(kNl80211FamilyId), _));
+              SendNl80211Message(HasNoHiddenSSID(kNl80211FamilyId), _, _));
   scan_session()->InitiateScan();
 }