commit 7dffa6f704db0fffa194e3ce3d378b1f44240b5a
author Maciej Żenczykowski <maze@google.com> Mon Dec 16 11:20:44 2019 -0800
committer Maciej Żenczykowski <maze@google.com> Mon Dec 16 11:44:57 2019 -0800
tree a593199575eb96df978e19986f0ae3f7d86b2898
parent a06943ce9b88ea1d208b6f8d74aa5dd7b2f480c5

refactor: ClatdController::dump -> dump + dumpIngress()

Test: compiles, atest
Bug: 139396664
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic52058192584af5c530867039d4d7b9656235d0b

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 1f687bc..5a02700 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -569,25 +569,7 @@
     return 0;
 }
 
-void ClatdController::dump(DumpWriter& dw) {
-    std::lock_guard guard(mutex);
-
-    ScopedIndent clatdIndent(dw);
-    dw.println("ClatdController");
-
-    {
-        ScopedIndent trackerIndent(dw);
-        dw.println("Trackers: iif[iface] nat64Prefix v6Addr -> v4Addr v4iif[v4iface] [netId]");
-
-        ScopedIndent trackerDetailIndent(dw);
-        for (const auto& pair : mClatdTrackers) {
-            const ClatdTracker& tracker = pair.second;
-            dw.println("%u[%s] %s/96 %s -> %s %u[%s] [%u]", tracker.ifIndex, tracker.iface,
-                       tracker.pfx96String, tracker.v6Str, tracker.v4Str, tracker.v4ifIndex,
-                       tracker.v4iface, tracker.netId);
-        }
-    }
-
+void ClatdController::dumpIngress(DumpWriter& dw) {
     int mapFd = getClatIngressMapFd();
     if (mapFd < 0) return;  // if unsupported just don't dump anything
     BpfMap<ClatIngressKey, ClatIngressValue> configMap(mapFd);
@@ -620,6 +602,28 @@
     }
 }
 
+void ClatdController::dump(DumpWriter& dw) {
+    std::lock_guard guard(mutex);
+
+    ScopedIndent clatdIndent(dw);
+    dw.println("ClatdController");
+
+    {
+        ScopedIndent trackerIndent(dw);
+        dw.println("Trackers: iif[iface] nat64Prefix v6Addr -> v4Addr v4iif[v4iface] [netId]");
+
+        ScopedIndent trackerDetailIndent(dw);
+        for (const auto& pair : mClatdTrackers) {
+            const ClatdTracker& tracker = pair.second;
+            dw.println("%u[%s] %s/96 %s -> %s %u[%s] [%u]", tracker.ifIndex, tracker.iface,
+                       tracker.pfx96String, tracker.v6Str, tracker.v4Str, tracker.v4ifIndex,
+                       tracker.v4iface, tracker.netId);
+        }
+    }
+
+    dumpIngress(dw);
+}
+
 auto ClatdController::isIpv4AddressFreeFunc = isIpv4AddressFree;
 auto ClatdController::iptablesRestoreFunction = execIptablesRestore;
 

server/ClatdController.h

diff --git a/server/ClatdController.h b/server/ClatdController.h
index 8648f17..62899df 100644
--- a/server/ClatdController.h
+++ b/server/ClatdController.h
@@ -82,6 +82,8 @@
     std::map<std::string, ClatdTracker> mClatdTrackers GUARDED_BY(mutex);
     ClatdTracker* getClatdTracker(const std::string& interface) REQUIRES(mutex);
 
+    void dumpIngress(netdutils::DumpWriter& dw) REQUIRES(mutex);
+
     static in_addr_t selectIpv4Address(const in_addr ip, int16_t prefixlen);
     static int generateIpv6Address(const char* iface, const in_addr v4, const in6_addr& nat64Prefix,
                                    in6_addr* v6);