commit a30d969401a8533a5a341664421ba9b1e150bac3
author Robert Greenwalt <rgreenwalt@google.com> Mon Oct 15 11:34:02 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 15 11:34:13 2012 -0700
tree 4c0bc78a51ebec3944e5458d287319bcc1803676
parent d86a532c5271dfbfe7378ddeb6700fafd92ecbcc
parent 53c04bdd35a85aa65d1a1f18ca2ee34970e2c2d0

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

services/java/com/android/server/connectivity/Vpn.java

diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java
index 03ff21f..bb19cc7 100644
--- a/services/java/com/android/server/connectivity/Vpn.java
+++ b/services/java/com/android/server/connectivity/Vpn.java
@@ -628,6 +628,7 @@
         private final String[] mDaemons;
         private final String[][] mArguments;
         private final LocalSocket[] mSockets;
+        private final String mOuterInterface;
 
         private long mTimer = -1;
 
@@ -638,10 +639,15 @@
             // 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();
             }