LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[CTT-3] Add a string converter for TCP and UDP protocol number" am: 7d3d4eaca7 am: 9fd842569e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1762187

Change-Id: I5e99d3070e5c2945fbef74ca49864e9a512910f0
This commit is contained in:
Maciej Żenczykowski
2021-07-13 02:45:02 +00:00
committed by Automerger Merge Worker
parent 303f4de48e 9fd842569e
commit c5a6e13cfb
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
View File

@@ -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, private String ipv4RuleToString(long now, boolean downstream,
Tether4Key key, Tether4Value value) { Tether4Key key, Tether4Value value) {
final String src4, public4, dst4; final String src4, public4, dst4;
@@ -1069,12 +1078,11 @@ public class BpfCoordinator {
throw new AssertionError("IP address array not valid IPv4 address!"); 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) ? "-" final String ageStr = (value.lastUsed == 0) ? "-"
: String.format("%dms", (now - value.lastUsed) / 1_000_000); : 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", 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, l4protoToString(key.l4proto), key.dstMac, key.iif, getIfName(key.iif),
value.oif, getIfName(value.oif), src4, key.srcPort, value.oif, getIfName(value.oif),
public4, publicPort, dst4, value.dstPort, value.ethDstMac, ageStr); public4, publicPort, dst4, value.dstPort, value.ethDstMac, ageStr);
} }