Merge "Don't accept RAs in link-local only mode." (c88eead2) · Commits · e / os / android_packages_modules_NetworkStack

src/android/net/ip/IpClient.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1301,7 +1301,7 @@ public class IpClient extends StateMachine {
		mNetd.setProcSysNet(INetd.IPV6, INetd.CONF, mInterfaceParams.name, "accept_ra",
		Integer.toString(acceptRa));
		} catch (Exception e) {
		Log.e(mTag, "Failed to set accept_ra to " + acceptRa);
		Log.e(mTag, "Failed to set accept_ra to " + acceptRa + ": " + e);
		}
		}

		@@ -1835,6 +1835,7 @@ public class IpClient extends StateMachine {
		}

		private boolean startIPv6() {
		setIpv6AcceptRa(mConfiguration.mIPv6ProvisioningMode == PROV_IPV6_LINKLOCAL ? 0 : 2);
		return mInterfaceCtrl.setIPv6PrivacyExtensions(true)
		&& mInterfaceCtrl.setIPv6AddrGenModeIfSupported(mConfiguration.mIPv6AddrGenMode)
		&& mInterfaceCtrl.enableIPv6();
		@@ -1966,7 +1967,6 @@ public class IpClient extends StateMachine {
		@Override
		public void enter() {
		stopAllIP();
		setIpv6AcceptRa(2 /* accept_ra */);
		mHasDisabledIpv6OrAcceptRaOnProvLoss = false;
		mGratuitousNaTargetAddresses.clear();

tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java

+48 −7

Original line number	Diff line number	Diff line
		@@ -620,13 +620,7 @@ public abstract class IpClientIntegrationTestCommon {
		@After
		public void tearDown() throws Exception {
		if (testSkipped()) return;
		if (mPacketReader != null) {
		mHandler.post(() -> mPacketReader.stop()); // Also closes the socket
		mTapFd = null;
		}
		if (mPacketReaderThread != null) {
		mPacketReaderThread.quitSafely();
		}
		teardownTapInterface();
		mIIpClient.shutdown();
		awaitIpClientShutdown();
		}
		@@ -664,6 +658,16 @@ public abstract class IpClientIntegrationTestCommon {
		mHandler.post(() -> mPacketReader.start());
		}

		private void teardownTapInterface() {
		if (mPacketReader != null) {
		mHandler.post(() -> mPacketReader.stop()); // Also closes the socket
		mTapFd = null;
		}
		if (mPacketReaderThread != null) {
		mPacketReaderThread.quitSafely();
		}
		}

		private MacAddress getIfaceMacAddr(String ifaceName) throws IOException {
		// InterfaceParams.getByName requires CAP_NET_ADMIN: read the mac address with the shell
		final String strMacAddr = getOneLineCommandOutput(
		@@ -3514,6 +3518,43 @@ public abstract class IpClientIntegrationTestCommon {
		assertNotNull(route);
		assertTrue(route.getDestination().equals(new IpPrefix("fe80::/64")));
		assertTrue(route.getGateway().isAnyLocalAddress());

		// Check that if an RA is received, no IP addresses, routes, or DNS servers are configured.
		// Instead of waiting some period of time for the RA to be received and checking the
		// LinkProperties after that, tear down the interface and wait for it to go down. Then check
		// that no LinkProperties updates ever contained non-link-local information.
		sendBasicRouterAdvertisement(false /* waitForRs */);
		teardownTapInterface();
		verify(mCb, timeout(TEST_TIMEOUT_MS)).onProvisioningFailure(any());
		verify(mCb, never()).onLinkPropertiesChange(argThat(newLp ->
		newLp.getDnsServers().size() != 0
		\|\| newLp.getRoutes().size() > 1
		\|\| newLp.hasIpv6DefaultRoute()
		\|\| newLp.hasGlobalIpv6Address()
		));
		}

		@Test
		public void testIPv6LinkLocalOnlyAndThenGlobal() throws Exception {
		ProvisioningConfiguration config = new ProvisioningConfiguration.Builder()
		.withoutIPv4()
		.withIpv6LinkLocalOnly()
		.withRandomMacAddress()
		.build();
		startIpClientProvisioning(config);
		verify(mCb, timeout(TEST_TIMEOUT_MS)).onProvisioningSuccess(any());
		mIIpClient.stop();
		verifyAfterIpClientShutdown();
		reset(mCb);

		// Speed up provisioning by enabling rapid commit. TODO: why is this necessary?
		setDhcpFeatures(false /* isDhcpLeaseCacheEnabled /, true / isRapidCommitEnabled */,
		false /* isDhcpIpConflictDetectEnabled /, false / isIPv6OnlyPreferredEnabled */);
		config = new ProvisioningConfiguration.Builder()
		.build();
		startIpClientProvisioning(config);
		performDualStackProvisioning();
		// No exceptions? Dual-stack provisioning worked.
		}

		@Test