Merge "Minimal support for IPv6 upstreams in IpServer tests." am: fc7d7b5f0f (21d63cba) · Commits · e / os / android_frameworks_base

packages/Tethering/tests/unit/src/android/net/ip/IpServerTest.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -158,7 +158,9 @@ public class IpServerTest {
		initStateMachine(interfaceType, usingLegacyDhcp);
		dispatchCommand(IpServer.CMD_TETHER_REQUESTED, STATE_TETHERED);
		if (upstreamIface != null) {
		dispatchTetherConnectionChanged(upstreamIface);
		LinkProperties lp = new LinkProperties();
		lp.setInterfaceName(upstreamIface);
		dispatchTetherConnectionChanged(upstreamIface, lp);
		}
		reset(mNetd, mCallback);
		}
		@@ -508,13 +510,21 @@ public class IpServerTest {
		*
		* @see #dispatchCommand(int)
		* @param upstreamIface String name of upstream interface (or null)
		* @param v6lp IPv6 LinkProperties of the upstream interface, or null for an IPv4-only upstream.
		*/
		private void dispatchTetherConnectionChanged(String upstreamIface) {
		private void dispatchTetherConnectionChanged(String upstreamIface, LinkProperties v6lp) {
		mIpServer.sendMessage(IpServer.CMD_TETHER_CONNECTION_CHANGED,
		new InterfaceSet(upstreamIface));
		if (v6lp != null) {
		mIpServer.sendMessage(IpServer.CMD_IPV6_TETHER_UPDATE, v6lp);
		}
		mLooper.dispatchAll();
		}

		private void dispatchTetherConnectionChanged(String upstreamIface) {
		dispatchTetherConnectionChanged(upstreamIface, null);
		}

		private void assertIPv4AddressAndDirectlyConnectedRoute(LinkProperties lp) {
		// Find the first IPv4 LinkAddress.
		LinkAddress addr4 = null;