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

Merge branch 'dns' into dns-geo

Browse Source
This commit is contained in:
秋のかえで
2021-04-14 13:04:07 +08:00
parent b0a66e650c 7cf30d5101
commit f8b8e8a53a
7 changed files with 110 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dns/config.pb.go
+1 -2
View File
@@ -404,8 +404,7 @@ type Config_HostMapping struct {
Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"`
Ip [][]byte `protobuf:"bytes,3,rep,name=ip,proto3" json:"ip,omitempty"`
// ProxiedDomain indicates the mapped domain has the same IP address on this
// domain. Xray will use this domain for IP queries. This field is only
// effective if ip is empty.
// domain. Xray will use this domain for IP queries.
ProxiedDomain string `protobuf:"bytes,4,opt,name=proxied_domain,json=proxiedDomain,proto3" json:"proxied_domain,omitempty"`
}