summaryrefslogtreecommitdiff
path: root/src/de/blinkt
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-06-03 14:57:16 +0200
committerArne Schwabe <arne@rfc2549.org>2012-06-03 14:57:16 +0200
commit12151bce34453ab1540c50a4dd143fb42028541d (patch)
treeb4824e9c96fe2a5302e31ddb8a1fa83eab6c2f50 /src/de/blinkt
parentec2008e9e53b99ba1725d8398e21b9cb04f6b8ca (diff)
Implement reconnect on network change (closes issue #37)
Diffstat (limited to 'src/de/blinkt')
-rw-r--r--src/de/blinkt/openvpn/LaunchVPN.java2
-rw-r--r--src/de/blinkt/openvpn/NetworkSateReceiver.java59
-rw-r--r--src/de/blinkt/openvpn/OpenVpnManagementThread.java6
-rw-r--r--src/de/blinkt/openvpn/OpenVpnService.java18
4 files changed, 83 insertions, 2 deletions
diff --git a/src/de/blinkt/openvpn/LaunchVPN.java b/src/de/blinkt/openvpn/LaunchVPN.java
index 4b21c959..7b0f6e04 100644
--- a/src/de/blinkt/openvpn/LaunchVPN.java
+++ b/src/de/blinkt/openvpn/LaunchVPN.java
@@ -381,7 +381,7 @@ public class LaunchVPN extends ListActivity implements OnItemClickListener {
OpenVPN.logMessage(0, "", "Error writing minivpn binary");
return;
}
- OpenVPN.logMessage(0, "", "Building configration...");
+ OpenVPN.logMessage(0, "", getString(R.string.building_configration));
Intent startVPN = mSelectedProfile.prepareIntent(getBaseContext());
diff --git a/src/de/blinkt/openvpn/NetworkSateReceiver.java b/src/de/blinkt/openvpn/NetworkSateReceiver.java
new file mode 100644
index 00000000..77e25acf
--- /dev/null
+++ b/src/de/blinkt/openvpn/NetworkSateReceiver.java
@@ -0,0 +1,59 @@
+package de.blinkt.openvpn;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.NetworkInfo.State;
+import android.preference.PreferenceManager;
+
+public class NetworkSateReceiver extends BroadcastReceiver {
+ private int lastNetwork=-1;
+ private OpenVpnManagementThread mManangement;
+
+ private String lastStateMsg=null;
+
+ public NetworkSateReceiver(OpenVpnManagementThread managementThread) {
+ super();
+ mManangement = managementThread;
+ }
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ NetworkInfo networkInfo = getCurrentNetworkInfo(context);
+ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+ boolean sendusr1 = prefs.getBoolean("netchangereconnect", true);
+
+
+ String netstatestring;
+ if(networkInfo==null)
+ netstatestring = "null";
+ else
+ netstatestring = String.format("%2$s %4$s to %1$s %3$s",networkInfo.getTypeName(),
+ networkInfo.getDetailedState(),networkInfo.getExtraInfo(), networkInfo.getSubtypeName());
+
+ if(networkInfo!=null && networkInfo.getState() == State.CONNECTED) {
+ int newnet = networkInfo.getType();
+
+ if(sendusr1 && lastNetwork!=-1 && (lastNetwork!=newnet))
+ mManangement.reconnect();
+
+ lastNetwork = newnet;
+ }
+ if(!netstatestring.equals(lastStateMsg))
+ OpenVPN.logMessage(0, "Network:", netstatestring);
+ lastStateMsg=netstatestring;
+
+ }
+
+ private NetworkInfo getCurrentNetworkInfo(Context context) {
+ ConnectivityManager conn = (ConnectivityManager)
+ context.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+ NetworkInfo networkInfo = conn.getActiveNetworkInfo();
+ return networkInfo;
+ }
+
+}
diff --git a/src/de/blinkt/openvpn/OpenVpnManagementThread.java b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
index 6d67a4e6..723cc4c8 100644
--- a/src/de/blinkt/openvpn/OpenVpnManagementThread.java
+++ b/src/de/blinkt/openvpn/OpenVpnManagementThread.java
@@ -383,4 +383,10 @@ public class OpenVpnManagementThread implements Runnable {
return sendCMD;
}
+
+ public void reconnect() {
+ managmentCommand("signal SIGUSR1\n");
+
+ }
+
}
diff --git a/src/de/blinkt/openvpn/OpenVpnService.java b/src/de/blinkt/openvpn/OpenVpnService.java
index 2b44fe03..8c172115 100644
--- a/src/de/blinkt/openvpn/OpenVpnService.java
+++ b/src/de/blinkt/openvpn/OpenVpnService.java
@@ -24,6 +24,8 @@ import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
import android.net.LocalSocket;
import android.net.LocalSocketAddress;
import android.net.VpnService;
@@ -50,6 +52,8 @@ public class OpenVpnService extends VpnService {
private String mLocalIPv6=null;
private Notification mNotification=null;
+ private NetworkSateReceiver mNetworkStateReceiver;
+
private static final int HELLO_ID = 1;
@Override
@@ -112,6 +116,13 @@ public class OpenVpnService extends VpnService {
return sock;
}
+
+ void registerNetworkStateReceiver() {
+ // Registers BroadcastReceiver to track network connection changes.
+ IntentFilter filter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
+ mNetworkStateReceiver = new NetworkSateReceiver(mSocketManager);
+ this.registerReceiver(mNetworkStateReceiver, filter);
+ }
@Override
@@ -161,7 +172,8 @@ public class OpenVpnService extends VpnService {
mServiceThread = new Thread(serviceThread, "OpenVPNServiceThread");
mServiceThread.start();
-
+
+
// Open the Management Interface
mgmtsocket = openManagmentInterface(8);
@@ -170,6 +182,7 @@ public class OpenVpnService extends VpnService {
mSocketManager = new OpenVpnManagementThread(mProfile,mgmtsocket,this);
mSocketManagerThread = new Thread(mSocketManager,"OpenVPNMgmtThread");
mSocketManagerThread.start();
+ registerNetworkStateReceiver();
}
return START_NOT_STICKY;
@@ -182,6 +195,9 @@ public class OpenVpnService extends VpnService {
mServiceThread.interrupt();
}
+ if (mNetworkStateReceiver!= null) {
+ this.unregisterReceiver(mNetworkStateReceiver);
+ }
}