Fix the use of ServerName in ECH config

v2fly · Oct 12, 2024 · a5db83a · a5db83a
1 parent 6a242d1
commit a5db83a
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
  }