commit 5d2dc6506326a74f9e55f7f327711aaa80f532cd
author Maciej Żenczykowski <maze@google.com> Tue Aug 16 14:27:07 2022 +0000
committer Nucca Chen <nuccachen@google.com> Wed Aug 17 05:08:40 2022 +0000
tree b7be797c9aacd1e40a8668ebd41d369f1b430da0
parent 6956ac5eb5adfd702c46887733c16894e6dce9c4

add header on ipv6 upstream bpf map dump

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7c95ff19fe665e9b502e439cb59498cac3622eab

Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java

diff --git a/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java b/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
index 7e0a589..32ad550 100644
--- a/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
+++ b/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
@@ -1092,6 +1092,9 @@
     }
 
     private void dumpIpv6UpstreamRules(IndentingPrintWriter pw) {
+        pw.println("IPv6 Upstream: iif(iface) inDstMac -> oif(iface) etherType outSrcMac outDstMac"
+                  );
+        pw.increaseIndent();
         try (BpfMap<TetherUpstream6Key, Tether6Value> map = mDeps.getBpfUpstream6Map()) {
             if (map == null) {
                 pw.println("No IPv6 upstream");
@@ -1104,6 +1107,8 @@
             map.forEach((k, v) -> pw.println(ipv6UpstreamRuletoString(k, v)));
         } catch (ErrnoException | IOException e) {
             pw.println("Error dumping IPv6 upstream map: " + e);
+        } finally {
+            pw.decreaseIndent();
         }
     }