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

Merge "Tighten up neighbor timers if IpReachabilityMonitor is in use"

Browse Source
This commit is contained in:
Treehugger Robot
2018-09-06 08:42:05 +00:00
committed by Gerrit Code Review
parent 460a529471 5b43cea3c8
commit 08d7a208e8
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/net/java/android/net/ip/IpClient.java
View File

@@ -1384,6 +1384,20 @@ public class IpClient extends StateMachine {
}
private boolean startIpReachabilityMonitor() {
try {
// TODO: Fetch these parameters from settings, and install a
// settings observer to watch for update and re-program these
// parameters (Q: is this level of dynamic updatability really
// necessary or does reading from settings at startup suffice?).
final int NUM_SOLICITS = 5;
final int INTER_SOLICIT_INTERVAL_MS = 750;
setNeighborParameters(mDependencies.getNetd(), mInterfaceName,
NUM_SOLICITS, INTER_SOLICIT_INTERVAL_MS);
} catch (Exception e) {
mLog.e("Failed to adjust neighbor parameters", e);
// Carry on using the system defaults (currently: 3, 1000);
}
try {
mIpReachabilityMonitor = new IpReachabilityMonitor(
mContext,
@@ -1863,6 +1877,20 @@ public class IpClient extends StateMachine {
}
}
private static void setNeighborParameters(
INetd netd, String ifName, int num_solicits, int inter_solicit_interval_ms)
throws RemoteException, IllegalArgumentException {
Preconditions.checkNotNull(netd);
Preconditions.checkArgument(!TextUtils.isEmpty(ifName));
Preconditions.checkArgument(num_solicits > 0);
Preconditions.checkArgument(inter_solicit_interval_ms > 0);
for (int family : new Integer[]{INetd.IPV4, INetd.IPV6}) {
netd.setProcSysNet(family, INetd.NEIGH, ifName, "retrans_time_ms", Integer.toString(inter_solicit_interval_ms));
netd.setProcSysNet(family, INetd.NEIGH, ifName, "ucast_solicit", Integer.toString(num_solicits));
}
}
// TODO: extract out into CollectionUtils.
static <T> boolean any(Iterable<T> coll, Predicate<T> fn) {
for (T t : coll) {