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

Revert "ClatCoordinator: replace BpfMap with IBpfMap" am: 9416307fa1

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

Change-Id: Ic3209c5995442ad1782df44ec30ece1d06218c37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hungming Chen
2022-05-12 14:07:25 +00:00
committed by Automerger Merge Worker
parent 4fb520fa44 9416307fa1
commit c88f684b8f
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
service/src/com/android/server/connectivity/ClatCoordinator.java
View File

@@ -39,7 +39,6 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter;
import com.android.modules.utils.build.SdkLevel;
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.TcUtils;
import com.android.net.module.util.bpf.ClatEgress4Key;
@@ -116,12 +115,12 @@ public class ClatCoordinator {
private final INetd mNetd;
@NonNull
private final Dependencies mDeps;
// IBpfMap objects {mIngressMap, mEgressMap} are initialized in #maybeStartBpf and closed in
// BpfMap objects {mIngressMap, mEgressMap} are initialized in #maybeStartBpf and closed in
// #maybeStopBpf.
@Nullable
private IBpfMap<ClatIngress6Key, ClatIngress6Value> mIngressMap = null;
private BpfMap<ClatIngress6Key, ClatIngress6Value> mIngressMap = null;
@Nullable
private IBpfMap<ClatEgress4Key, ClatEgress4Value> mEgressMap = null;
private BpfMap<ClatEgress4Key, ClatEgress4Value> mEgressMap = null;
@Nullable
private ClatdTracker mClatdTracker = null;
@@ -249,7 +248,7 @@ public class ClatCoordinator {
/** Get ingress6 BPF map. */
@Nullable
public IBpfMap<ClatIngress6Key, ClatIngress6Value> getBpfIngress6Map() {
public BpfMap<ClatIngress6Key, ClatIngress6Value> getBpfIngress6Map() {
// Pre-T devices don't use ClatCoordinator to access clat map. Since Nat464Xlat
// initializes a ClatCoordinator object to avoid redundant null pointer check
// while using, ignore the BPF map initialization on pre-T devices.
@@ -266,7 +265,7 @@ public class ClatCoordinator {
/** Get egress4 BPF map. */
@Nullable
public IBpfMap<ClatEgress4Key, ClatEgress4Value> getBpfEgress4Map() {
public BpfMap<ClatEgress4Key, ClatEgress4Value> getBpfEgress4Map() {
// Pre-T devices don't use ClatCoordinator to access clat map. Since Nat464Xlat
// initializes a ClatCoordinator object to avoid redundant null pointer check
// while using, ignore the BPF map initialization on pre-T devices.
@@ -380,7 +379,7 @@ public class ClatCoordinator {
private void closeEgressMap() {
try {
mEgressMap.close();
} catch (Exception e) {
} catch (ErrnoException e) {
Log.e(TAG, "Cannot close egress4 map: " + e);
}
mEgressMap = null;
@@ -389,7 +388,7 @@ public class ClatCoordinator {
private void closeIngressMap() {
try {
mIngressMap.close();
} catch (Exception e) {
} catch (ErrnoException e) {
Log.e(TAG, "Cannot close ingress6 map: " + e);
}
mIngressMap = null;

10
tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java
View File

@@ -46,7 +46,7 @@ import android.os.ParcelFileDescriptor;
import androidx.test.filters.SmallTest;
import com.android.net.module.util.IBpfMap;
import com.android.net.module.util.BpfMap;
import com.android.net.module.util.bpf.ClatEgress4Key;
import com.android.net.module.util.bpf.ClatEgress4Value;
import com.android.net.module.util.bpf.ClatIngress6Key;
@@ -123,8 +123,8 @@ public class ClatCoordinatorTest {
@Mock private INetd mNetd;
@Spy private TestDependencies mDeps = new TestDependencies();
@Mock private IBpfMap<ClatIngress6Key, ClatIngress6Value> mIngressMap;
@Mock private IBpfMap<ClatEgress4Key, ClatEgress4Value> mEgressMap;
@Mock private BpfMap<ClatIngress6Key, ClatIngress6Value> mIngressMap;
@Mock private BpfMap<ClatEgress4Key, ClatEgress4Value> mEgressMap;
/**
* The dependency injection class is used to mock the JNI functions and system functions
@@ -326,13 +326,13 @@ public class ClatCoordinatorTest {
/** Get ingress6 BPF map. */
@Override
public IBpfMap<ClatIngress6Key, ClatIngress6Value> getBpfIngress6Map() {
public BpfMap<ClatIngress6Key, ClatIngress6Value> getBpfIngress6Map() {
return mIngressMap;
}
/** Get egress4 BPF map. */
@Override
public IBpfMap<ClatEgress4Key, ClatEgress4Value> getBpfEgress4Map() {
public BpfMap<ClatEgress4Key, ClatEgress4Value> getBpfEgress4Map() {
return mEgressMap;
}