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

am a30d9694: Merge "Monitor the right interface re VPN" into jb-mr1-dev

Browse Source 
* commit 'a30d969401a8533a5a341664421ba9b1e150bac3':
  Monitor the right interface re VPN
This commit is contained in:
Robert Greenwalt
2012-10-15 11:37:13 -07:00
committed by Android Git Automerger
parent 7e08477ed1 a30d969401
commit 4e579b5ac2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/connectivity/Vpn.java
View File

@@ -628,6 +628,7 @@ public class Vpn extends BaseNetworkStateTracker {
private final String[] mDaemons;
private final String[][] mArguments;
private final LocalSocket[] mSockets;
private final String mOuterInterface;
private long mTimer = -1;
@@ -638,10 +639,15 @@ public class Vpn extends BaseNetworkStateTracker {
// TODO: clear arguments from memory once launched
mArguments = new String[][] {racoon, mtpd};
mSockets = new LocalSocket[mDaemons.length];
// This is the interface which VPN is running on,
// mConfig.interfaze will change to point to OUR
// internal interface soon. TODO - add inner/outer to mconfig
mOuterInterface = mConfig.interfaze;
}
public void check(String interfaze) {
if (interfaze.equals(mConfig.interfaze)) {
if (interfaze.equals(mOuterInterface)) {
Log.i(TAG, "Legacy VPN is going down with " + interfaze);
exit();
}