Snap for 7390278 from d63c13775b2042940a6dfafcb693f62be15599c2 to mainline-media-release (4b3eee27) · Commits · e / os / android_packages_modules_NetworkStack

src/android/net/ip/IpClient.java

+69 −22

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.net.ip;

		import static android.net.RouteInfo.RTN_UNICAST;
		import static android.net.dhcp.DhcpResultsParcelableUtil.toStableParcelable;
		import static android.net.util.NetworkStackUtils.IPCLIENT_DISABLE_ACCEPT_RA_VERSION;
		import static android.net.util.NetworkStackUtils.IPCLIENT_GARP_NA_ROAMING_VERSION;
		import static android.net.util.NetworkStackUtils.IPCLIENT_GRATUITOUS_NA_VERSION;
		import static android.net.util.SocketUtils.makePacketSocketAddress;
		@@ -527,7 +528,7 @@ public class IpClient extends StateMachine {
		private boolean mMulticastFiltering;
		private long mStartTimeMillis;
		private MacAddress mCurrentBssid;
		private boolean mHasDisabledIPv6OnProvLoss;
		private boolean mHasDisabledIpv6OrAcceptRaOnProvLoss;

		/**
		* Reading the snapshot is an asynchronous operation initiated by invoking
		@@ -859,6 +860,33 @@ public class IpClient extends StateMachine {
		false /* defaultEnabled */);
		}

		private void setInitialBssid(final ProvisioningConfiguration req) {
		final ScanResultInfo scanResultInfo = req.mScanResultInfo;
		mCurrentBssid = null;
		// http://b/185202634
		// ScanResultInfo is not populated in some situations.
		// On S and above, prefer getting the BSSID from the Layer2Info.
		// On R and below, get the BSSID from the ScanResultInfo and fall back to
		// getting it from the Layer2Info. This ensures no regressions if any R
		// devices pass in a null or meaningless BSSID in the Layer2Info.
		if (!ShimUtils.isAtLeastS() && scanResultInfo != null) {
		try {
		mCurrentBssid = MacAddress.fromString(scanResultInfo.getBssid());
		} catch (IllegalArgumentException e) {
		Log.wtf(mTag, "Invalid BSSID: " + scanResultInfo.getBssid()
		+ " in provisioning configuration", e);
		}
		}
		if (mCurrentBssid == null && req.mLayer2Info != null) {
		mCurrentBssid = req.mLayer2Info.mBssid;
		}
		}

		private boolean shouldDisableAcceptRaOnProvisioningLoss() {
		return mDependencies.isFeatureEnabled(mContext, IPCLIENT_DISABLE_ACCEPT_RA_VERSION,
		true /* defaultEnabled */);
		}

		@Override
		protected void onQuitting() {
		mCallback.onQuit();
		@@ -882,17 +910,7 @@ public class IpClient extends StateMachine {
		return;
		}

		final ScanResultInfo scanResultInfo = req.mScanResultInfo;
		mCurrentBssid = null;
		if (scanResultInfo != null) {
		try {
		mCurrentBssid = MacAddress.fromString(scanResultInfo.getBssid());
		} catch (IllegalArgumentException e) {
		Log.wtf(mTag, "Invalid BSSID: " + scanResultInfo.getBssid()
		+ " in provisioning configuration", e);
		}
		}

		setInitialBssid(req);
		if (req.mLayer2Info != null) {
		mL2Key = req.mLayer2Info.mL2Key;
		mCluster = req.mLayer2Info.mCluster;
		@@ -1186,6 +1204,21 @@ public class IpClient extends StateMachine {
		return config.isProvisionedBy(lp.getLinkAddresses(), lp.getRoutes());
		}

		private void setIpv6AcceptRa(int acceptRa) {
		try {
		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);
		}
		}

		private void restartIpv6WithAcceptRaDisabled() {
		mInterfaceCtrl.disableIPv6();
		setIpv6AcceptRa(0 /* accept_ra */);
		startIPv6();
		}

		// TODO: Investigate folding all this into the existing static function
		// LinkProperties.compareProvisioning() or some other single function that
		// takes two LinkProperties objects and returns a ProvisioningChange
		@@ -1235,7 +1268,7 @@ public class IpClient extends StateMachine {
		// Note that we can still be disconnected by IpReachabilityMonitor
		// if the IPv6 default gateway (but not the IPv6 DNS servers; see
		// accompanying code in IpReachabilityMonitor) is unreachable.
		final boolean ignoreIPv6ProvisioningLoss = mHasDisabledIPv6OnProvLoss
		final boolean ignoreIPv6ProvisioningLoss = mHasDisabledIpv6OrAcceptRaOnProvLoss
		\|\| (mConfiguration != null && mConfiguration.mUsingMultinetworkPolicyTracker
		&& !mCm.shouldAvoidBadWifi());

		@@ -1263,18 +1296,31 @@ public class IpClient extends StateMachine {
		if (oldLp.hasGlobalIpv6Address() && (lostIPv6Router && !ignoreIPv6ProvisioningLoss)) {
		// Although link properties have lost IPv6 default route in this case, if IPv4 is still
		// working with appropriate routes and DNS servers, we can keep the current connection
		// without disconnecting from the network, just disable IPv6 on that given network until
		// to the next provisioning. Disabling IPv6 will result in all IPv6 connectivity torn
		// down and all IPv6 sockets being closed, the non-routable IPv6 DNS servers will be
		// stripped out, so applications will be able to reconnect immediately over IPv4. See
		// b/131781810.
		// without disconnecting from the network, just disable IPv6 or accept_ra parameter on
		// that given network until to the next provisioning.
		//
		// Disabling IPv6 stack will result in all IPv6 connectivity torn down and all IPv6
		// sockets being closed, the non-routable IPv6 DNS servers will be stripped out, so
		// applications will be able to reconnect immediately over IPv4. See b/131781810.
		//
		// Sometimes disabling IPv6 stack might introduce other issues(see b/179222860),
		// instead disabling accept_ra will result in only IPv4 provisioning and IPv6 link
		// local address left on the interface, so applications will be able to reconnect
		// immediately over IPv4 and keep IPv6 link-local capable.
		if (newLp.isIpv4Provisioned()) {
		if (shouldDisableAcceptRaOnProvisioningLoss()) {
		restartIpv6WithAcceptRaDisabled();
		} else {
		mInterfaceCtrl.disableIPv6();
		}
		mNetworkQuirkMetrics.setEvent(NetworkQuirkEvent.QE_IPV6_PROVISIONING_ROUTER_LOST);
		mNetworkQuirkMetrics.statsWrite();
		mHasDisabledIPv6OnProvLoss = true;
		mHasDisabledIpv6OrAcceptRaOnProvLoss = true;
		delta = PROV_CHANGE_STILL_PROVISIONED;
		mLog.log("Disable IPv6 stack completely when the default router has gone");
		mLog.log(shouldDisableAcceptRaOnProvisioningLoss()
		? "Disabled accept_ra parameter "
		: "Disabled IPv6 stack completely "
		+ "when the IPv6 default router has gone");
		} else {
		delta = PROV_CHANGE_LOST_PROVISIONING;
		}
		@@ -1827,7 +1873,8 @@ public class IpClient extends StateMachine {
		@Override
		public void enter() {
		stopAllIP();
		mHasDisabledIPv6OnProvLoss = false;
		setIpv6AcceptRa(2 /* accept_ra */);
		mHasDisabledIpv6OrAcceptRaOnProvLoss = false;
		mGratuitousNaTargetAddresses.clear();

		mLinkObserver.clearInterfaceParams();

src/android/net/util/NetworkStackUtils.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,12 @@ public class NetworkStackUtils {
		public static final String IPCLIENT_GARP_NA_ROAMING_VERSION =
		"ipclient_garp_na_roaming_version";

		/**
		* Experiment flag to disable accept_ra parameter when IPv6 provisioning loss happens due to
		* the default route has gone.
		*/
		public static final String IPCLIENT_DISABLE_ACCEPT_RA_VERSION = "ipclient_disable_accept_ra";

		static {
		System.loadLibrary("networkstackutilsjni");
		}