AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-07-13 03:04:58 +03:00
Code Releases Activity

Cedar/SM.c: move UDP ports setting outside of the OpenVPN/SSTP dialog

Browse Source 
This commit moves the UDP ports setting right below the TCP listeners and uses the new RPC methods to get and set them.
This commit is contained in:
Davide Beatrici
2020-05-20 04:41:18 +02:00
parent c52e49de2d
commit c4838006b1
10 changed files with 105 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/PenCore/PenCore.rc
View File

@ -995,7 +995,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 420
TOPMARGIN, 5
BOTTOMMARGIN, 326
BOTTOMMARGIN, 303
END
D_SM_DDNS, DIALOG
@ -1908,11 +1908,11 @@ BEGIN
PUSHBUTTON "@B_DELETE",B_DELETE,385,129,39,16
GROUPBOX "@STATIC1",IDC_STATIC,7,149,176,106
LTEXT "@STATIC2",IDC_STATIC,14,160,108,9
CONTROL "",L_LISTENER,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,14,173,109,76
PUSHBUTTON "@B_CREATE_LISTENER",B_CREATE_LISTENER,128,170,48,16
PUSHBUTTON "@B_DELETE_LISTENER",B_DELETE_LISTENER,128,191,48,16
PUSHBUTTON "@B_START",B_START,128,211,48,16
PUSHBUTTON "@B_STOP",B_STOP,128,232,48,16
CONTROL "",L_LISTENER,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_AUTOARRANGE | WS_BORDER | WS_TABSTOP,14,172,109,48
PUSHBUTTON "@B_CREATE_LISTENER",B_CREATE_LISTENER,128,172,48,12
PUSHBUTTON "@B_DELETE_LISTENER",B_DELETE_LISTENER,128,184,48,12
PUSHBUTTON "@B_START",B_START,128,196,48,12
PUSHBUTTON "@B_STOP",B_STOP,128,208,48,12
GROUPBOX "@STATIC3",IDC_STATIC,187,149,245,106
ICON ICO_KEY,IDC_STATIC,194,161,20,18
PUSHBUTTON "@B_SSL",B_SSL,218,163,100,16
@ -1951,6 +1951,9 @@ BEGIN
PUSHBUTTON "@B_REFRESH",B_REFRESH,307,281,71,16
PUSHBUTTON "@IDCANCEL",IDCANCEL,381,281,50,16
ICON ICO_AZURE,IDC_STATIC,108,281,20,18
EDITTEXT E_UDP,14,224,109,12,ES_AUTOHSCROLL
LTEXT "@S_UDP",S_UDP,14,238,162,16
PUSHBUTTON "@B_APPLY",B_APPLY,128,224,48,12
END
D_SM_STATUS DIALOGEX 0, 0, 335, 250
@ -4066,34 +4069,30 @@ BEGIN
LTEXT "@S07",IDC_STATIC,88,51,154,55
END
D_SM_OPENVPN DIALOGEX 0, 0, 427, 331
D_SM_OPENVPN DIALOGEX 0, 0, 427, 308
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "@D_SM_OPENVPN"
FONT 9, "MS Shell Dlg", 400, 0, 0x80
BEGIN
ICON ICO_OPENVPN,IDC_STATIC,7,5,20,18
LTEXT "@S_TITLE",S_TITLE,32,6,385,16
GROUPBOX "@S_13",IDC_STATIC,8,26,409,173
GROUPBOX "@S_13",IDC_STATIC,7,26,409,142
LTEXT "@S_1",IDC_STATIC,15,36,195,37
CONTROL 205,IDC_STATIC,"Static",SS_BITMAP,217,35,194,75
CONTROL "@R_OPENVPN",R_OPENVPN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,75,194,9
LTEXT "@S_UDP",S_UDP,25,87,186,9
EDITTEXT E_UDP,25,96,127,13,ES_AUTOHSCROLL
PUSHBUTTON "@B_DEFAULT",B_DEFAULT,159,95,52,15
LTEXT "@S_UDP2",S_UDP2,26,113,383,24
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,138,395,1
LTEXT "@S_TOOL",S_TOOL,15,143,392,12
LTEXT "@S_TOOL2",S_TOOL2,24,157,385,22
PUSHBUTTON "@B_CONFIG",B_CONFIG,120,177,189,15
GROUPBOX "@S_2",IDC_STATIC,7,202,409,98
LTEXT "@S_3",IDC_STATIC,14,212,195,37
CONTROL 206,IDC_STATIC,"Static",SS_BITMAP,215,209,194,85
CONTROL "@R_SSTP",R_SSTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,252,194,9
LTEXT "@S_SSTP",S_SSTP,21,265,188,33
LTEXT "@S_4",IDC_STATIC,7,302,186,24
PUSHBUTTON "@B_IPSEC",B_IPSEC,195,311,93,15
DEFPUSHBUTTON "@IDOK",IDOK,311,311,52,14
PUSHBUTTON "@IDCANCEL",IDCANCEL,368,311,52,14
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,14,107,395,1
LTEXT "@S_TOOL",S_TOOL,15,112,392,12
LTEXT "@S_TOOL2",S_TOOL2,24,126,385,22
PUSHBUTTON "@B_CONFIG",B_CONFIG,120,146,189,15
GROUPBOX "@S_2",IDC_STATIC,7,175,409,98
LTEXT "@S_3",IDC_STATIC,14,185,195,37
CONTROL 206,IDC_STATIC,"Static",SS_BITMAP,215,182,194,85
CONTROL "@R_SSTP",R_SSTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,225,194,9
LTEXT "@S_SSTP",S_SSTP,21,238,188,33
LTEXT "@S_4",IDC_STATIC,7,279,186,24
PUSHBUTTON "@B_IPSEC",B_IPSEC,195,288,93,15
DEFPUSHBUTTON "@IDOK",IDOK,311,288,52,14
PUSHBUTTON "@IDCANCEL",IDCANCEL,368,288,52,14
END
D_SM_DDNS DIALOGEX 0, 0, 415, 287

3
src/PenCore/resource.h
View File

@ -396,7 +396,6 @@
#define B_IPSEC 1096
#define S_INFO 1097
#define B_OPENVPN 1097
#define B_DEFAULT 1097
#define S_PORT 1098
#define B_BRIDGE2 1098
#define B_DDNS 1098
@ -960,7 +959,7 @@
#define S_WIN8 1457
#define R_OPENVPN 1458
#define S_UDP 1459
#define S_UDP2 1460
#define B_APPLY 1460
#define S_TOOL 1461
#define S_TOOL2 1462
#define R_SSTP 1463