github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #112 from selvanair/master 

Some error reporting improvements
pull/116/head
Selva Nair 2017-01-04 17:11:53 -05:00 committed by GitHub
parent d82471d927 9cea37ad80
commit 5af421861d
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.rst
View File

@ -185,7 +185,8 @@ log_append
silent_connection silent_connection
If set to "1", the status window with the OpenVPN log output will If set to "1", the status window with the OpenVPN log output will
not be showed while connecting. not be shown while connecting. Warnings such as interactive service
not started or multiple config files with same name are also suppressed.
service_only service_only
If set to "1", OpenVPN GUI's normal "Connect" and "Disconnect" If set to "1", OpenVPN GUI's normal "Connect" and "Disconnect"

2
main.c
View File

@ -189,7 +189,7 @@ int WINAPI _tWinMain (HINSTANCE hThisInstance,
exit(1); exit(1);
} }
if (!IsUserAdmin() && strtod(o.ovpn_version, NULL) > 2.3) if (!IsUserAdmin() && strtod(o.ovpn_version, NULL) > 2.3 && !o.silent_connection)
CheckIServiceStatus(TRUE); CheckIServiceStatus(TRUE);
BuildFileList(); BuildFileList();

2
openvpn.c
View File

@ -191,7 +191,7 @@ OnStateChange(connection_t *c, char *data)
return; return;
*pos = '\0'; *pos = '\0';
if (strcmp(state, "CONNECTED") == 0) if (strcmp(state, "CONNECTED") == 0 && strcmp(message, "SUCCESS") == 0)
{ {
/* Run Connect Script */ /* Run Connect Script */
if (c->state == connecting || c->state == resuming) if (c->state == connecting || c->state == resuming)

3
openvpn_config.c
View File

@ -221,6 +221,9 @@ BuildFileList()
{ {
static bool issue_warnings = true; static bool issue_warnings = true;
if (o.silent_connection)
issue_warnings = false;
/* /*
* If no connections are active reset num_configs and rescan * If no connections are active reset num_configs and rescan
* to make a new list. Else we keep all current configs and * to make a new list. Else we keep all current configs and

2
res/openvpn-gui-res-en.rc
View File

@ -355,7 +355,7 @@ BEGIN
"--allow_proxy\t\t: 1=Show Proxy Settings menu.\n" \ "--allow_proxy\t\t: 1=Show Proxy Settings menu.\n" \
"--show_balloon\t\t: 0=Never, 1=At initial connect, 2=At every re-connect.\n" \ "--show_balloon\t\t: 0=Never, 1=At initial connect, 2=At every re-connect.\n" \
"--service_only\t\t: 1=Enable Service Only mode.\n" \ "--service_only\t\t: 1=Enable Service Only mode.\n" \
"--silent_connection\t\t: 1=Do not show the status dialog while connecting.\n" \ "--silent_connection\t\t: 1=Do not show the status dialog while connecting or non-critical warnings at startup.\n" \
"--show_script_window\t: 0=Hide Script execution window, 1=Show it.\n" \ "--show_script_window\t: 0=Hide Script execution window, 1=Show it.\n" \
"--passphrase_attempts\t: Number of passphrase attempts to allow.\n" \ "--passphrase_attempts\t: Number of passphrase attempts to allow.\n" \
"--connectscript_timeout\t: Time to wait for connect script to finish.\n" \ "--connectscript_timeout\t: Time to wait for connect script to finish.\n" \