diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-12-19 16:59:31 -0800 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2012-01-24 16:44:50 -0800 |
| commit | 03d58bc656f64f98f36462ac18dca16107da5a57 (patch) | |
| tree | a11ef82283de783e62756b85a40f726b36798e3f | |
| parent | 185c0ef7e4aaa4bb978a6eb5c93c569585a07f56 (diff) | |
| download | frameworks_base-03d58bc656f64f98f36462ac18dca16107da5a57.zip frameworks_base-03d58bc656f64f98f36462ac18dca16107da5a57.tar.gz frameworks_base-03d58bc656f64f98f36462ac18dca16107da5a57.tar.bz2 | |
Filter our v6 address from tethering dns.
Don't support IPv6 yet, and the tools crash when they see one, so
filter them out.
bug:5913888
Change-Id: Id7096aa70da4e3cc8e4702b0b489c0228a100db9
| -rw-r--r-- | services/java/com/android/server/connectivity/Tethering.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java index ed7324c..cc1df4f 100644 --- a/services/java/com/android/server/connectivity/Tethering.java +++ b/services/java/com/android/server/connectivity/Tethering.java @@ -55,6 +55,7 @@ import com.google.android.collect.Lists; import java.io.FileDescriptor; import java.io.PrintWriter; import java.net.InetAddress; +import java.net.Inet4Address; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -1326,7 +1327,17 @@ public class Tethering extends INetworkManagementEventObserver.Stub { String[] dnsServers = mDefaultDnsServers; Collection<InetAddress> dnses = linkProperties.getDnses(); if (dnses != null) { - dnsServers = NetworkUtils.makeStrings(dnses); + // we currently only handle IPv4 + ArrayList<InetAddress> v4Dnses = + new ArrayList<InetAddress>(dnses.size()); + for (InetAddress dnsAddress : dnses) { + if (dnsAddress instanceof Inet4Address) { + v4Dnses.add(dnsAddress); + } + } + if (v4Dnses.size() > 0) { + dnsServers = NetworkUtils.makeStrings(v4Dnses); + } } try { mNMService.setDnsForwarders(dnsServers); @@ -1384,11 +1395,12 @@ public class Tethering extends INetworkManagementEventObserver.Stub { boolean mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE; @Override public void enter() { + turnOnMasterTetherSettings(); // may transition us out + mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE; // better try something first pass // or crazy tests cases will fail chooseUpstreamType(mTryCell); mTryCell = !mTryCell; - turnOnMasterTetherSettings(); // may transition us out } @Override public void exit() { |