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

Revert "ClatCoordinator: replace BpfMap with IBpfMap"

Browse Source 
Test: build
This reverts commit 12c625bbf8.

Change-Id: I100dc77a8e29ac21ca649d6487563021e8cf0f80
This commit is contained in:
Hungming Chen
2022-05-09 15:45:31 +08:00
parent 42791188b2
commit 9416307fa1
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.internal.util.IndentingPrintWriter;
import com.android.modules.utils.build.SdkLevel; import com.android.modules.utils.build.SdkLevel;
import com.android.net.module.util.BpfMap; 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.InterfaceParams;
import com.android.net.module.util.TcUtils; import com.android.net.module.util.TcUtils;
import com.android.net.module.util.bpf.ClatEgress4Key; import com.android.net.module.util.bpf.ClatEgress4Key;
@@ -116,12 +115,12 @@ public class ClatCoordinator {
private final INetd mNetd; private final INetd mNetd;
@NonNull @NonNull
private final Dependencies mDeps; 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. // #maybeStopBpf.
@Nullable @Nullable
private IBpfMap<ClatIngress6Key, ClatIngress6Value> mIngressMap = null; private BpfMap<ClatIngress6Key, ClatIngress6Value> mIngressMap = null;
@Nullable @Nullable
private IBpfMap<ClatEgress4Key, ClatEgress4Value> mEgressMap = null; private BpfMap<ClatEgress4Key, ClatEgress4Value> mEgressMap = null;
@Nullable @Nullable
private ClatdTracker mClatdTracker = null; private ClatdTracker mClatdTracker = null;
@@ -249,7 +248,7 @@ public class ClatCoordinator {
/** Get ingress6 BPF map. */ /** Get ingress6 BPF map. */
@Nullable @Nullable
public IBpfMap<ClatIngress6Key, ClatIngress6Value> getBpfIngress6Map() { public BpfMap<ClatIngress6Key, ClatIngress6Value> getBpfIngress6Map() {
// Pre-T devices don't use ClatCoordinator to access clat map. Since Nat464Xlat // Pre-T devices don't use ClatCoordinator to access clat map. Since Nat464Xlat
// initializes a ClatCoordinator object to avoid redundant null pointer check // initializes a ClatCoordinator object to avoid redundant null pointer check
// while using, ignore the BPF map initialization on pre-T devices. // while using, ignore the BPF map initialization on pre-T devices.
@@ -266,7 +265,7 @@ public class ClatCoordinator {
/** Get egress4 BPF map. */ /** Get egress4 BPF map. */
@Nullable @Nullable
public IBpfMap<ClatEgress4Key, ClatEgress4Value> getBpfEgress4Map() { public BpfMap<ClatEgress4Key, ClatEgress4Value> getBpfEgress4Map() {
// Pre-T devices don't use ClatCoordinator to access clat map. Since Nat464Xlat // Pre-T devices don't use ClatCoordinator to access clat map. Since Nat464Xlat
// initializes a ClatCoordinator object to avoid redundant null pointer check // initializes a ClatCoordinator object to avoid redundant null pointer check
// while using, ignore the BPF map initialization on pre-T devices. // while using, ignore the BPF map initialization on pre-T devices.
@@ -380,7 +379,7 @@ public class ClatCoordinator {
private void closeEgressMap() { private void closeEgressMap() {
try { try {
mEgressMap.close(); mEgressMap.close();
} catch (Exception e) { } catch (ErrnoException e) {
Log.e(TAG, "Cannot close egress4 map: " + e); Log.e(TAG, "Cannot close egress4 map: " + e);
} }
mEgressMap = null; mEgressMap = null;
@@ -389,7 +388,7 @@ public class ClatCoordinator {
private void closeIngressMap() { private void closeIngressMap() {
try { try {
mIngressMap.close(); mIngressMap.close();
} catch (Exception e) { } catch (ErrnoException e) {
Log.e(TAG, "Cannot close ingress6 map: " + e); Log.e(TAG, "Cannot close ingress6 map: " + e);
} }
mIngressMap = null; 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 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.ClatEgress4Key;
import com.android.net.module.util.bpf.ClatEgress4Value; import com.android.net.module.util.bpf.ClatEgress4Value;
import com.android.net.module.util.bpf.ClatIngress6Key; import com.android.net.module.util.bpf.ClatIngress6Key;
@@ -123,8 +123,8 @@ public class ClatCoordinatorTest {
@Mock private INetd mNetd; @Mock private INetd mNetd;
@Spy private TestDependencies mDeps = new TestDependencies(); @Spy private TestDependencies mDeps = new TestDependencies();
@Mock private IBpfMap<ClatIngress6Key, ClatIngress6Value> mIngressMap; @Mock private BpfMap<ClatIngress6Key, ClatIngress6Value> mIngressMap;
@Mock private IBpfMap<ClatEgress4Key, ClatEgress4Value> mEgressMap; @Mock private BpfMap<ClatEgress4Key, ClatEgress4Value> mEgressMap;
/** /**
* The dependency injection class is used to mock the JNI functions and system functions * 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. */ /** Get ingress6 BPF map. */
@Override @Override
public IBpfMap<ClatIngress6Key, ClatIngress6Value> getBpfIngress6Map() { public BpfMap<ClatIngress6Key, ClatIngress6Value> getBpfIngress6Map() {
return mIngressMap; return mIngressMap;
} }
/** Get egress4 BPF map. */ /** Get egress4 BPF map. */
@Override @Override
public IBpfMap<ClatEgress4Key, ClatEgress4Value> getBpfEgress4Map() { public BpfMap<ClatEgress4Key, ClatEgress4Value> getBpfEgress4Map() {
return mEgressMap; return mEgressMap;
} }