Merge "Retain DNS information from DHCP request" (04e3bb6d) · Commits · e / os / android_frameworks_base

core/java/android/net/DhcpInfoInternal.java

+36 −9

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import java.net.Inet4Address;
		import java.net.UnknownHostException;
		import java.util.ArrayList;
		import java.util.Collection;
		import java.util.Collections;

		/**
		* A simple object for retrieving the results of a DHCP request.
		@@ -41,14 +42,18 @@ public class DhcpInfoInternal {
		public String serverAddress;
		public int leaseDuration;

		private Collection<RouteInfo> routes;
		private Collection<RouteInfo> mRoutes;

		public DhcpInfoInternal() {
		routes = new ArrayList<RouteInfo>();
		mRoutes = new ArrayList<RouteInfo>();
		}

		public void addRoute(RouteInfo routeInfo) {
		routes.add(routeInfo);
		mRoutes.add(routeInfo);
		}

		public Collection<RouteInfo> getRoutes() {
		return Collections.unmodifiableCollection(mRoutes);
		}

		private int convertToInt(String addr) {
		@@ -66,7 +71,7 @@ public class DhcpInfoInternal {
		public DhcpInfo makeDhcpInfo() {
		DhcpInfo info = new DhcpInfo();
		info.ipAddress = convertToInt(ipAddress);
		for (RouteInfo route : routes) {
		for (RouteInfo route : mRoutes) {
		if (route.isDefaultRoute()) {
		info.gateway = convertToInt(route.getGateway().getHostAddress());
		break;
		@@ -94,14 +99,14 @@ public class DhcpInfoInternal {
		public LinkProperties makeLinkProperties() {
		LinkProperties p = new LinkProperties();
		p.addLinkAddress(makeLinkAddress());
		for (RouteInfo route : routes) {
		for (RouteInfo route : mRoutes) {
		p.addRoute(route);
		}
		//if empty, connectivity configures default DNS
		if (TextUtils.isEmpty(dns1) == false) {
		p.addDns(NetworkUtils.numericToInetAddress(dns1));
		} else {
		p.addDns(NetworkUtils.numericToInetAddress(serverAddress));
		Log.d(TAG, "empty dns1, use dhcp server as dns1!");
		Log.d(TAG, "makeLinkProperties with empty dns1!");
		}
		if (TextUtils.isEmpty(dns2) == false) {
		p.addDns(NetworkUtils.numericToInetAddress(dns2));
		@@ -111,11 +116,33 @@ public class DhcpInfoInternal {
		return p;
		}

		/* Updates the DHCP fields that need to be retained from
		* original DHCP request if the DHCP renewal shows them as
		* being empty
		*/
		public void updateFromDhcpRequest(DhcpInfoInternal orig) {
		if (orig == null) return;

		if (TextUtils.isEmpty(dns1)) {
		dns1 = orig.dns1;
		}

		if (TextUtils.isEmpty(dns2)) {
		dns2 = orig.dns2;
		}

		if (mRoutes.size() == 0) {
		for (RouteInfo route : orig.getRoutes()) {
		addRoute(route);
		}
		}
		}

		public String toString() {
		String routeString = "";
		for (RouteInfo route : routes) routeString += route.toString() + " \| ";
		for (RouteInfo route : mRoutes) routeString += route.toString() + " \| ";
		return "addr: " + ipAddress + "/" + prefixLength +
		" routes: " + routeString +
		" mRoutes: " + routeString +
		" dns: " + dns1 + "," + dns2 +
		" dhcpServer: " + serverAddress +
		" leaseDuration: " + leaseDuration;

core/java/android/net/DhcpStateMachine.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,9 @@ public class DhcpStateMachine extends StateMachine {
		private PowerManager.WakeLock mDhcpRenewWakeLock;
		private static final String WAKELOCK_TAG = "DHCP";

		//Remember DHCP configuration from first request
		private DhcpInfoInternal mDhcpInfo;

		private static final int DHCP_RENEW = 0;
		private static final String ACTION_DHCP_RENEW = "android.net.wifi.DHCP_RENEW";

		@@ -335,9 +338,11 @@ public class DhcpStateMachine extends StateMachine {
		if (dhcpAction == DhcpAction.START) {
		Log.d(TAG, "DHCP request on " + mInterfaceName);
		success = NetworkUtils.runDhcp(mInterfaceName, dhcpInfoInternal);
		mDhcpInfo = dhcpInfoInternal;
		} else if (dhcpAction == DhcpAction.RENEW) {
		Log.d(TAG, "DHCP renewal on " + mInterfaceName);
		success = NetworkUtils.runDhcpRenew(mInterfaceName, dhcpInfoInternal);
		dhcpInfoInternal.updateFromDhcpRequest(mDhcpInfo);
		}

		if (success) {