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

BpfCoordinator: refactor updateUpstreamNetworkState to get MTU

Browse Source 
This is a preparation for CLAT offload.

Move the getting the MTU into a function for refactoring
updateUpstreamNetworkState() which could be simpler.

Bug: 258637850
Test: atest BpfCoordinatorTest
Change-Id: I8f22b022d4d00597810b56ab6e3e55ed7ab9076d
This commit is contained in:
Hungming Chen
2023-02-18 21:06:04 +08:00
parent 2adba0f717
commit 85d98ea79f
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@ import static com.android.networkstack.tethering.util.TetheringUtils.getTetherin
import android.app.usage.NetworkStatsManager;
import android.net.INetd;
import android.net.LinkProperties;
import android.net.MacAddress;
import android.net.NetworkStats;
import android.net.NetworkStats.Entry;
@@ -878,6 +879,27 @@ public class BpfCoordinator {
return true;
}
private int getMtu(@NonNull final String ifaceName, @NonNull final LinkProperties lp) {
int mtu = INVALID_MTU;
if (ifaceName.equals(lp.getInterfaceName())) {
mtu = lp.getMtu();
}
// Get mtu via kernel if mtu is not found in LinkProperties.
if (mtu == INVALID_MTU) {
mtu = mDeps.getNetworkInterfaceMtu(ifaceName);
}
// Use default mtu if can't find any.
if (mtu == INVALID_MTU) mtu = NetworkStackConstants.ETHER_MTU;
// Clamp to minimum ipv4 mtu
if (mtu < IPV4_MIN_MTU) mtu = IPV4_MIN_MTU;
return mtu;
}
/**
* Call when UpstreamNetworkState may be changed.
* If upstream has ipv4 for tethering, update this new UpstreamNetworkState
@@ -900,16 +922,7 @@ public class BpfCoordinator {
final String ifaceName = ns.linkProperties.getInterfaceName();
final InterfaceParams params = mDeps.getInterfaceParams(ifaceName);
final boolean isVcn = isVcnInterface(ifaceName);
mtu = ns.linkProperties.getMtu();
if (mtu == INVALID_MTU) {
// Get mtu via kernel if mtu is not found in LinkProperties.
mtu = mDeps.getNetworkInterfaceMtu(ifaceName);
}
// Use default mtu if can't find any.
if (mtu == INVALID_MTU) mtu = NetworkStackConstants.ETHER_MTU;
// Clamp to minimum ipv4 mtu
if (mtu < IPV4_MIN_MTU) mtu = IPV4_MIN_MTU;
mtu = getMtu(ifaceName, ns.linkProperties);
if (!isVcn && params != null && !params.hasMacAddress /* raw ip upstream only */) {
upstreamIndex = params.index;