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

Merge "Revert "ClatCoordinator - use SingleWriterBpfMap"" into main

Browse source
This commit is contained in:
Yuyang Huang 2024-06-27 02:09:09 +00:00 • committed by Gerrit Code Review
commit 08af0d01e6
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
service/src/com/android/server/connectivity/ClatCoordinator.java
View file

@ -45,7 +45,6 @@ import com.android.net.module.util.BpfDump;
import com.android.net.module.util.BpfMap;
import com.android.net.module.util.IBpfMap;
import com.android.net.module.util.InterfaceParams;
import com.android.net.module.util.SingleWriterBpfMap;
import com.android.net.module.util.TcUtils;
import com.android.net.module.util.bpf.ClatEgress4Key;
import com.android.net.module.util.bpf.ClatEgress4Value;
@ -257,7 +256,7 @@ public class ClatCoordinator {
@Nullable
public IBpfMap<ClatIngress6Key, ClatIngress6Value> getBpfIngress6Map() {
try {
return SingleWriterBpfMap.getSingleton(CLAT_INGRESS6_MAP_PATH,
return new BpfMap<>(CLAT_INGRESS6_MAP_PATH,
ClatIngress6Key.class, ClatIngress6Value.class);
} catch (ErrnoException e) {
Log.e(TAG, "Cannot create ingress6 map: " + e);
@ -269,7 +268,7 @@ public class ClatCoordinator {
@Nullable
public IBpfMap<ClatEgress4Key, ClatEgress4Value> getBpfEgress4Map() {
try {
return SingleWriterBpfMap.getSingleton(CLAT_EGRESS4_MAP_PATH,
return new BpfMap<>(CLAT_EGRESS4_MAP_PATH,
ClatEgress4Key.class, ClatEgress4Value.class);
} catch (ErrnoException e) {
Log.e(TAG, "Cannot create egress4 map: " + e);
@ -281,7 +280,6 @@ public class ClatCoordinator {
@Nullable
public IBpfMap<CookieTagMapKey, CookieTagMapValue> getBpfCookieTagMap() {
try {
// also read and written from other locations
return new BpfMap<>(COOKIE_TAG_MAP_PATH,
CookieTagMapKey.class, CookieTagMapValue.class);
} catch (ErrnoException e) {