From 53c04bdd35a85aa65d1a1f18ca2ee34970e2c2d0 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Fri, 12 Oct 2012 17:02:45 -0700 Subject: [PATCH] Monitor the right interface re VPN Must remember the outer interface - undoes a change from a couple months ago that broke things. bug:7336302 Change-Id: Ia4f60862c60f3078853e151980e09cbf22a57222 --- services/java/com/android/server/connectivity/Vpn.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java index 03ff21f064504..bb19cc717e8d1 100644 --- a/services/java/com/android/server/connectivity/Vpn.java +++ b/services/java/com/android/server/connectivity/Vpn.java @@ -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(); }