package/v2ray_simple
1
0
Fork 0
mirror of https://github.com/e1732a364fed/v2ray_simple.git synced 2025-10-16 13:50:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

修订代码;将addr的赋值从各个proxy自己的方法中提出来

Browse Source
This commit is contained in:
hahahrfool
2022-03-23 18:54:38 +08:00
parent b2c6abe330
commit 8c6ed6377d
9 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/proxy.go
View File

@@ -121,7 +121,7 @@ func prepareTLS_forClient(com ProxyCommon, dc *DialConf) error {
func prepareTLS_forServer(com ProxyCommon, lc *ListenConf) error {
// 这里直接不检查 字符串就直接传给 tlsLayer.NewServer
// 所以要求 cert和 key 不在程序本身目录 的话，就要给出完整路径
tlsserver, err := tlsLayer.NewServer(lc.GetAddr(), lc.Host, lc.TLSCert, lc.TLSKey, lc.Insecure)
tlsserver, err := tlsLayer.NewServer(lc.Host, lc.TLSCert, lc.TLSKey, lc.Insecure)
if err == nil {
com.setTLS_Server(tlsserver)
} else {
@@ -150,7 +150,7 @@ func prepareTLS_forProxyCommon_withURL(u *url.URL, isclient bool, com ProxyCommo
hostAndPort := u.Host
sni, _, _ := net.SplitHostPort(hostAndPort)
tlsserver, err := tlsLayer.NewServer(hostAndPort, sni, certFile, keyFile, insecure)
tlsserver, err := tlsLayer.NewServer(sni, certFile, keyFile, insecure)
if err == nil {
com.setTLS_Server(tlsserver)
} else {
@@ -317,7 +317,7 @@ func (s *ProxyCommonStruct) initWS_client() {
}
}
c, e := ws.NewClient(s.dialConf.GetAddr(), path)
c, e := ws.NewClient(s.dialConf.GetAddrStr(), path)
if e != nil {
log.Fatal("initWS_client failed", e)
}