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

Address code review comments

pull/506/head
Christopher Ng 2022-05-23 11:44:45 +01:00
parent 65a944216e
commit 07b7ba623f
21 changed files with 53 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openvpn.c
View File

@ -2100,13 +2100,14 @@ static char* PrepareStartJsonRequest(connection_t *c, wchar_t *exit_event_name)
const char *body = json_object_to_json_string(jobj); const char *body = json_object_to_json_string(jobj);
char *request = calloc(1, strlen(request_header) + strlen(body) + 1); int len = snprintf(NULL, 0, request_header, strlen(body)) + strlen(body) + 1;
char *request = calloc(1, len);
if (request == NULL) if (request == NULL)
{ {
goto out; goto out;
} }
sprintf(request, request_header, strlen(body)); sprintf_s(request, len, request_header, strlen(body));
strcat(request, body); strcat_s(request, len, body);
out: out:
json_object_put(jobj); json_object_put(jobj);
@ -2227,6 +2228,15 @@ StartOpenVPN(connection_t *c)
goto out; goto out;
} }
} }
#ifdef ENABLE_OVPN3
else if (o.ovpn_engine == OPENVPN_ENGINE_OVPN3)
{
ShowLocalizedMsg (IDS_ERR_WRITE_SERVICE_PIPE);
CloseHandle(c->exit_event);
CloseServiceIO(&c->iserv);
goto out;
}
#endif
else else
{ {
/* Start OpenVPN directly */ /* Start OpenVPN directly */

4
res/openvpn-gui-res-cs.rc
View File

@ -212,8 +212,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-de.rc
View File

@ -213,8 +213,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-dk.rc
View File

@ -212,8 +212,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

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

@ -226,8 +226,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-es.rc
View File

@ -210,8 +210,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-fi.rc
View File

@ -211,8 +211,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-fr.rc
View File

@ -211,8 +211,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-it.rc
View File

@ -167,8 +167,8 @@ BEGIN
AUTORADIOBUTTON "&Mai", ID_RB_BALLOON0, 28, 200, 200, 10 AUTORADIOBUTTON "&Mai", ID_RB_BALLOON0, 28, 200, 200, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* Advanced Dialog */ /* Advanced Dialog */

4
res/openvpn-gui-res-jp.rc
View File

@ -212,8 +212,8 @@ BEGIN
LTEXT "時間", 209, 190, 260, 40, 10 LTEXT "時間", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-kr.rc
View File

@ -213,8 +213,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-nl.rc
View File

@ -168,8 +168,8 @@ BEGIN
AUTORADIOBUTTON "Nooit", ID_RB_BALLOON0, 181, 170, 40, 10 AUTORADIOBUTTON "Nooit", ID_RB_BALLOON0, 181, 170, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* Advanced Dialog */ /* Advanced Dialog */

4
res/openvpn-gui-res-no.rc
View File

@ -211,8 +211,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-pl.rc
View File

@ -212,8 +212,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-pt.rc
View File

@ -210,8 +210,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-ru.rc
View File

@ -213,8 +213,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-se.rc
View File

@ -210,8 +210,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-tr.rc
View File

@ -212,8 +212,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-ua.rc
View File

@ -211,8 +211,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-zh-hans.rc
View File

@ -214,8 +214,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */

4
res/openvpn-gui-res-zh-hant.rc
View File

@ -214,8 +214,8 @@ BEGIN
LTEXT "hours", 209, 190, 260, 40, 10 LTEXT "hours", 209, 190, 260, 40, 10
GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30 GROUPBOX "OpenVPN Engine", ID_RB_ENGINE_SELECTION, 6, 162, 235, 30
AUTORADIOBUTTON "openvpn2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "OpenVPN2", ID_RB_ENGINE_OVPN2, 18, 175, 50, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "openvpn3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10 AUTORADIOBUTTON "OpenVPN3 (experimental)", ID_RB_ENGINE_OVPN3, 76, 175, 90, 10
END END
/* About Dialog */ /* About Dialog */