Fix the use of ServerName in ECH config (#3188)

v2fly · Oct 12, 2024 · 13bad86 · 13bad86
1 parent 9ae5e71
commit 13bad86
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/transport/internet/tls/ech.go b/transport/internet/tls/ech.go
@@ -24,10 +24,11 @@ func ApplyECH(c *Config, config *tls.Config) error {
 	if len(c.EchConfig) > 0 {
 		ECHConfig = c.EchConfig
 	} else { // ECH config > DOH lookup
-		if config.ServerName == "" {
-			return newError("Using DOH for ECH needs serverName")
+		addr := net.ParseAddress(config.ServerName)
+		if !addr.Family().IsDomain() {
+			return newError("Using DOH for ECH needs SNI")
 		}
-		ECHConfig, err = QueryRecord(c.ServerName, c.Ech_DOHserver)
+		ECHConfig, err = QueryRecord(addr.Domain(), c.Ech_DOHserver)
 		if err != nil {
 			return err
 		}