Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f74d552 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

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
parent 01583ef7

services/java/com/android/server/connectivity/Tethering.java

+14 −2
Original line number Diff line number Diff line
@@ -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() {