LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Flush central DNS cache when things change.

Browse Source 
Flushes the cache for an interface when
either routes or DNS servers change.

Change-Id: I021305f781be669aaa12074dc1cc21511f49eac4
This commit is contained in:
Robert Greenwalt
2011-08-15 12:31:55 -07:00
parent 08ae9bc349
commit 8d77725fa7
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
services/java/com/android/server/ConnectivityService.java
View File

@@ -1778,15 +1778,26 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
} }
mCurrentLinkProperties[netType] = newLp; mCurrentLinkProperties[netType] = newLp;
updateRoutes(newLp, curLp, mNetConfigs[netType].isDefault()); boolean resetDns = updateRoutes(newLp, curLp, mNetConfigs[netType].isDefault());
if (doReset || resetMask != 0) { if (doReset || resetMask != 0 || resetDns) {
LinkProperties linkProperties = mNetTrackers[netType].getLinkProperties(); LinkProperties linkProperties = mNetTrackers[netType].getLinkProperties();
if (linkProperties != null) { if (linkProperties != null) {
String iface = linkProperties.getInterfaceName(); String iface = linkProperties.getInterfaceName();
if (TextUtils.isEmpty(iface) == false) { if (TextUtils.isEmpty(iface) == false) {
if (DBG) log("resetConnections(" + iface + ", " + resetMask + ")"); if (doReset || resetMask != 0) {
NetworkUtils.resetConnections(iface, resetMask); if (DBG) log("resetConnections(" + iface + ", " + resetMask + ")");
NetworkUtils.resetConnections(iface, resetMask);
}
if (resetDns) {
if (DBG) log("resetting DNS cache for " + iface);
try {
mNetd.flushInterfaceDnsCache(iface);
} catch (Exception e) {
// never crash - catch them all
loge("Exception resetting dns cache: " + e);
}
}
} }
} }
} }
@@ -1808,8 +1819,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
* is a noop. * is a noop.
* Uses isLinkDefault to determine if default routes should be set or conversely if * Uses isLinkDefault to determine if default routes should be set or conversely if
* host routes should be set to the dns servers * host routes should be set to the dns servers
* returns a boolean indicating the routes changed
*/ */
private void updateRoutes(LinkProperties newLp, LinkProperties curLp, boolean isLinkDefault) { private boolean updateRoutes(LinkProperties newLp, LinkProperties curLp,
boolean isLinkDefault) {
Collection<RouteInfo> routesToAdd = null; Collection<RouteInfo> routesToAdd = null;
CompareResult<InetAddress> dnsDiff = new CompareResult<InetAddress>(); CompareResult<InetAddress> dnsDiff = new CompareResult<InetAddress>();
CompareResult<RouteInfo> routeDiff = new CompareResult<RouteInfo>(); CompareResult<RouteInfo> routeDiff = new CompareResult<RouteInfo>();
@@ -1822,6 +1835,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
dnsDiff.added = newLp.getDnses(); dnsDiff.added = newLp.getDnses();
} }
boolean routesChanged = (routeDiff.removed.size() != 0 || routeDiff.added.size() != 0);
for (RouteInfo r : routeDiff.removed) { for (RouteInfo r : routeDiff.removed) {
if (isLinkDefault || ! r.isDefaultRoute()) { if (isLinkDefault || ! r.isDefaultRoute()) {
removeRoute(curLp, r); removeRoute(curLp, r);
@@ -1849,15 +1864,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (!isLinkDefault) { if (!isLinkDefault) {
// handle DNS routes // handle DNS routes
if (routeDiff.removed.size() == 0 && routeDiff.added.size() == 0) { if (routesChanged) {
// no change in routes, check for change in dns themselves
for (InetAddress oldDns : dnsDiff.removed) {
removeRouteToAddress(curLp, oldDns);
}
for (InetAddress newDns : dnsDiff.added) {
addRouteToAddress(newLp, newDns);
}
} else {
// routes changed - remove all old dns entries and add new // routes changed - remove all old dns entries and add new
if (curLp != null) { if (curLp != null) {
for (InetAddress oldDns : curLp.getDnses()) { for (InetAddress oldDns : curLp.getDnses()) {
@@ -1869,8 +1876,17 @@ public class ConnectivityService extends IConnectivityManager.Stub {
addRouteToAddress(newLp, newDns); addRouteToAddress(newLp, newDns);
} }
} }
} else {
// no change in routes, check for change in dns themselves
for (InetAddress oldDns : dnsDiff.removed) {
removeRouteToAddress(curLp, oldDns);
}
for (InetAddress newDns : dnsDiff.added) {
addRouteToAddress(newLp, newDns);
}
} }
} }
return routesChanged;
} }