Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'b12c97040bff6b42a513b50cdf75a98d41cdb249':
  Send neighbors into NUD_PROBE rather than NUD_DELAY
This commit is contained in:
Erik Kline
2015-06-03 02:10:27 +00:00
committed by Android Git Automerger
parent b8ac541d1f b12c97040b
commit 43a2c8ff42
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/IpReachabilityMonitor.java
View File

@@ -99,16 +99,10 @@ public class IpReachabilityMonitor {
public static boolean probeNeighbor(int ifIndex, InetAddress ip) { public static boolean probeNeighbor(int ifIndex, InetAddress ip) {
final long IO_TIMEOUT = 300L; final long IO_TIMEOUT = 300L;
final String msgSnippet = "probing ip=" + ip.getHostAddress() + "%" + ifIndex; 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); } if (DBG) { Log.d(TAG, msgSnippet); }
final byte[] msg = RtNetlinkNeighborMessage.newNewNeighborMessage( final byte[] msg = RtNetlinkNeighborMessage.newNewNeighborMessage(
1, ip, StructNdMsg.NUD_DELAY, ifIndex, null); 1, ip, StructNdMsg.NUD_PROBE, ifIndex, null);
boolean returnValue = false; boolean returnValue = false;
try (NetlinkSocket nlSocket = new NetlinkSocket(OsConstants.NETLINK_ROUTE)) { try (NetlinkSocket nlSocket = new NetlinkSocket(OsConstants.NETLINK_ROUTE)) {