commit 372c9b45ee9ae027564d6279074c58b3f4c712b6
author Motomu Utsumi <motomuman@google.com> Fri Sep 02 19:02:56 2022 +0900
committer Motomu Utsumi <motomuman@google.com> Tue Oct 04 15:02:43 2022 +0900
tree 794ee04da39e4b04fe72d7154c902c8f11d2af04
parent c675d6fc01d417e9ca4321437f675a452681af4b

Move ownerMatch config dump to BpfNetMaps

Information in the dump does not change
....
current ownerMatch configuration: 516 DOZABLE_MATCH OEM_DENY_1_MATCH
....

Bug: 217624062
Test: dumpsys connectivity trafficcontroller, atest BpfNetMapsTest
Change-Id: I5f7b56e4ba03256414f49d0e82d65477fb97f05a

service/native/TrafficController.cpp

diff --git a/service/native/TrafficController.cpp b/service/native/TrafficController.cpp
index 912c048..245b9d8 100644
--- a/service/native/TrafficController.cpp
+++ b/service/native/TrafficController.cpp
@@ -667,16 +667,6 @@
     }
 
     dw.blankline();
-
-    uint32_t key = UID_RULES_CONFIGURATION_KEY;
-    auto configuration = mConfigurationMap.readValue(key);
-    if (configuration.ok()) {
-        dw.println("current ownerMatch configuration: %d%s", configuration.value(),
-                   uidMatchTypeToString(configuration.value()).c_str());
-    } else {
-        dw.println("mConfigurationMap read ownerMatch configure failed with error: %s",
-                   configuration.error().message().c_str());
-    }
 }
 
 }  // namespace net

service/native/TrafficControllerTest.cpp

diff --git a/service/native/TrafficControllerTest.cpp b/service/native/TrafficControllerTest.cpp
index 8f31452..2f5960f 100644
--- a/service/native/TrafficControllerTest.cpp
+++ b/service/native/TrafficControllerTest.cpp
@@ -806,8 +806,7 @@
 
     std::vector<std::string> expectedLines = {
         fmt::format("mCookieTagMap {}", kErrIterate),
-        fmt::format("mIfaceStatsMap {}", kErrIterate),
-        fmt::format("mConfigurationMap {}", kErrReadRulesConfig)};
+        fmt::format("mIfaceStatsMap {}", kErrIterate)};
     EXPECT_TRUE(expectDumpsysContains(expectedLines));
 }
 

service/src/com/android/server/BpfNetMaps.java

diff --git a/service/src/com/android/server/BpfNetMaps.java b/service/src/com/android/server/BpfNetMaps.java
index e53bce1..d560747 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -984,6 +984,15 @@
         return sj.toString();
     }
 
+    private void dumpOwnerMatchConfig(final IndentingPrintWriter pw) {
+        try {
+            final long match = sConfigurationMap.getValue(UID_RULES_CONFIGURATION_KEY).val;
+            pw.println("current ownerMatch configuration: " + match + " " + matchToString(match));
+        } catch (ErrnoException e) {
+            pw.println("Failed to read ownerMatch configuration: " + e);
+        }
+    }
+
     private void dumpCurrentStatsMapConfig(final IndentingPrintWriter pw) {
         try {
             final long config = sConfigurationMap.getValue(CURRENT_STATS_MAP_CONFIGURATION_KEY).val;
@@ -1014,6 +1023,7 @@
         mDeps.nativeDump(fd, verbose);
 
         if (verbose) {
+            dumpOwnerMatchConfig(pw);
             dumpCurrentStatsMapConfig(pw);
             pw.println();