lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
dyhkwong 2024-10-13 02:59:43 +08:00 committed by GitHub
parent 9ae5e71711
commit 13bad86c3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
transport/internet/tls/ech.go
View File

@ -24,10 +24,11 @@ func ApplyECH(c *Config, config *tls.Config) error {
if len(c.EchConfig) > 0 { if len(c.EchConfig) > 0 {
ECHConfig = c.EchConfig ECHConfig = c.EchConfig
} else { // ECH config > DOH lookup } else { // ECH config > DOH lookup
if config.ServerName == "" { addr := net.ParseAddress(config.ServerName)
return newError("Using DOH for ECH needs 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 { if err != nil {
return err return err
} }