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

Merge "Use U32 from shared library" am: 98502b78bc

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

Change-Id: I7528dae94801d7cddee03595d2b76904fa8afed3
This commit is contained in:
Mark Chien
2022-03-10 16:49:14 +00:00
committed by Automerger Merge Worker
parent 8751ae97b6 98502b78bc
commit c70b60c35e
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,7 @@ import com.android.net.module.util.BpfMap;
import com.android.net.module.util.CollectionUtils; import com.android.net.module.util.CollectionUtils;
import com.android.net.module.util.InterfaceParams; import com.android.net.module.util.InterfaceParams;
import com.android.net.module.util.NetworkStackConstants; import com.android.net.module.util.NetworkStackConstants;
import com.android.net.module.util.Struct; import com.android.net.module.util.Struct.U32;
import com.android.net.module.util.bpf.Tether4Key; import com.android.net.module.util.bpf.Tether4Key;
import com.android.net.module.util.bpf.Tether4Value; import com.android.net.module.util.bpf.Tether4Value;
import com.android.net.module.util.netlink.ConntrackMessage; import com.android.net.module.util.netlink.ConntrackMessage;
@@ -1177,22 +1177,13 @@ public class BpfCoordinator {
} }
} }
/**
* Simple struct that only contains a u32. Must be public because Struct needs access to it.
* TODO: make this a public inner class of Struct so anyone can use it as, e.g., Struct.U32?
*/
public static class U32Struct extends Struct {
@Struct.Field(order = 0, type = Struct.Type.U32)
public long val;
}
private void dumpCounters(@NonNull IndentingPrintWriter pw) { private void dumpCounters(@NonNull IndentingPrintWriter pw) {
if (!mDeps.isAtLeastS()) { if (!mDeps.isAtLeastS()) {
pw.println("No counter support"); pw.println("No counter support");
return; return;
} }
try (BpfMap<U32Struct, U32Struct> map = new BpfMap<>(TETHER_ERROR_MAP_PATH, try (BpfMap<U32, U32> map = new BpfMap<>(TETHER_ERROR_MAP_PATH, BpfMap.BPF_F_RDONLY,
BpfMap.BPF_F_RDONLY, U32Struct.class, U32Struct.class)) { U32.class, U32.class)) {
map.forEach((k, v) -> { map.forEach((k, v) -> {
String counterName; String counterName;