hesoyam/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-05-14 18:09:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dns): inheritance issue with disableCache (#5351)

Browse Source
This commit is contained in:
Meow
2025-11-27 10:12:37 +08:00
committed by GitHub
parent 9d3401b6f0
commit ed5f7e7af5
5 changed files with 108 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
infra/conf/dns.go
+4 -4
View File
@@ -26,8 +26,8 @@ type NameServerConfig struct {
QueryStrategy string `json:"queryStrategy"`
Tag string `json:"tag"`
TimeoutMs uint64 `json:"timeoutMs"`
DisableCache bool `json:"disableCache"`
ServeStale bool `json:"serveStale"`
DisableCache *bool `json:"disableCache"`
ServeStale *bool `json:"serveStale"`
ServeExpiredTTL *uint32 `json:"serveExpiredTTL"`
FinalQuery bool `json:"finalQuery"`
UnexpectedIPs StringList `json:"unexpectedIPs"`
@@ -52,8 +52,8 @@ func (c *NameServerConfig) UnmarshalJSON(data []byte) error {
QueryStrategy string `json:"queryStrategy"`
Tag string `json:"tag"`
TimeoutMs uint64 `json:"timeoutMs"`
DisableCache bool `json:"disableCache"`
ServeStale bool `json:"serveStale"`
DisableCache *bool `json:"disableCache"`
ServeStale *bool `json:"serveStale"`
ServeExpiredTTL *uint32 `json:"serveExpiredTTL"`
FinalQuery bool `json:"finalQuery"`
UnexpectedIPs StringList `json:"unexpectedIPs"`
infra/conf/dns_test.go
+2 -1
View File
@@ -20,6 +20,7 @@ func TestDNSConfigParsing(t *testing.T) {
return config.Build()
}
}
expectedServeStale := true
expectedServeExpiredTTL := uint32(172800)
runMultiTestCase(t, []TestCase{
{
@@ -72,7 +73,7 @@ func TestDNSConfigParsing(t *testing.T) {
Size: 1,
},
},
ServeStale: true,
ServeStale: &expectedServeStale,
ServeExpiredTTL: &expectedServeExpiredTTL,
PolicyID: 1, // Servers with certain identical fields share this ID, incrementing starting from 1. See: Build PolicyID
},