lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-29 05:25:21 -05:00
Code Issues Releases Wiki Activity

simplify tls config

Browse Source
This commit is contained in:
Darien Raymond
2017-12-17 00:53:17 +01:00
parent 9561301fea
commit 048ffbc7dc
7 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
transport/internet/tcp/dialer.go
View File

@@ -19,22 +19,16 @@ func getTCPSettingsFromContext(ctx context.Context) *Config {
}
func Dial(ctx context.Context, dest net.Destination) (internet.Connection, error) {
log.Trace(newError("dailing TCP to ", dest))
log.Trace(newError("dialing TCP to ", dest))
src := internet.DialerSourceFromContext(ctx)
conn, err := internet.DialSystem(ctx, src, dest)
if err != nil {
return nil, err
}
if securitySettings := internet.SecuritySettingsFromContext(ctx); securitySettings != nil {
tlsConfig, ok := securitySettings.(*tls.Config)
if ok {
if dest.Address.Family().IsDomain() {
tlsConfig.OverrideServerNameIfEmpty(dest.Address.Domain())
}
config := tlsConfig.GetTLSConfig()
conn = tls.Client(conn, config)
}
if config := tls.ConfigFromContext(ctx, tls.WithDestination(dest)); config != nil {
conn = tls.Client(conn, config.GetTLSConfig())
}
tcpSettings := getTCPSettingsFromContext(ctx)