joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

use getIfName in more spots to improve logging

Browse source 
Also just use 'int' for ifindex.  The kernel allocates these in order,
if we ever exceed 2 billion, we'll have other problems to worry about.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I33eb46185fde90cd4d158bb74f8f9c17b41434fb
This commit is contained in:
Maciej Żenczykowski 2022-08-17 14:45:31 +00:00
commit 9ab28d0832
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
View file

@ -575,7 +575,7 @@ public class BpfCoordinator {
if (!mBpfCoordinatorShim.startUpstreamIpv6Forwarding(downstream, upstream, rule.srcMac,
NULL_MAC_ADDRESS, NULL_MAC_ADDRESS, NetworkStackConstants.ETHER_MTU)) {
mLog.e("Failed to enable upstream IPv6 forwarding from "
+ mInterfaceNames.get(downstream) + " to " + mInterfaceNames.get(upstream));
+ getIfName(downstream) + " to " + getIfName(upstream));
}
}
@ -616,7 +616,7 @@ public class BpfCoordinator {
if (!mBpfCoordinatorShim.stopUpstreamIpv6Forwarding(downstream, upstream,
rule.srcMac)) {
mLog.e("Failed to disable upstream IPv6 forwarding from "
+ mInterfaceNames.get(downstream) + " to " + mInterfaceNames.get(upstream));
+ getIfName(downstream) + " to " + getIfName(upstream));
}
}
@ -960,8 +960,12 @@ public class BpfCoordinator {
}
// TODO: make mInterfaceNames accessible to the shim and move this code to there.
private String getIfName(long ifindex) {
return mInterfaceNames.get((int) ifindex, Long.toString(ifindex));
// This function should only be used for logging/dump purposes.
private String getIfName(int ifindex) {
// TODO: return something more useful on lookup failure
// likely use the 'iface_index_name_map' bpf map and/or if_nametoindex
// perhaps should even check that all 3 match if available.
return mInterfaceNames.get(ifindex, Integer.toString(ifindex));
}
/**
@ -1038,8 +1042,8 @@ public class BpfCoordinator {
for (int i = 0; i < mStats.size(); i++) {
final int upstreamIfindex = mStats.keyAt(i);
final ForwardedStats stats = mStats.get(upstreamIfindex);
pw.println(String.format("%d(%s) - %s", upstreamIfindex, mInterfaceNames.get(
upstreamIfindex), stats.toString()));
pw.println(String.format("%d(%s) - %s", upstreamIfindex, getIfName(upstreamIfindex),
stats.toString()));
}
}
private void dumpBpfStats(@NonNull IndentingPrintWriter pw) {
@ -1082,8 +1086,9 @@ public class BpfCoordinator {
for (Ipv6ForwardingRule rule : rules.values()) {
final int upstreamIfindex = rule.upstreamIfindex;
pw.println(String.format("%d(%s) %d(%s) %s [%s] [%s]", upstreamIfindex,
mInterfaceNames.get(upstreamIfindex), rule.downstreamIfindex,
downstreamIface, rule.address.getHostAddress(), rule.srcMac, rule.dstMac));
getIfName(upstreamIfindex), rule.downstreamIfindex,
getIfName(rule.downstreamIfindex), rule.address.getHostAddress(),
rule.srcMac, rule.dstMac));
}
pw.decreaseIndent();
}
@ -1817,8 +1822,7 @@ public class BpfCoordinator {
// TODO: Perhaps stop the coordinator.
boolean success = updateDataLimit(upstreamIfindex);
if (!success) {
final String iface = mInterfaceNames.get(upstreamIfindex);
mLog.e("Setting data limit for " + iface + " failed.");
mLog.e("Setting data limit for " + getIfName(upstreamIfindex) + " failed.");
}
}