From 911f3855f184ecdb1339c1d8383ea19e86fe918e Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 27 Sep 2013 22:57:30 +0200
Subject: Implement changing log level on the fly in the log window, still
 needs some UI design love

--HG--
extra : rebase_source : 207343cea3b74cd07ebdf00f8ef443465d12c966
---
 src/de/blinkt/openvpn/core/OpenVpnManagementThread.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 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 23c6cff6..03b36144 100644
--- a/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/src/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -202,7 +202,10 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 
 
 	private void processCommand(String command) {
-		if (command.startsWith(">") && command.contains(":")) {
+        Log.i(TAG, "Line from managment" + command);
+
+
+        if (command.startsWith(">") && command.contains(":")) {
 			String[] parts = command.split(":",2);
 			String cmd = parts[0].substring(1);
 			String argument = parts[1];
@@ -241,7 +244,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 	}
 
     private void processLogMessage(String argument) {
-        String[] args = argument.split(",",3);
+        String[] args = argument.split(",",4);
         // 0 unix time stamp
         // 1 log level N,I,E etc.
                 /*
@@ -254,6 +257,8 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
                  */
         // 2 log message
 
+        Log.d("OpenVPN", argument);
+
         VpnStatus.LogLevel level;
         if (args[1].equals("I")) {
             level = VpnStatus.LogLevel.INFO;
@@ -267,7 +272,9 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
             level = VpnStatus.LogLevel.INFO;
         }
 
-        VpnStatus.logMessage(level,"P:", args[2]);
+        int ovpnlevel = Integer.parseInt(args[2]) & 0x0F;
+
+        VpnStatus.logMessageOpenVPN(level,ovpnlevel, args[3]);
     }
 
     private void handleHold() {
@@ -294,7 +301,8 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 		mLastHoldRelease  = System.currentTimeMillis();
 		managmentCommand("hold release\n");
 		managmentCommand("bytecount " + mBytecountInterval + "\n");
-		managmentCommand("state on\n");
+        managmentCommand("state on\n");
+        //managmentCommand("log on all\n");
 	}
 	
 	public void releaseHold() {
-- 
cgit v1.2.3