Austin/mihomo
1
0
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2024-11-16 11:42:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: tls server name missing in vmess

Browse Source
This commit is contained in:
gVisor bot 2018-11-28 23:24:57 +08:00
parent c04f3748c3
commit a52f29acda
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adapters/outbound/vmess.go
View File

@ -75,7 +75,8 @@ func NewVmess(option VmessOption) (*Vmess, error) {
AlterID: uint16(option.AlterID), AlterID: uint16(option.AlterID),
Security: security, Security: security,
TLS: option.TLS, TLS: option.TLS,
Host: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)), HostName: option.Server,
Port: strconv.Itoa(option.Port),
NetWork: option.Network, NetWork: option.Network,
WebSocketPath: option.WSPath, WebSocketPath: option.WSPath,
SkipCertVerify: option.SkipCertVerify, SkipCertVerify: option.SkipCertVerify,

10
component/vmess/vmess.go
View File

@ -79,7 +79,8 @@ type Config struct {
AlterID uint16 AlterID uint16
Security string Security string
TLS bool TLS bool
Host string HostName string
Port string
NetWork string NetWork string
WebSocketPath string WebSocketPath string
SkipCertVerify bool SkipCertVerify bool
@ -129,9 +130,12 @@ func NewClient(config Config) (*Client, error) {
return nil, fmt.Errorf("Unknown network type: %s", config.NetWork) return nil, fmt.Errorf("Unknown network type: %s", config.NetWork)
} }
host := net.JoinHostPort(config.HostName, config.Port)
var tlsConfig *tls.Config var tlsConfig *tls.Config
if config.TLS { if config.TLS {
tlsConfig = &tls.Config{ tlsConfig = &tls.Config{
ServerName: config.HostName,
InsecureSkipVerify: config.SkipCertVerify, InsecureSkipVerify: config.SkipCertVerify,
ClientSessionCache: config.SessionCacahe, ClientSessionCache: config.SessionCacahe,
} }
@ -143,7 +147,7 @@ func NewClient(config Config) (*Client, error) {
var wsConfig *websocketConfig var wsConfig *websocketConfig
if config.NetWork == "ws" { if config.NetWork == "ws" {
wsConfig = &websocketConfig{ wsConfig = &websocketConfig{
host: config.Host, host: host,
path: config.WebSocketPath, path: config.WebSocketPath,
tls: config.TLS, tls: config.TLS,
tlsConfig: tlsConfig, tlsConfig: tlsConfig,
@ -155,7 +159,7 @@ func NewClient(config Config) (*Client, error) {
uuid: &uid, uuid: &uid,
security: security, security: security,
tls: config.TLS, tls: config.TLS,
host: config.Host, host: host,
wsConfig: wsConfig, wsConfig: wsConfig,
tlsConfig: tlsConfig, tlsConfig: tlsConfig,
}, nil }, nil