github
/
Xray-core
mirror of https://github.com/XTLS/Xray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 115825f65c into c569f478af

风扇滑翔翼 2025-07-28 07:20:58 +08:00 committed by GitHub
parent c569f478af 115825f65c
commit 0be593a5d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,13 @@ func ApplyECH(c *Config, config *tls.Config) error {
// for client // for client
if len(c.EchConfigList) != 0 { if len(c.EchConfigList) != 0 {
defer func() {
// if failed to get ECHConfig, use an invalid one to make connection fail
if err != nil {
ECHConfig = []byte{1, 1, 4, 5, 1, 4}
}
config.EncryptedClientHelloConfigList = ECHConfig
}()
// direct base64 config // direct base64 config
if strings.Contains(c.EchConfigList, "://") { if strings.Contains(c.EchConfigList, "://") {
// query config from dns // query config from dns
@ -61,8 +68,6 @@ func ApplyECH(c *Config, config *tls.Config) error {
return errors.New("Failed to unmarshal ECHConfigList: ", err) return errors.New("Failed to unmarshal ECHConfigList: ", err)
} }
} }
config.EncryptedClientHelloConfigList = ECHConfig
} }
// for server // for server
@ -239,6 +244,7 @@ func dnsQuery(server string, domain string) ([]byte, uint32, error) {
} }
conn.Write(msg) conn.Write(msg)
udpResponse := make([]byte, 512) udpResponse := make([]byte, 512)
conn.SetReadDeadline(time.Now().Add(5 * time.Second))
_, err = conn.Read(udpResponse) _, err = conn.Read(udpResponse)
if err != nil { if err != nil {
return []byte{}, 0, err return []byte{}, 0, err