From 72892dac2f56593beefc15b6a6e8cefb338d6298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=8E=E6=89=87=E6=BB=91=E7=BF=94=E7=BF=BC?=
 <Fangliding.fshxy@outlook.com>
Date: Tue, 17 Sep 2024 17:14:13 +0000
Subject: [PATCH] Use internet.DialSystem Due to
 https://github.com/v2fly/v2ray-core/pull/3162#issuecomment-2355879556

---
 transport/internet/tls/ech.go | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/transport/internet/tls/ech.go b/transport/internet/tls/ech.go
index 9471384d..a7985899 100644
--- a/transport/internet/tls/ech.go
+++ b/transport/internet/tls/ech.go
@@ -5,6 +5,7 @@ package tls
 
 import (
 	"bytes"
+	"context"
 	"crypto/tls"
 	"encoding/base64"
 	"io"
@@ -15,6 +16,8 @@ import (
 
 	"github.com/miekg/dns"
 	"github.com/xtls/xray-core/common/errors"
+	"github.com/xtls/xray-core/common/net"
+	"github.com/xtls/xray-core/transport/internet"
 )
 
 func ApplyECH(c *Config, config *tls.Config) error {
@@ -58,6 +61,7 @@ func QueryRecord(domain string, server string) (string, error) {
 	}
 	mutex.Lock()
 	defer mutex.Unlock()
+	errors.LogDebug(context.Background(), "Tring to query ECH config for domain: ", domain, " with ECH server: ", server)
 	record, ttl, err := dohQuery(server, domain)
 	if err != nil {
 		return "", err
@@ -79,8 +83,24 @@ func dohQuery(server string, domain string) (string, uint32, error) {
 	if err != nil {
 		return "", 0, err
 	}
+	tr := &http.Transport{
+		IdleConnTimeout:   90 * time.Second,
+		ForceAttemptHTTP2: true,
+		DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
+			dest, err := net.ParseDestination(network + ":" + addr)
+			if err != nil {
+				return nil, err
+			}
+			conn, err := internet.DialSystem(ctx, dest, nil)
+			if err != nil {
+				return nil, err
+			}
+			return conn, nil
+		},
+	}
 	client := &http.Client{
-		Timeout: 5 * time.Second,
+		Timeout:   5 * time.Second,
+		Transport: tr,
 	}
 	req, err := http.NewRequest("POST", server, bytes.NewReader(msg))
 	if err != nil {
@@ -108,6 +128,7 @@ func dohQuery(server string, domain string) (string, uint32, error) {
 		re := regexp.MustCompile(`ech="([^"]+)"`)
 		match := re.FindStringSubmatch(respMsg.Answer[0].String())
 		if match[1] != "" {
+			errors.LogDebug(context.Background(), "Get ECH config:", match[1], " TTL:", respMsg.Answer[0].Header().Ttl)
 			return match[1], respMsg.Answer[0].Header().Ttl, nil
 		}
 	}