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

Commit b12c9704 authored by Erik Kline's avatar Erik Kline Committed by Android (Google) Code Review
Browse files

Merge "Send neighbors into NUD_PROBE rather than NUD_DELAY" into mnc-dev

parents 21d2a257 2027d85c
Loading
Loading
Loading
Loading
+1 −7
Original line number Diff line number Diff line
@@ -99,16 +99,10 @@ public class IpReachabilityMonitor {
    public static boolean probeNeighbor(int ifIndex, InetAddress ip) {
        final long IO_TIMEOUT = 300L;
        final String msgSnippet = "probing ip=" + ip.getHostAddress() + "%" + ifIndex;
        // This currently does not cause neighbor probing if the target |ip|
        // has been confirmed reachable within the past "delay_probe_time"
        // seconds, i.e. within the past 5 seconds.
        //
        // TODO: replace with a transition directly to NUD_PROBE state once
        // kernels are updated to do so correctly.
        if (DBG) { Log.d(TAG, msgSnippet); }

        final byte[] msg = RtNetlinkNeighborMessage.newNewNeighborMessage(
                1, ip, StructNdMsg.NUD_DELAY, ifIndex, null);
                1, ip, StructNdMsg.NUD_PROBE, ifIndex, null);
        boolean returnValue = false;

        try (NetlinkSocket nlSocket = new NetlinkSocket(OsConstants.NETLINK_ROUTE)) {