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

Dump the unused IPv4 BPF rule age correctly am: e7dff2f955

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

Change-Id: I8370822cd5c96e28b51a54759bced40d556fde84
This commit is contained in:
Hungming Chen
2021-06-29 16:09:55 +00:00
committed by Automerger Merge Worker
parent af5ae307f2 e7dff2f955
commit e9deba21ad
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1069,11 +1069,12 @@ public class BpfCoordinator {
throw new AssertionError("IP address array not valid IPv4 address!");
}
final long ageMs = (now - value.lastUsed) / 1_000_000;
return String.format("[%s] %d(%s) %s:%d -> %d(%s) %s:%d -> %s:%d [%s] %dms",
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,
value.oif, getIfName(value.oif),
public4, publicPort, dst4, value.dstPort, value.ethDstMac, ageMs);
public4, publicPort, dst4, value.dstPort, value.ethDstMac, ageStr);
}
private void dumpIpv4ForwardingRuleMap(long now, boolean downstream,