diff --git a/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java b/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java index 56dc69cda5..2c1fd29d33 100644 --- a/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java +++ b/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java @@ -1069,10 +1069,11 @@ public class BpfCoordinator { throw new AssertionError("IP address array not valid IPv4 address!"); } + final String protoStr = (key.l4proto == OsConstants.IPPROTO_TCP) ? "tcp" : "udp"; final String ageStr = (value.lastUsed == 0) ? "-" : String.format("%dms", (now - value.lastUsed) / 1_000_000); - return String.format("[%s] %d(%s) %s:%d -> %d(%s) %s:%d -> %s:%d [%s] %s", - key.dstMac, key.iif, getIfName(key.iif), src4, key.srcPort, + return String.format("%s [%s] %d(%s) %s:%d -> %d(%s) %s:%d -> %s:%d [%s] %s", + protoStr, key.dstMac, key.iif, getIfName(key.iif), src4, key.srcPort, value.oif, getIfName(value.oif), public4, publicPort, dst4, value.dstPort, value.ethDstMac, ageStr); } @@ -1095,12 +1096,14 @@ public class BpfCoordinator { try (BpfMap upstreamMap = mDeps.getBpfUpstream4Map(); BpfMap downstreamMap = mDeps.getBpfDownstream4Map()) { - pw.println("IPv4 Upstream: [inDstMac] iif(iface) src -> nat -> dst [outDstMac] age"); + pw.println("IPv4 Upstream: proto [inDstMac] iif(iface) src -> nat -> " + + "dst [outDstMac] age"); pw.increaseIndent(); dumpIpv4ForwardingRuleMap(now, UPSTREAM, upstreamMap, pw); pw.decreaseIndent(); - pw.println("IPv4 Downstream: [inDstMac] iif(iface) src -> nat -> dst [outDstMac] age"); + pw.println("IPv4 Downstream: proto [inDstMac] iif(iface) src -> nat -> " + + "dst [outDstMac] age"); pw.increaseIndent(); dumpIpv4ForwardingRuleMap(now, DOWNSTREAM, downstreamMap, pw); pw.decreaseIndent();