From 08fcccc93dce0b7ecdb16af3b5fd2585b452aaf1 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 19 Nov 2013 15:44:06 +0100
Subject: Android 4.4 workaround,

---
 src/de/blinkt/openvpn/core/OpenVpnManagementThread.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/de/blinkt/openvpn/core/OpenVpnManagementThread.java')

diff --git a/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index 03b36144..abca275a 100644
--- a/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -273,8 +273,12 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
         }
 
         int ovpnlevel = Integer.parseInt(args[2]) & 0x0F;
+        String msg = args[3];
 
-        VpnStatus.logMessageOpenVPN(level,ovpnlevel, args[3]);
+        if (msg.startsWith("MANAGEMENT: CMD"))
+            ovpnlevel = Math.max(4, ovpnlevel);
+
+        VpnStatus.logMessageOpenVPN(level,ovpnlevel, msg);
     }
 
     private void handleHold() {
@@ -387,7 +391,10 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 		} else if (needed.equals("IFCONFIG6")) {
 			mOpenVPNService.setLocalIPv6(extra);
 
-		} else if (needed.equals("OPENTUN")) {
+		} else if (needed.equals("PERSIST_TUN_ACTION")) {
+            // check if tun cfg stayed the same
+            status = mOpenVPNService.getTunReopenStatus();
+        } else if (needed.equals("OPENTUN")) {
 			if(sendTunFD(needed,extra))
 				return;
 			else
-- 
cgit v1.2.3