lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-01-01 06:55:25 -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

9
transport/internet/tcp/hub.go
View File

@@ -37,12 +37,11 @@ func ListenTCP(ctx context.Context, address net.Address, port net.Port, addConn
config: tcpSettings,
addConn: addConn,
}
if securitySettings := internet.SecuritySettingsFromContext(ctx); securitySettings != nil {
tlsConfig, ok := securitySettings.(*tls.Config)
if ok {
l.tlsConfig = tlsConfig.GetTLSConfig()
}
if config := tls.ConfigFromContext(ctx); config != nil {
l.tlsConfig = config.GetTLSConfig()
}
if tcpSettings.HeaderSettings != nil {
headerConfig, err := tcpSettings.HeaderSettings.GetInstance()
if err != nil {