package/v2ray_simple
1
0
Fork 0
mirror of https://github.com/e1732a364fed/v2ray_simple.git synced 2026-04-23 03:27:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

修订代码,文档;为支持监听PROXY protocol 作准备

Browse Source
This commit is contained in:
e1732a364fed
2022-05-03 19:04:17 +08:00
parent 4f6b4ecf56
commit 9ea5365565
18 changed files with 147 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/tlsConfig.go
+11 -4
View File
@@ -42,7 +42,7 @@ func prepareTLS_forClient(com ProxyCommon, dc *DialConf) error {
return nil
}
clic.setTLS_Client(tlsLayer.NewClient(dc.Host, dc.Insecure, dc.Utls, alpnList))
clic.tls_c = tlsLayer.NewClient(dc.Host, dc.Insecure, dc.Utls, alpnList)
return nil
}
@@ -58,7 +58,7 @@ func prepareTLS_forServer(com ProxyCommon, lc *ListenConf) error {
tlsserver, err := tlsLayer.NewServer(lc.Host, lc.TLSCert, lc.TLSKey, lc.Insecure, alpnList)
if err == nil {
serc.setTLS_Server(tlsserver)
serc.tls_s = tlsserver
} else {
return err
}
@@ -72,11 +72,16 @@ func prepareTLS_forProxyCommon_withURL(u *url.URL, isclient bool, com ProxyCommo
if insecureStr != "" && insecureStr != "false" && insecureStr != "0" {
insecure = true
}
cc := com.getCommon()
if isclient {
utlsStr := u.Query().Get("utls")
useUtls := utlsStr != "" && utlsStr != "false" && utlsStr != "0"
com.getCommon().setTLS_Client(tlsLayer.NewClient(u.Host, insecure, useUtls, nil))
if cc != nil {
cc.tls_c = tlsLayer.NewClient(u.Host, insecure, useUtls, nil)
}
} else {
certFile := u.Query().Get("cert")
@@ -87,7 +92,9 @@ func prepareTLS_forProxyCommon_withURL(u *url.URL, isclient bool, com ProxyCommo
tlsserver, err := tlsLayer.NewServer(sni, certFile, keyFile, insecure, nil)
if err == nil {
com.getCommon().setTLS_Server(tlsserver)
if cc != nil {
cc.tls_s = tlsserver
}
} else {
return err
}