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

Add support for SOCKS5 proxy protocol

Browse Source
This commit is contained in:
Davide Beatrici
2018-10-30 15:11:16 +01:00
parent 919cb2ae75
commit 53e0a2e5e2
16 changed files with 791 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/PenCore/PenCore.rc
View File

@ -1497,7 +1497,7 @@ BEGIN
EDITTEXT S_DESCRIPTION,7,191,289,45,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
END
D_CM_ACCOUNT DIALOGEX 0, 0, 451, 323
D_CM_ACCOUNT DIALOGEX 0, 0, 451, 333
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "@D_CM_ACCOUNT"
FONT 9, "MS Shell Dlg", 400, 0, 0x80
@ -1517,7 +1517,7 @@ BEGIN
LTEXT "@STATIC6",S_STATIC66,172,136,46,10,NOT WS_VISIBLE
RTEXT "@STATIC7",S_STATIC7,14,117,54,9
COMBOBOX C_HUBNAME,72,113,126,62,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "@STATIC8",IDC_STATIC,7,137,206,93
GROUPBOX "@STATIC8",IDC_STATIC,7,137,206,103
ICON ICO_TOWER,IDC_STATIC,14,149,20,18
LTEXT "@STATIC9",IDC_STATIC,40,149,163,17
PUSHBUTTON "@B_IE",B_IE,74,158,114,15
@ -1525,15 +1525,16 @@ BEGIN
CONTROL "@R_DIRECT_TCP",R_DIRECT_TCP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,72,173,135,10
CONTROL "@R_HTTPS",R_HTTPS,"Button",BS_AUTORADIOBUTTON,72,184,135,10
CONTROL "@R_SOCKS",R_SOCKS,"Button",BS_AUTORADIOBUTTON,72,194,135,10
PUSHBUTTON "@B_PROXY_CONFIG",B_PROXY_CONFIG,74,208,114,15
GROUPBOX "@STATIC11",S_STATIC11,7,235,206,69
ICON ICO_CERT,IDC_STATIC,14,245,20,18
CONTROL "@R_CHECK_CERT",R_CHECK_CERT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,249,133,9
PUSHBUTTON "@B_TRUST",B_TRUST,41,263,157,15
PUSHBUTTON "@B_SERVER_CERT",B_SERVER_CERT,41,281,77,15
PUSHBUTTON "@B_VIEW_SERVER_CERT",B_VIEW_SERVER_CERT,123,281,75,15
CONTROL "@R_HIDE",R_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,308,148,9
CONTROL "@R_HIDE2",R_HIDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,308,132,9
CONTROL "@R_SOCKS5",R_SOCKS5,"Button",BS_AUTORADIOBUTTON,72,204,135,10
PUSHBUTTON "@B_PROXY_CONFIG",B_PROXY_CONFIG,74,218,114,15
GROUPBOX "@STATIC11",S_STATIC11,7,245,206,69
ICON ICO_CERT,IDC_STATIC,14,255,20,18
CONTROL "@R_CHECK_CERT",R_CHECK_CERT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,259,133,9
PUSHBUTTON "@B_TRUST",B_TRUST,41,273,157,15
PUSHBUTTON "@B_SERVER_CERT",B_SERVER_CERT,41,291,77,15
PUSHBUTTON "@B_VIEW_SERVER_CERT",B_VIEW_SERVER_CERT,123,291,75,15
CONTROL "@R_HIDE",R_HIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,318,148,9
CONTROL "@R_HIDE2",R_HIDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,318,132,9
CONTROL "",L_VLAN,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,233,17,200,66
GROUPBOX "@S_VLAN_GROUP",S_VLAN_GROUP,224,5,220,88
LTEXT "@S_POLICY_1",S_POLICY_1,258,17,163,24,NOT WS_VISIBLE
@ -1565,8 +1566,8 @@ BEGIN
LTEXT "@S_RETRY_SPAN_2",S_RETRY_SPAN_2,364,252,72,9
CONTROL "@R_INFINITE",R_INFINITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,266,265,171,9
PUSHBUTTON "@B_DETAIL",B_DETAIL,344,277,87,15
DEFPUSHBUTTON "@IDOK",IDOK,308,300,64,17
PUSHBUTTON "@IDCANCEL",IDCANCEL,380,300,64,17
DEFPUSHBUTTON "@IDOK",IDOK,308,310,64,17
PUSHBUTTON "@IDCANCEL",IDCANCEL,380,310,64,17
CONTROL 178,S_ROUTER_LOGO,"Static",SS_BITMAP | NOT WS_VISIBLE,358,5,86,89
END
@ -1824,7 +1825,7 @@ BEGIN
PUSHBUTTON "@IDCANCEL",IDCANCEL,98,288,159,14
END
D_SM_EDIT_SETTING DIALOGEX 0, 0, 435, 263
D_SM_EDIT_SETTING DIALOGEX 0, 0, 435, 273
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "@D_SM_EDIT_SETTING"
FONT 9, "MS Shell Dlg", 400, 0, 0x80
@ -1842,14 +1843,15 @@ BEGIN
RTEXT "@STATIC6",IDC_STATIC,14,113,54,11
COMBOBOX C_PORT,72,110,81,42,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
LTEXT "@STATIC7",IDC_STATIC,159,113,46,10
GROUPBOX "@STATIC8",IDC_STATIC,7,144,206,93
GROUPBOX "@STATIC8",IDC_STATIC,7,144,206,103
ICON ICO_TOWER,IDC_STATIC,14,156,20,18
LTEXT "@STATIC9",IDC_STATIC,40,156,163,17
RTEXT "@STATIC10",IDC_STATIC,14,182,54,10
CONTROL "@R_DIRECT_TCP",R_DIRECT_TCP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,72,180,135,10
CONTROL "@R_HTTPS",R_HTTPS,"Button",BS_AUTORADIOBUTTON,72,191,135,10
CONTROL "@R_SOCKS",R_SOCKS,"Button",BS_AUTORADIOBUTTON,72,201,135,10
PUSHBUTTON "@B_PROXY_CONFIG",B_PROXY_CONFIG,74,215,114,15
CONTROL "@R_SOCKS5",R_SOCKS5,"Button",BS_AUTORADIOBUTTON,72,211,135,10
PUSHBUTTON "@B_PROXY_CONFIG",B_PROXY_CONFIG,74,225,114,15
GROUPBOX "@STATIC11",IDC_STATIC,222,43,206,193
ICON ICO_USER_ADMIN,IDC_STATIC,229,55,20,18
LTEXT "@STATIC12",IDC_STATIC,255,55,165,81
@ -1862,8 +1864,8 @@ BEGIN
RTEXT "@S_PASSWORD",S_PASSWORD,227,208,60,9
EDITTEXT E_PASSWORD,289,206,126,11,ES_PASSWORD | ES_AUTOHSCROLL
CONTROL "@R_NO_SAVE",R_NO_SAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,290,223,127,9
DEFPUSHBUTTON "@IDOK",IDOK,291,240,64,17
PUSHBUTTON "@IDCANCEL",IDCANCEL,364,240,64,17
DEFPUSHBUTTON "@IDOK",IDOK,291,250,64,17
PUSHBUTTON "@IDCANCEL",IDCANCEL,364,250,64,17
CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,233,179,183,1
END
@ -4485,7 +4487,7 @@ BEGIN
CONTROL 232,S_BMP_CN,"Static",SS_BITMAP,7,0,397,173
END
D_SM_PROXY DIALOGEX 0, 0, 227, 143
D_SM_PROXY DIALOGEX 0, 0, 227, 153
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "@D_SM_PROXY"
FONT 9, "MS Shell Dlg", 400, 0, 0x80
@ -4494,11 +4496,12 @@ BEGIN
LTEXT "@STATIC9",IDC_STATIC,33,5,187,17
RTEXT "@STATIC10",IDC_STATIC,7,39,54,10
CONTROL "@R_DIRECT_TCP",R_DIRECT_TCP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,65,37,135,10
CONTROL "@R_HTTPS",R_HTTPS,"Button",BS_AUTORADIOBUTTON,65,47,135,10
CONTROL "@R_HTTPS",R_HTTPS,"Button",BS_AUTORADIOBUTTON,65,48,135,10
CONTROL "@R_SOCKS",R_SOCKS,"Button",BS_AUTORADIOBUTTON,65,58,135,10
PUSHBUTTON "@B_PROXY_CONFIG",B_PROXY_CONFIG,67,78,114,15
DEFPUSHBUTTON "@IDOK",IDOK,87,122,64,15
PUSHBUTTON "@IDCANCEL",IDCANCEL,156,122,64,15
CONTROL "@R_SOCKS5",R_SOCKS5,"Button",BS_AUTORADIOBUTTON,65,68,135,10
PUSHBUTTON "@B_PROXY_CONFIG",B_PROXY_CONFIG,67,88,114,15
DEFPUSHBUTTON "@IDOK",IDOK,87,132,64,15
PUSHBUTTON "@IDCANCEL",IDCANCEL,156,132,64,15
END
D_VGC_LIST DIALOGEX 0, 0, 446, 303

1
src/PenCore/resource.h
View File

@ -317,6 +317,7 @@
#define R_DIRECT_TCP 1057
#define R_HTTPS 1059
#define R_SOCKS 1060
#define R_SOCKS5 1061
#define S_USERNAME 1062
#define E_RETRY_SPAN 1065
#define C_HUBNAME 1066