diff options
| author | 2011-12-19 16:59:31 -0800 | |
|---|---|---|
| committer | 2011-12-20 14:47:22 -0800 | |
| commit | 4f74d552d54fd26bc377f333fccb671d20519b3e (patch) | |
| tree | c772b3352681b951e3104f4b27ceedaafc07bc3b | |
| parent | 01583ef715641c8a3ce68269b091e75adbe9335a (diff) | |
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:5763980
Change-Id: Ie9a4445a3c72df3f7ab4320c507ebc8e8cd440ff
| -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 bc8ce7ddf651..9573fda5c2ed 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; @@ -1325,7 +1326,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); @@ -1383,11 +1394,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() { |