refactor: ClatdController::dump -> dump + dumpIngress()
Test: compiles, atest
Bug: 139396664
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic52058192584af5c530867039d4d7b9656235d0b
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;