commit 4c262171df867ef2499d97dc44c83544854004bc
author Maciej Żenczykowski <maze@google.com> Mon Dec 16 11:31:24 2019 -0800
committer Maciej Żenczykowski <maze@google.com> Mon Dec 16 11:45:00 2019 -0800
tree 3679c6acf22876e2313bf476a98c041df55e13e0
parent 7dffa6f704db0fffa194e3ce3d378b1f44240b5a

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

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

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 5a02700..746948c 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -602,25 +602,26 @@
     }
 }
 
+void ClatdController::dumpTrackers(DumpWriter& dw) {
+    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::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);
-        }
-    }
-
+    dumpTrackers(dw);
     dumpIngress(dw);
 }