commit 528af60e4e013c43567d888951633730564991f1
author Luke Huang <huangluke@google.com> Wed Aug 29 19:06:05 2018 +0800
committer Luke Huang <huangluke@google.com> Wed Jan 23 16:25:08 2019 +0800
tree 13f961e52e61aee6db987f61b2f2782a281f59ba
parent ff591f95466e683fe519845a5c8711313d91470b

Netd unsolicited event porting

Use another buffer to log unsolicited event.

Test: built, flashed, booted
Test: 1. manual test datacall/wifi work
      2. manual test tethering work
      3. run cts StrictModeTest pass
      4. manual test data alert work
      5. manual idletimer work

Change-Id: I1e4ed360b0c9d60c14bc7f0ffdf578fc557d3643

tests/binder_test.cpp

diff --git a/tests/binder_test.cpp b/tests/binder_test.cpp
index d7c449e..5aafec8 100644
--- a/tests/binder_test.cpp
+++ b/tests/binder_test.cpp
@@ -17,10 +17,13 @@
  */
 
 #include <cerrno>
+#include <chrono>
 #include <cinttypes>
+#include <condition_variable>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
+#include <mutex>
 #include <set>
 #include <vector>
 
@@ -49,6 +52,7 @@
 #include "InterfaceController.h"
 #include "NetdConstants.h"
 #include "Stopwatch.h"
+#include "TestUnsolService.h"
 #include "XfrmController.h"
 #include "android/net/INetd.h"
 #include "binder/IServiceManager.h"
@@ -2801,3 +2805,38 @@
     updateAndCheckTcpBuffer(mNetd, testRmemValue, testWmemValue);
     updateAndCheckTcpBuffer(mNetd, rmemValue, wmemValue);
 }
+
+TEST_F(BinderTest, UnsolEvents) {
+    auto testUnsolService = android::net::TestUnsolService::start();
+    std::string oldTunName = sTun.name();
+    std::string newTunName = "unsolTest";
+    testUnsolService->tarVec.push_back(oldTunName);
+    testUnsolService->tarVec.push_back(newTunName);
+    auto& cv = testUnsolService->getCv();
+    auto& cvMutex = testUnsolService->getCvMutex();
+    binder::Status status = mNetd->registerUnsolicitedEventListener(
+            android::interface_cast<android::net::INetdUnsolicitedEventListener>(testUnsolService));
+    EXPECT_TRUE(status.isOk()) << status.exceptionMessage();
+
+    // TODO: Add test for below events
+    //       StrictCleartextDetected / InterfaceDnsServersAdded
+    //       InterfaceClassActivity / QuotaLimitReached / InterfaceAddressRemoved
+
+    {
+        std::unique_lock lock(cvMutex);
+
+        // Re-init test Tun, and we expect that we will get some unsol events.
+        // Use the test Tun device name to verify if we receive its unsol events.
+        sTun.destroy();
+        // Use predefined name
+        sTun.init(newTunName);
+
+        EXPECT_EQ(std::cv_status::no_timeout, cv.wait_for(lock, std::chrono::seconds(2)));
+    }
+
+    // bit mask 1101101000
+    // Test only covers below events currently
+    const uint32_t kExpectedEvents = InterfaceAddressUpdated | InterfaceAdded | InterfaceRemoved |
+                                     InterfaceLinkStatusChanged | RouteChanged;
+    EXPECT_EQ(kExpectedEvents, testUnsolService->getReceived());
+}
\ No newline at end of file