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

Merge "[CTT-1] Rename conntrack related function, variable and constant"

Browse Source
This commit is contained in:
Maciej Żenczykowski
2021-07-13 02:09:00 +00:00
committed by Gerrit Code Review
parent 23c627b090 378bdbc2ef
commit 2c2eccac73
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,9 +124,9 @@ public class BpfCoordinator {
} }
@VisibleForTesting @VisibleForTesting
static final int POLLING_CONNTRACK_TIMEOUT_MS = 60_000; static final int CONNTRACK_TIMEOUT_UPDATE_INTERVAL_MS = 60_000;
@VisibleForTesting @VisibleForTesting
static final int NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED = 432000; static final int NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED = 432_000;
@VisibleForTesting @VisibleForTesting
static final int NF_CONNTRACK_UDP_TIMEOUT_STREAM = 180; static final int NF_CONNTRACK_UDP_TIMEOUT_STREAM = 180;
@@ -249,10 +249,10 @@ public class BpfCoordinator {
maybeSchedulePollingStats(); maybeSchedulePollingStats();
}; };
// Runnable that used by scheduling next polling of conntrack timeout. // Runnable that used by scheduling next refreshing of conntrack timeout.
private final Runnable mScheduledPollingConntrackTimeout = () -> { private final Runnable mScheduledConntrackTimeoutUpdate = () -> {
maybeRefreshConntrackTimeout(); refreshAllConntrackTimeouts();
maybeSchedulePollingConntrackTimeout(); maybeScheduleConntrackTimeoutUpdate();
}; };
// TODO: add BpfMap<TetherDownstream64Key, TetherDownstream64Value> retrieving function. // TODO: add BpfMap<TetherDownstream64Key, TetherDownstream64Value> retrieving function.
@@ -434,7 +434,7 @@ public class BpfCoordinator {
mPollingStarted = true; mPollingStarted = true;
maybeSchedulePollingStats(); maybeSchedulePollingStats();
maybeSchedulePollingConntrackTimeout(); maybeScheduleConntrackTimeoutUpdate();
mLog.i("Polling started"); mLog.i("Polling started");
} }
@@ -451,8 +451,8 @@ public class BpfCoordinator {
if (!mPollingStarted) return; if (!mPollingStarted) return;
// Stop scheduled polling conntrack timeout. // Stop scheduled polling conntrack timeout.
if (mHandler.hasCallbacks(mScheduledPollingConntrackTimeout)) { if (mHandler.hasCallbacks(mScheduledConntrackTimeoutUpdate)) {
mHandler.removeCallbacks(mScheduledPollingConntrackTimeout); mHandler.removeCallbacks(mScheduledConntrackTimeoutUpdate);
} }
// Stop scheduled polling stats and poll the latest stats from BPF maps. // Stop scheduled polling stats and poll the latest stats from BPF maps.
if (mHandler.hasCallbacks(mScheduledPollingStats)) { if (mHandler.hasCallbacks(mScheduledPollingStats)) {
@@ -1896,14 +1896,14 @@ public class BpfCoordinator {
} }
} }
private void maybeRefreshConntrackTimeout() { private void refreshAllConntrackTimeouts() {
final long now = mDeps.elapsedRealtimeNanos(); final long now = mDeps.elapsedRealtimeNanos();
// Reverse the source and destination {address, port} from downstream value because // Reverse the source and destination {address, port} from downstream value because
// #updateConntrackTimeout refresh the timeout of netlink attribute CTA_TUPLE_ORIG // #updateConntrackTimeout refresh the timeout of netlink attribute CTA_TUPLE_ORIG
// which is opposite direction for downstream map value. // which is opposite direction for downstream map value.
mBpfCoordinatorShim.tetherOffloadRuleForEach(DOWNSTREAM, (k, v) -> { mBpfCoordinatorShim.tetherOffloadRuleForEach(DOWNSTREAM, (k, v) -> {
if ((now - v.lastUsed) / 1_000_000 < POLLING_CONNTRACK_TIMEOUT_MS) { if ((now - v.lastUsed) / 1_000_000 < CONNTRACK_TIMEOUT_UPDATE_INTERVAL_MS) {
updateConntrackTimeout((byte) k.l4proto, updateConntrackTimeout((byte) k.l4proto,
ipv4MappedAddressBytesToIpv4Address(v.dst46), (short) v.dstPort, ipv4MappedAddressBytesToIpv4Address(v.dst46), (short) v.dstPort,
ipv4MappedAddressBytesToIpv4Address(v.src46), (short) v.srcPort); ipv4MappedAddressBytesToIpv4Address(v.src46), (short) v.srcPort);
@@ -1914,7 +1914,7 @@ public class BpfCoordinator {
// because TCP is a bidirectional traffic. Probably don't need to extend timeout by // because TCP is a bidirectional traffic. Probably don't need to extend timeout by
// both directions for TCP. // both directions for TCP.
mBpfCoordinatorShim.tetherOffloadRuleForEach(UPSTREAM, (k, v) -> { mBpfCoordinatorShim.tetherOffloadRuleForEach(UPSTREAM, (k, v) -> {
if ((now - v.lastUsed) / 1_000_000 < POLLING_CONNTRACK_TIMEOUT_MS) { if ((now - v.lastUsed) / 1_000_000 < CONNTRACK_TIMEOUT_UPDATE_INTERVAL_MS) {
updateConntrackTimeout((byte) k.l4proto, parseIPv4Address(k.src4), updateConntrackTimeout((byte) k.l4proto, parseIPv4Address(k.src4),
(short) k.srcPort, parseIPv4Address(k.dst4), (short) k.dstPort); (short) k.srcPort, parseIPv4Address(k.dst4), (short) k.dstPort);
} }
@@ -1931,14 +1931,15 @@ public class BpfCoordinator {
mHandler.postDelayed(mScheduledPollingStats, getPollingInterval()); mHandler.postDelayed(mScheduledPollingStats, getPollingInterval());
} }
private void maybeSchedulePollingConntrackTimeout() { private void maybeScheduleConntrackTimeoutUpdate() {
if (!mPollingStarted) return; if (!mPollingStarted) return;
if (mHandler.hasCallbacks(mScheduledPollingConntrackTimeout)) { if (mHandler.hasCallbacks(mScheduledConntrackTimeoutUpdate)) {
mHandler.removeCallbacks(mScheduledPollingConntrackTimeout); mHandler.removeCallbacks(mScheduledConntrackTimeoutUpdate);
} }
mHandler.postDelayed(mScheduledPollingConntrackTimeout, POLLING_CONNTRACK_TIMEOUT_MS); mHandler.postDelayed(mScheduledConntrackTimeoutUpdate,
CONNTRACK_TIMEOUT_UPDATE_INTERVAL_MS);
} }
// Return forwarding rule map. This is used for testing only. // Return forwarding rule map. This is used for testing only.

14
Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java
View File

@@ -40,9 +40,9 @@ import static android.system.OsConstants.NETLINK_NETFILTER;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
import static com.android.dx.mockito.inline.extended.ExtendedMockito.staticMockMarker; import static com.android.dx.mockito.inline.extended.ExtendedMockito.staticMockMarker;
import static com.android.networkstack.tethering.BpfCoordinator.CONNTRACK_TIMEOUT_UPDATE_INTERVAL_MS;
import static com.android.networkstack.tethering.BpfCoordinator.NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED; import static com.android.networkstack.tethering.BpfCoordinator.NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED;
import static com.android.networkstack.tethering.BpfCoordinator.NF_CONNTRACK_UDP_TIMEOUT_STREAM; import static com.android.networkstack.tethering.BpfCoordinator.NF_CONNTRACK_UDP_TIMEOUT_STREAM;
import static com.android.networkstack.tethering.BpfCoordinator.POLLING_CONNTRACK_TIMEOUT_MS;
import static com.android.networkstack.tethering.BpfCoordinator.StatsType; import static com.android.networkstack.tethering.BpfCoordinator.StatsType;
import static com.android.networkstack.tethering.BpfCoordinator.StatsType.STATS_PER_IFACE; import static com.android.networkstack.tethering.BpfCoordinator.StatsType.STATS_PER_IFACE;
import static com.android.networkstack.tethering.BpfCoordinator.StatsType.STATS_PER_UID; import static com.android.networkstack.tethering.BpfCoordinator.StatsType.STATS_PER_UID;
@@ -1535,14 +1535,14 @@ public class BpfCoordinatorTest {
// Timeline: // Timeline:
// 0 60 (seconds) // 0 60 (seconds)
// +---+---+---+---+--...--+---+---+---+---+---+- .. // +---+---+---+---+--...--+---+---+---+---+---+- ..
// | POLLING_CONNTRACK_TIMEOUT_MS | // | CONNTRACK_TIMEOUT_UPDATE_INTERVAL_MS |
// +---+---+---+---+--...--+---+---+---+---+---+- .. // +---+---+---+---+--...--+---+---+---+---+---+- ..
// |<- valid diff ->| // |<- valid diff ->|
// |<- expired diff ->| // |<- expired diff ->|
// ^ ^ ^ // ^ ^ ^
// last used time elapsed time (valid) elapsed time (expired) // last used time elapsed time (valid) elapsed time (expired)
final long validTime = (POLLING_CONNTRACK_TIMEOUT_MS - 1) * 1_000_000L; final long validTime = (CONNTRACK_TIMEOUT_UPDATE_INTERVAL_MS - 1) * 1_000_000L;
final long expiredTime = (POLLING_CONNTRACK_TIMEOUT_MS + 1) * 1_000_000L; final long expiredTime = (CONNTRACK_TIMEOUT_UPDATE_INTERVAL_MS + 1) * 1_000_000L;
// Static mocking for NetlinkSocket. // Static mocking for NetlinkSocket.
MockitoSession mockSession = ExtendedMockito.mockitoSession() MockitoSession mockSession = ExtendedMockito.mockitoSession()
@@ -1556,14 +1556,14 @@ public class BpfCoordinatorTest {
// [1] Don't refresh contrack timeout. // [1] Don't refresh contrack timeout.
setElapsedRealtimeNanos(expiredTime); setElapsedRealtimeNanos(expiredTime);
mTestLooper.moveTimeForward(POLLING_CONNTRACK_TIMEOUT_MS); mTestLooper.moveTimeForward(CONNTRACK_TIMEOUT_UPDATE_INTERVAL_MS);
waitForIdle(); waitForIdle();
ExtendedMockito.verifyNoMoreInteractions(staticMockMarker(NetlinkSocket.class)); ExtendedMockito.verifyNoMoreInteractions(staticMockMarker(NetlinkSocket.class));
ExtendedMockito.clearInvocations(staticMockMarker(NetlinkSocket.class)); ExtendedMockito.clearInvocations(staticMockMarker(NetlinkSocket.class));
// [2] Refresh contrack timeout. // [2] Refresh contrack timeout.
setElapsedRealtimeNanos(validTime); setElapsedRealtimeNanos(validTime);
mTestLooper.moveTimeForward(POLLING_CONNTRACK_TIMEOUT_MS); mTestLooper.moveTimeForward(CONNTRACK_TIMEOUT_UPDATE_INTERVAL_MS);
waitForIdle(); waitForIdle();
final byte[] expectedNetlinkTcp = ConntrackMessage.newIPv4TimeoutUpdateRequest( final byte[] expectedNetlinkTcp = ConntrackMessage.newIPv4TimeoutUpdateRequest(
IPPROTO_TCP, PRIVATE_ADDR, (int) PRIVATE_PORT, REMOTE_ADDR, IPPROTO_TCP, PRIVATE_ADDR, (int) PRIVATE_PORT, REMOTE_ADDR,
@@ -1580,7 +1580,7 @@ public class BpfCoordinatorTest {
// [3] Don't refresh contrack timeout if polling stopped. // [3] Don't refresh contrack timeout if polling stopped.
coordinator.stopPolling(); coordinator.stopPolling();
mTestLooper.moveTimeForward(POLLING_CONNTRACK_TIMEOUT_MS); mTestLooper.moveTimeForward(CONNTRACK_TIMEOUT_UPDATE_INTERVAL_MS);
waitForIdle(); waitForIdle();
ExtendedMockito.verifyNoMoreInteractions(staticMockMarker(NetlinkSocket.class)); ExtendedMockito.verifyNoMoreInteractions(staticMockMarker(NetlinkSocket.class));
ExtendedMockito.clearInvocations(staticMockMarker(NetlinkSocket.class)); ExtendedMockito.clearInvocations(staticMockMarker(NetlinkSocket.class));