simplify tls config

transport/internet/kcp/dialer.go

@@ -77,17 +77,10 @@ func DialKCP(ctx context.Context, dest net.Destination) (internet.Connection, er
 
 	var iConn internet.Connection = session
 
-	if securitySettings := internet.SecuritySettingsFromContext(ctx); securitySettings != nil {
+	if config := v2tls.ConfigFromContext(ctx, v2tls.WithDestination(dest)); config != nil {
-		switch securitySettings := securitySettings.(type) {
+		tlsConn := tls.Client(iConn, config.GetTLSConfig())
-		case *v2tls.Config:
-			if dest.Address.Family().IsDomain() {
-				securitySettings.OverrideServerNameIfEmpty(dest.Address.Domain())
-			}
-			config := securitySettings.GetTLSConfig()
-			tlsConn := tls.Client(iConn, config)
 		iConn = tlsConn
 	}
-	}
 
 	return iConn, nil
 }

transport/internet/kcp/listener.go

@@ -59,13 +59,11 @@ func NewListener(ctx context.Context, address net.Address, port net.Port, addCon
 		config:   kcpSettings,
 		addConn:  addConn,
 	}
-	securitySettings := internet.SecuritySettingsFromContext(ctx)
+
-	if securitySettings != nil {
+	if config := v2tls.ConfigFromContext(ctx); config != nil {
-		switch securitySettings := securitySettings.(type) {
+		l.tlsConfig = config.GetTLSConfig()
-		case *v2tls.Config:
-			l.tlsConfig = securitySettings.GetTLSConfig()
-		}
 	}
+
 	hub, err := udp.ListenUDP(address, port, udp.ListenOption{Callback: l.OnReceive, Concurrency: 2})
 	if err != nil {
 		return nil, err

transport/internet/tcp/dialer.go

@@ -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 config := tls.ConfigFromContext(ctx, tls.WithDestination(dest)); config != nil {
-		if ok {
+		conn = tls.Client(conn, config.GetTLSConfig())
-			if dest.Address.Family().IsDomain() {
-				tlsConfig.OverrideServerNameIfEmpty(dest.Address.Domain())
-			}
-			config := tlsConfig.GetTLSConfig()
-			conn = tls.Client(conn, config)
-		}
 	}
 
 	tcpSettings := getTCPSettingsFromContext(ctx)

transport/internet/tcp/hub.go

@@ -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 config := tls.ConfigFromContext(ctx); config != nil {
-		if ok {
+		l.tlsConfig = config.GetTLSConfig()
-			l.tlsConfig = tlsConfig.GetTLSConfig()
-		}
 	}
+
 	if tcpSettings.HeaderSettings != nil {
 		headerConfig, err := tcpSettings.HeaderSettings.GetInstance()
 		if err != nil {

transport/internet/tls/config.go

@@ -1,9 +1,12 @@
 package tls
 
 import (
+	"context"
 	"crypto/tls"
 
 	"v2ray.com/core/app/log"
+	"v2ray.com/core/common/net"
+	"v2ray.com/core/transport/internet"
 )
 
 var (
@@ -42,8 +45,26 @@ func (c *Config) GetTLSConfig() *tls.Config {
 	return config
 }
 
-func (c *Config) OverrideServerNameIfEmpty(serverName string) {
+type Option func(*Config)
-	if len(c.ServerName) == 0 {
+
-		c.ServerName = serverName
+func WithDestination(dest net.Destination) Option {
+	return func(config *Config) {
+		if dest.Address.Family().IsDomain() && len(config.ServerName) == 0 {
+			config.ServerName = dest.Address.Domain()
+		}
 	}
 }
+
+func ConfigFromContext(ctx context.Context, opts ...Option) *Config {
+	securitySettings := internet.SecuritySettingsFromContext(ctx)
+	if securitySettings == nil {
+		return nil
+	}
+	if config, ok := securitySettings.(*Config); ok {
+		for _, opt := range opts {
+			opt(config)
+		}
+		return config
+	}
+	return nil
+}

transport/internet/websocket/dialer.go

@@ -42,15 +42,9 @@ func dialWebsocket(ctx context.Context, dest net.Destination) (net.Conn, error)
 
 	protocol := "ws"
 
-	if securitySettings := internet.SecuritySettingsFromContext(ctx); securitySettings != nil {
+	if config := tls.ConfigFromContext(ctx, tls.WithDestination(dest)); config != nil {
-		tlsConfig, ok := securitySettings.(*tls.Config)
-		if ok {
 		protocol = "wss"
-			if dest.Address.Family().IsDomain() {
+		dialer.TLSClientConfig = config.GetTLSConfig()
-				tlsConfig.OverrideServerNameIfEmpty(dest.Address.Domain())
-			}
-			dialer.TLSClientConfig = tlsConfig.GetTLSConfig()
-		}
 	}
 
 	host := dest.NetAddr()

transport/internet/websocket/hub.go

@@ -59,11 +59,8 @@ func ListenWS(ctx context.Context, address net.Address, port net.Port, addConn i
 		config:  wsSettings,
 		addConn: addConn,
 	}
-	if securitySettings := internet.SecuritySettingsFromContext(ctx); securitySettings != nil {
+	if config := v2tls.ConfigFromContext(ctx); config != nil {
-		tlsConfig, ok := securitySettings.(*v2tls.Config)
+		l.tlsConfig = config.GetTLSConfig()
-		if ok {
-			l.tlsConfig = tlsConfig.GetTLSConfig()
-		}
 	}
 
 	err := l.listenws(address, port)