chore: update ech handling

Author: wwqgtxx

component/tls/reality.go

@@ -36,13 +36,13 @@ type RealityConfig struct {
 	SupportX25519MLKEM768 bool
 }
 
-func GetRealityConn(ctx context.Context, conn net.Conn, fingerprint UClientHelloID, tlsConfig *Config, realityConfig *RealityConfig) (net.Conn, error) {
+func GetRealityConn(ctx context.Context, conn net.Conn, fingerprint UClientHelloID, serverName string, realityConfig *RealityConfig) (net.Conn, error) {
 	for retry := 0; ; retry++ {
 		verifier := &realityVerifier{
-			serverName: tlsConfig.ServerName,
+			serverName: serverName,
 		}
 		uConfig := &utls.Config{
-			ServerName:             tlsConfig.ServerName,
+			ServerName:             serverName,
 			InsecureSkipVerify:     true,
 			SessionTicketsDisabled: true,
 			VerifyPeerCertificate:  verifier.VerifyPeerCertificate,

transport/gun/gun.go

@@ -259,14 +259,13 @@ func NewHTTP2Client(dialFn DialFn, tlsConfig *tls.Config, clientFingerprint stri
 		}
 
 		if clientFingerprint, ok := tlsC.GetFingerprint(clientFingerprint); ok {
-			tlsConfig := tlsC.UConfig(cfg)
-			err := echConfig.ClientHandleUTLS(ctx, tlsConfig)
-			if err != nil {
-				pconn.Close()
-				return nil, err
-			}
-
 			if realityConfig == nil {
+				tlsConfig := tlsC.UConfig(cfg)
+				err := echConfig.ClientHandleUTLS(ctx, tlsConfig)
+				if err != nil {
+					pconn.Close()
+					return nil, err
+				}
 				tlsConn := tlsC.UClient(pconn, tlsConfig, clientFingerprint)
 				if err := tlsConn.HandshakeContext(ctx); err != nil {
 					pconn.Close()
@@ -279,7 +278,7 @@ func NewHTTP2Client(dialFn DialFn, tlsConfig *tls.Config, clientFingerprint stri
 				}
 				return tlsConn, nil
 			} else {
-				realityConn, err := tlsC.GetRealityConn(ctx, pconn, clientFingerprint, tlsConfig, realityConfig)
+				realityConn, err := tlsC.GetRealityConn(ctx, pconn, clientFingerprint, cfg.ServerName, realityConfig)
 				if err != nil {
 					pconn.Close()
 					return nil, err
@@ -296,25 +295,10 @@ func NewHTTP2Client(dialFn DialFn, tlsConfig *tls.Config, clientFingerprint stri
 			return nil, errors.New("REALITY is based on uTLS, please set a client-fingerprint")
 		}
 
-		if echConfig != nil {
-			tlsConfig := tlsC.UConfig(cfg)
-			err := echConfig.ClientHandleUTLS(ctx, tlsConfig)
-			if err != nil {
-				pconn.Close()
-				return nil, err
-			}
-
-			conn := tlsC.Client(pconn, tlsConfig)
-			if err := conn.HandshakeContext(ctx); err != nil {
-				pconn.Close()
-				return nil, err
-			}
-			state := conn.ConnectionState()
-			if p := state.NegotiatedProtocol; p != http.Http2NextProtoTLS {
-				conn.Close()
-				return nil, fmt.Errorf("http2: unexpected ALPN protocol %s, want %s", p, http.Http2NextProtoTLS)
-			}
-			return conn, nil
+		err = echConfig.ClientHandle(ctx, cfg)
+		if err != nil {
+			pconn.Close()
+			return nil, err
 		}
 
 		conn := tls.Client(pconn, cfg)

transport/vmess/tls.go

@@ -44,38 +44,29 @@ func StreamTLSConn(ctx context.Context, conn net.Conn, cfg *TLSConfig) (net.Conn
 	}
 
 	if clientFingerprint, ok := tlsC.GetFingerprint(cfg.ClientFingerprint); ok {
-		tlsConfig := tlsC.UConfig(tlsConfig)
-		err = cfg.ECH.ClientHandleUTLS(ctx, tlsConfig)
-		if err != nil {
-			return nil, err
-		}
-
 		if cfg.Reality == nil {
+			tlsConfig := tlsC.UConfig(tlsConfig)
+			err = cfg.ECH.ClientHandleUTLS(ctx, tlsConfig)
+			if err != nil {
+				return nil, err
+			}
 			tlsConn := tlsC.UClient(conn, tlsConfig, clientFingerprint)
 			err = tlsConn.HandshakeContext(ctx)
 			if err != nil {
 				return nil, err
 			}
 			return tlsConn, nil
 		} else {
-			return tlsC.GetRealityConn(ctx, conn, clientFingerprint, tlsConfig, cfg.Reality)
+			return tlsC.GetRealityConn(ctx, conn, clientFingerprint, tlsConfig.ServerName, cfg.Reality)
 		}
 	}
 	if cfg.Reality != nil {
 		return nil, errors.New("REALITY is based on uTLS, please set a client-fingerprint")
 	}
 
-	if cfg.ECH != nil {
-		tlsConfig := tlsC.UConfig(tlsConfig)
-		err = cfg.ECH.ClientHandleUTLS(ctx, tlsConfig)
-		if err != nil {
-			return nil, err
-		}
-
-		tlsConn := tlsC.Client(conn, tlsConfig)
-
-		err = tlsConn.HandshakeContext(ctx)
-		return tlsConn, err
+	err = cfg.ECH.ClientHandle(ctx, tlsConfig)
+	if err != nil {
+		return nil, err
 	}
 
 	tlsConn := tls.Client(conn, tlsConfig)

transport/vmess/websocket.go

@@ -370,17 +370,11 @@ func streamWebsocketConn(ctx context.Context, conn net.Conn, c *WebsocketConfig,
 				return nil, err
 			}
 			conn = tlsConn
-		} else if c.ECHConfig != nil {
-			tlsConfig := tlsC.UConfig(config)
-			err = c.ECHConfig.ClientHandleUTLS(ctx, tlsConfig)
+		} else {
+			err = c.ECHConfig.ClientHandle(ctx, config)
 			if err != nil {
 				return nil, err
 			}
-			tlsConn := tlsC.Client(conn, tlsConfig)
-
-			err = tlsConn.HandshakeContext(ctx)
-			conn = tlsConn
-		} else {
 			tlsConn := tls.Client(conn, config)
 			err = tlsConn.HandshakeContext(ctx)
 			if err != nil {