Ignore echo back of auth-token (closes #752)

1 files changed, 10 insertions, 7 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index 70e2d1f6..096982f9 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -148,7 +148,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 

             // Closing one of the two sockets also closes the other

             //mServerSocketLocal.close();

-            managmentCommand("version 2\n");
+            managmentCommand("version 2\n");

 

             while (true) {

 

@@ -260,8 +260,8 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
                 case "LOG":

                     processLogMessage(argument);

                     break;

-                case "PK_SIGN":
-                    processSignCommand(argument);
+                case "PK_SIGN":

+                    processSignCommand(argument);

                     break;

                 default:

                     VpnStatus.logWarning("MGMT: Got unrecognized command" + command);

@@ -546,6 +546,9 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 

 

         try {

+            // Ignore Auth token message, already managed by openvpn itself

+            if (argument.startsWith("Auth-Token:"))

+                return;

 

             int p1 = argument.indexOf('\'');

             int p2 = argument.indexOf('\'', p1 + 1);

@@ -632,17 +635,17 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
         releaseHold();

     }

 

-    private void processSignCommand(String b64data) {
+    private void processSignCommand(String b64data) {

 

-        String signed_string = mProfile.getSignedData(b64data);
+        String signed_string = mProfile.getSignedData(b64data);

 

         if (signed_string == null) {

-            managmentCommand("pk-sig\n");
+            managmentCommand("pk-sig\n");

             managmentCommand("\nEND\n");

             stopOpenVPN();

             return;

         }

-        managmentCommand("pk-sig\n");
+        managmentCommand("pk-sig\n");

         managmentCommand(signed_string);

         managmentCommand("\nEND\n");

     }