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 "Lower tethering IPv6 MTU to 1400 (to match newly clamped RA)" into main

Browse source
This commit is contained in:
Maciej Żenczykowski 2025-08-01 18:10:56 -07:00 • committed by Android (Google) Code Review
commit 65f78293ed
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Tethering/src/com/android/networkstack/tethering/BpfCoordinator.java
View file

@ -1732,8 +1732,7 @@ public class BpfCoordinator {
*/
@NonNull
public Tether6Value makeTether6Value() {
return new Tether6Value(upstreamIfindex, outDstMac, outSrcMac, ETH_P_IPV6,
NetworkStackConstants.ETHER_MTU);
return new Tether6Value(upstreamIfindex, outDstMac, outSrcMac, ETH_P_IPV6, 1400);
}
@Override

5
Tethering/tests/unit/src/com/android/networkstack/tethering/BpfCoordinatorTest.java
View file

@ -769,8 +769,7 @@ public class BpfCoordinatorTest {
final TetherUpstream6Key key = new TetherUpstream6Key(DOWNSTREAM_IFACE_PARAMS.index,
DOWNSTREAM_IFACE_PARAMS.macAddr, prefix64);
final Tether6Value value = new Tether6Value(upstreamIfindex,
MacAddress.ALL_ZEROS_ADDRESS, MacAddress.ALL_ZEROS_ADDRESS, ETH_P_IPV6,
NetworkStackConstants.ETHER_MTU);
MacAddress.ALL_ZEROS_ADDRESS, MacAddress.ALL_ZEROS_ADDRESS, ETH_P_IPV6, 1400);
expected.put(key, value);
}
ArgumentCaptor<TetherUpstream6Key> keyCaptor =
@ -1295,7 +1294,7 @@ public class BpfCoordinatorTest {
assertEquals(MAC_NULL, value.ethDstMac);
assertEquals(MAC_NULL, value.ethSrcMac);
assertEquals(ETH_P_IPV6, value.ethProto);
assertEquals(NetworkStackConstants.ETHER_MTU, value.pmtu);
assertEquals(1400, value.pmtu);
// oif (4) + ethDstMac (6) + ethSrcMac (6) + ethProto (2) + pmtu (2) = 20
assertEquals(20, value.writeToBytes().length);
}