Skip to content

TLS ECH client: Revert echForceQuery's behavior #4971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RPRX merged 6 commits into from
Aug 3, 2025
Merged

TLS ECH client: Revert echForceQuery's behavior #4971

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
188e4af
update ech
patterniha Aug 1, 2025
2ede1c0
update test
patterniha Aug 2, 2025
9ef0f41
Update ech.go
patterniha Aug 3, 2025
123f63e
Merge branch 'XTLS:main' into ech-features
patterniha Aug 3, 2025
99e3b1b
update
patterniha Aug 3, 2025
4f1bf01
Merge branch 'ech-features' of https://github.com/patterniha/Xray-cor…
patterniha Aug 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions transport/internet/tls/ech.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func ApplyECH(c *Config, config *tls.Config) error {
defer func() {
// if failed to get ECHConfig, use an invalid one to make connection fail
if err != nil {
if c.EchForceQuery {
if c.EchForceQuery || errors.Cause(err) != dns2.ErrEmptyResponse {
ECHConfig = []byte{1, 1, 4, 5, 1, 4}
}
}
Expand Down Expand Up @@ -129,7 +129,7 @@ func (c *ECHConfigCache) Update(domain string, server string, isLockedUpdate boo
errors.LogDebug(context.Background(), "Trying to query ECH config for domain: ", domain, " with ECH server: ", server)
echConfig, ttl, err := dnsQuery(server, domain, sockopt)
if err != nil {
if forceQuery || ttl == 0 {
if forceQuery || errors.Cause(err) != dns2.ErrEmptyResponse {
return nil, err
}
}
Expand Down
Loading