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

Merge "Stop clat if it's no longer in use." into jb-mr2-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2013-03-29 01:17:43 +00:00
committed by Android (Google) Code Review
parent a0d2ee6ef5 4118d082f1
commit 1c17853c0b
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2285,9 +2285,17 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
// Update 464xlat state. // Update 464xlat state.
// TODO: Move to handleConnect()
NetworkStateTracker tracker = mNetTrackers[netType]; NetworkStateTracker tracker = mNetTrackers[netType];
if (mClat.requiresClat(netType, tracker)) { if (mClat.requiresClat(netType, tracker)) {
// If the connection was previously using clat, but is not using it now, stop the clat
// daemon. Normally, this happens automatically when the connection disconnects, but if
// the disconnect is not reported, or if the connection's LinkProperties changed for
// some other reason (e.g., handoff changes the IP addresses on the link), it would
// still be running. If it's not running, then stopping it is a no-op.
if (Nat464Xlat.isRunningClat(curLp) && !Nat464Xlat.isRunningClat(newLp)) {
mClat.stopClat();
}
// If the link requires clat to be running, then start the daemon now.
if (mNetTrackers[netType].getNetworkInfo().isConnected()) { if (mNetTrackers[netType].getNetworkInfo().isConnected()) {
mClat.startClat(tracker); mClat.startClat(tracker);
} else { } else {

4
services/java/com/android/server/connectivity/Nat464Xlat.java
View File

@@ -87,6 +87,10 @@ public class Nat464Xlat extends BaseNetworkObserver {
return netType == TYPE_MOBILE && !lp.hasIPv4Address(); return netType == TYPE_MOBILE && !lp.hasIPv4Address();
} }
public static boolean isRunningClat(LinkProperties lp) {
return lp != null && lp.getAllInterfaceNames().contains(CLAT_INTERFACE_NAME);
}
/** /**
* Starts the clat daemon. * Starts the clat daemon.
* @param lp The link properties of the interface to start clatd on. * @param lp The link properties of the interface to start clatd on.