From 916ba672b742b1d523054a9c78200008ef49fb62 Mon Sep 17 00:00:00 2001 From: Hungming Chen Date: Sat, 10 Jul 2021 19:10:09 +0800 Subject: [PATCH] [CTT-3] Add a string converter for TCP and UDP protocol number Bug: 190783768 Bug: 192804833 Test: atest TetheringCoverageTests Change-Id: I6a6452b65dd994fcf392e51917be52537a9d4cd9 --- .../networkstack/tethering/BpfCoordinator.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java b/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java index 8c15880b60..b16416996e 100644 --- a/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java +++ b/Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java @@ -1051,6 +1051,15 @@ public class BpfCoordinator { } } + private String l4protoToString(int proto) { + if (proto == OsConstants.IPPROTO_TCP) { + return "tcp"; + } else if (proto == OsConstants.IPPROTO_UDP) { + return "udp"; + } + return String.format("unknown(%d)", proto); + } + private String ipv4RuleToString(long now, boolean downstream, Tether4Key key, Tether4Value value) { final String src4, public4, dst4; @@ -1069,12 +1078,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 [%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), + l4protoToString(key.l4proto), key.dstMac, key.iif, getIfName(key.iif), + src4, key.srcPort, value.oif, getIfName(value.oif), public4, publicPort, dst4, value.dstPort, value.ethDstMac, ageStr); }