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

Commit fed4194a authored by Erik Kline's avatar Erik Kline
Browse files

Eschew unspecified IP addresses for DNS servers 

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-wifi passes (though no test covers this code yet)
Bug: 34210527
Change-Id: I2d44445982dfb3221f7b6394daf0479c1fa8a6e1
parent 9311dbf9

services/net/java/android/net/ip/IpManager.java

+14 −14
Original line number Diff line number Diff line
@@ -865,13 +865,7 @@ public class IpManager extends StateMachine { 
        for (RouteInfo route : netlinkLinkProperties.getRoutes()) {

            newLp.addRoute(route);

        }

        for (InetAddress dns : netlinkLinkProperties.getDnsServers()) {

            // Only add likely reachable DNS servers.

            // TODO: investigate deleting this.

            if (newLp.isReachable(dns)) {

                newLp.addDnsServer(dns);

            }

        }

        addAllReachableDnsServers(newLp, netlinkLinkProperties.getDnsServers());



        // [3] Add in data from DHCPv4, if available.

        //
@@ -881,13 +875,7 @@ public class IpManager extends StateMachine { 
            for (RouteInfo route : mDhcpResults.getRoutes(mInterfaceName)) {

                newLp.addRoute(route);

            }

            for (InetAddress dns : mDhcpResults.dnsServers) {

                // Only add likely reachable DNS servers.

                // TODO: investigate deleting this.

                if (newLp.isReachable(dns)) {

                    newLp.addDnsServer(dns);

                }

            }

            addAllReachableDnsServers(newLp, mDhcpResults.dnsServers);

            newLp.setDomains(mDhcpResults.domains);



            if (mDhcpResults.mtu != 0) {
@@ -909,6 +897,18 @@ public class IpManager extends StateMachine { 
        return newLp;

    }



    private static void addAllReachableDnsServers(

            LinkProperties lp, Iterable<InetAddress> dnses) {

        // TODO: Investigate deleting this reachability check.  We should be

        // able to pass everything down to netd and let netd do evaluation

        // and RFC6724-style sorting.

        for (InetAddress dns : dnses) {

            if (!dns.isAnyLocalAddress() && lp.isReachable(dns)) {

                lp.addDnsServer(dns);

            }

        }

    }



    // Returns false if we have lost provisioning, true otherwise.

    private boolean handleLinkPropertiesUpdate(boolean sendCallbacks) {

        final LinkProperties newLp = assembleLinkProperties();