mirrors/Xray-core
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-06-19 22:58:03 +03:00
Code Issues Releases Activity

Merge branch 'dns' into dns-geo

Browse Source
This commit is contained in:
秋のかえで
2021-04-07 23:17:59 +08:00
parent 946a7a2647 f4a048aa0c
commit 8a7cd65fc2
35 changed files with 458 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
infra/conf/dns_test.go
View File

@ -68,6 +68,7 @@ func TestDNSConfigParsing(t *testing.T) {
Input: `{
"servers": [{
"address": "8.8.8.8",
"clientIp": "10.0.0.1",
"port": 5353,
"domains": ["domain:example.com"]
}],
@ -95,6 +96,7 @@ func TestDNSConfigParsing(t *testing.T) {
Network: net.Network_UDP,
Port: 5353,
},
ClientIp: []byte{10, 0, 0, 1},
PrioritizedDomain: []*domain.Domain{
{
Type: domain.MatchingType_Subdomain,