From 4b0310be5af9e60505c2a8b2a7ed595f11cb24fe Mon Sep 17 00:00:00 2001
From: ReleTor <191429954+ReleTor@users.noreply.github.com>
Date: Sat, 12 Apr 2025 15:56:50 +0800
Subject: [PATCH] p1 commit

---
 common/tls/ech.go | 9 ++++++---
 option/tls.go     | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/tls/ech.go b/common/tls/ech.go
index ddb9b5dd..e019ff67 100644
--- a/common/tls/ech.go
+++ b/common/tls/ech.go
@@ -45,8 +45,10 @@ func parseECHClientConfig(ctx context.Context, options option.OutboundTLSOptions
 		}
 		tlsConfig.EncryptedClientHelloConfigList = block.Bytes
 		return &STDClientConfig{tlsConfig}, nil
+	} else if options.ECH.Domain != "" {
+		return &STDECHClientConfig{STDClientConfig{tlsConfig}, options.ECH.Domain, service.FromContext[adapter.DNSRouter](ctx)}, nil
 	} else {
-		return &STDECHClientConfig{STDClientConfig{tlsConfig}, service.FromContext[adapter.DNSRouter](ctx)}, nil
+		return &STDECHClientConfig{STDClientConfig{tlsConfig}, tlsConfig.ServerName, service.FromContext[adapter.DNSRouter](ctx)}, nil
 	}
 }
 
@@ -99,6 +101,7 @@ func reloadECHKeys(echKeyPath string, tlsConfig *tls.Config) error {
 
 type STDECHClientConfig struct {
 	STDClientConfig
+	domain    string
 	dnsRouter adapter.DNSRouter
 }
 
@@ -110,7 +113,7 @@ func (s *STDECHClientConfig) ClientHandshake(ctx context.Context, conn net.Conn)
 			},
 			Question: []mDNS.Question{
 				{
-					Name:   mDNS.Fqdn(s.config.ServerName),
+					Name:   mDNS.Fqdn(s.domain),
 					Qtype:  mDNS.TypeHTTPS,
 					Qclass: mDNS.ClassINET,
 				},
@@ -155,7 +158,7 @@ func (s *STDECHClientConfig) ClientHandshake(ctx context.Context, conn net.Conn)
 }
 
 func (s *STDECHClientConfig) Clone() Config {
-	return &STDECHClientConfig{STDClientConfig{s.config.Clone()}, s.dnsRouter}
+	return &STDECHClientConfig{STDClientConfig{s.config.Clone()}, s.domain, s.dnsRouter}
 }
 
 func UnmarshalECHKeys(raw []byte) ([]tls.EncryptedClientHelloKey, error) {
diff --git a/option/tls.go b/option/tls.go
index 13e75306..f446b271 100644
--- a/option/tls.go
+++ b/option/tls.go
@@ -97,6 +97,7 @@ type OutboundECHOptions struct {
 	Enabled    bool                       `json:"enabled,omitempty"`
 	Config     badoption.Listable[string] `json:"config,omitempty"`
 	ConfigPath string                     `json:"config_path,omitempty"`
+	Domain     string                     `json:"domain,omitempty"`
 
 	// Deprecated: not supported by stdlib
 	PQSignatureSchemesEnabled bool `json:"pq_signature_schemes_enabled,omitempty"`