added reset_vpn() to vpninfo

openconnect · Oct 13, 2014 · 40e3dda · 40e3dda
1 parent 117df91
commit 40e3dda
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/common.h b/common.h
@@ -23,7 +23,7 @@
 #include <iostream>
 #include <QTranslator>
 
-#define VERSION "0.5"
+#define VERSION "0.6"
 #define APP_NAME "openconnect-gui"
 #define APP_STRING APP_NAME" "VERSION
 

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -257,7 +257,7 @@ static void main_loop(VpnInfo *vpninfo, MainWindow *m)
 	        retry = true;
 	        reset_password = true;
 		m->updateProgressBar(QObject::tr("Authentication failed in batch mode, retrying with batch mode disabled"));
-	        openconnect_reset_ssl(vpninfo->vpninfo);
+		vpninfo->reset_vpn();
 	        continue;
 	    }
 

diff --git a/vpninfo.cpp b/vpninfo.cpp
@@ -188,7 +188,7 @@ int process_auth_form(void *privdata, struct oc_auth_form *form)
 	        ok = dialog.result(text);
 
                 if (!ok) goto fail;
-            } while(text.isEmpty());
+            } while(text.isEmpty() == true);
 
             if (strcasecmp(opt->name, "password") == 0 && (vpn->password_set == 0 || vpn->form_pass_attempt != 0)) {
                 vpn->ss->set_password(text);

diff --git a/vpninfo.h b/vpninfo.h
@@ -40,6 +40,13 @@ class VpnInfo
     SOCKET get_cmd_fd() {
         return cmd_fd;
     }
+    void reset_vpn() {
+        openconnect_reset_ssl(vpninfo);
+        form_pass_attempt = 0;
+        password_set = 0;
+        authgroup_set = 0;
+        form_attempt = 0;
+    }
     bool get_minimize() {
         return ss->get_minimize();
     }