Make the interface with DHCP IPv6 capable.
It doesn't work (yet) for IPv6, but we can remove v4-centric notions from the framework.
bug:2542681
Change-Id: I21c058f5c88d07706c9265bf0ea902fc90357e56
diff --git a/core/java/android/bluetooth/BluetoothTetheringDataTracker.java b/core/java/android/bluetooth/BluetoothTetheringDataTracker.java
index 7b083f1..aa1adcb 100644
--- a/core/java/android/bluetooth/BluetoothTetheringDataTracker.java
+++ b/core/java/android/bluetooth/BluetoothTetheringDataTracker.java
@@ -18,7 +18,7 @@
import android.content.Context;
import android.net.ConnectivityManager;
-import android.net.DhcpInfo;
+import android.net.DhcpInfoInternal;
import android.net.LinkAddress;
import android.net.LinkCapabilities;
import android.net.LinkProperties;
@@ -251,23 +251,12 @@
public void run() {
//TODO(): Add callbacks for failure and success case.
//Currently this thread runs independently.
- DhcpInfo dhcpInfo = new DhcpInfo();
- if (!NetworkUtils.runDhcp(mIface, dhcpInfo)) {
+ DhcpInfoInternal dhcpInfoInternal = new DhcpInfoInternal();
+ if (!NetworkUtils.runDhcp(mIface, dhcpInfoInternal)) {
Log.e(TAG, "DHCP request error:" + NetworkUtils.getDhcpError());
return;
}
- mLinkProperties.addLinkAddress(new LinkAddress(
- NetworkUtils.intToInetAddress(dhcpInfo.ipAddress),
- NetworkUtils.intToInetAddress(dhcpInfo.netmask)));
- mLinkProperties.setGateway(NetworkUtils.intToInetAddress(dhcpInfo.gateway));
- InetAddress dns1Addr = NetworkUtils.intToInetAddress(dhcpInfo.dns1);
- if (dns1Addr == null || dns1Addr.equals("0.0.0.0")) {
- mLinkProperties.addDns(dns1Addr);
- }
- InetAddress dns2Addr = NetworkUtils.intToInetAddress(dhcpInfo.dns2);
- if (dns2Addr == null || dns2Addr.equals("0.0.0.0")) {
- mLinkProperties.addDns(dns2Addr);
- }
+ mLinkProperties = dhcpInfoInternal.makeLinkProperties();
mLinkProperties.setInterfaceName(mIface);
mNetworkInfo.setIsAvailable(true);
diff --git a/core/java/android/net/DhcpInfoInternal.java b/core/java/android/net/DhcpInfoInternal.java
new file mode 100644
index 0000000..7d9bd52
--- /dev/null
+++ b/core/java/android/net/DhcpInfoInternal.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+import java.net.InetAddress;
+import java.net.Inet4Address;
+import java.net.UnknownHostException;
+
+/**
+ * A simple object for retrieving the results of a DHCP request.
+ * Replaces (internally) the IPv4-only DhcpInfo class.
+ * @hide
+ */
+public class DhcpInfoInternal {
+ public String ipAddress;
+ public String gateway;
+ public int prefixLength;
+
+ public String dns1;
+ public String dns2;
+
+ public String serverAddress;
+ public int leaseDuration;
+
+ public DhcpInfoInternal() {
+ }
+
+ private int convertToInt(String addr) {
+ try {
+ InetAddress inetAddress = NetworkUtils.numericToInetAddress(addr);
+ if (inetAddress instanceof Inet4Address) {
+ return NetworkUtils.inetAddressToInt(inetAddress);
+ }
+ } catch (IllegalArgumentException e) {}
+ return 0;
+ }
+
+ public DhcpInfo makeDhcpInfo() {
+ DhcpInfo info = new DhcpInfo();
+ info.ipAddress = convertToInt(ipAddress);
+ info.gateway = convertToInt(gateway);
+ try {
+ InetAddress inetAddress = NetworkUtils.numericToInetAddress(ipAddress);
+ info.netmask = NetworkUtils.prefixLengthToNetmaskInt(prefixLength);
+ } catch (IllegalArgumentException e) {}
+ info.dns1 = convertToInt(dns1);
+ info.dns2 = convertToInt(dns2);
+ info.serverAddress = convertToInt(serverAddress);
+ info.leaseDuration = leaseDuration;
+ return info;
+ }
+
+ public LinkAddress makeLinkAddress() {
+ return new LinkAddress(NetworkUtils.numericToInetAddress(ipAddress), prefixLength);
+ }
+
+ public LinkProperties makeLinkProperties() {
+ LinkProperties p = new LinkProperties();
+ p.addLinkAddress(makeLinkAddress());
+ p.setGateway(NetworkUtils.numericToInetAddress(gateway));
+ p.addDns(NetworkUtils.numericToInetAddress(dns1));
+ p.addDns(NetworkUtils.numericToInetAddress(dns2));
+ return p;
+ }
+
+ public String toString() {
+ return "addr: " + ipAddress + "/" + prefixLength +
+ " gateway: " + gateway +
+ " dns: " + dns1 + "," + dns2 +
+ " dhcpServer: " + serverAddress +
+ " leaseDuration: " + leaseDuration;
+ }
+}
diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index b0c974c..1c48e7d 100644
--- a/core/java/android/net/NetworkUtils.java
+++ b/core/java/android/net/NetworkUtils.java
@@ -77,7 +77,7 @@
* the IP address information.
* @return {@code true} for success, {@code false} for failure
*/
- public native static boolean runDhcp(String interfaceName, DhcpInfo ipInfo);
+ public native static boolean runDhcp(String interfaceName, DhcpInfoInternal ipInfo);
/**
* Shut down the DHCP client daemon.
@@ -150,6 +150,29 @@
}
/**
+ * Create an InetAddress from a string where the string must be a standard
+ * representation of a V4 or V6 address. Avoids doing a DNS lookup on failure
+ * but it will throw an IllegalArgumentException in that case.
+ * @param addrString
+ * @return the InetAddress
+ * @hide
+ */
+ public static InetAddress numericToInetAddress(String addrString)
+ throws IllegalArgumentException {
+ // TODO - do this for real, using a hidden method on InetAddress that aborts
+ // instead of doing dns step
+ if (!InetAddress.isNumeric(addrString)) {
+ throw new IllegalArgumentException("numericToInetAddress with non numeric: " +
+ addrString);
+ }
+ try {
+ return InetAddress.getByName(addrString);
+ } catch (UnknownHostException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ /**
* Add a default route through the specified gateway.
* @param interfaceName interface on which the route should be added
* @param gw the IP address of the gateway to which the route is desired,