yanistyle/sing-box-extended
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-08-06 22:05:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

dns: Fix search domain expansion

Browse Source 
DHCP option 119/15 and resolved link domains are not rooted, so appending
them to the query name produced a non-FQDN name, failing to pack with
"domain must be fully qualified".
This commit is contained in:
世界
2026-07-25 08:14:59 +08:00
parent 67a600dbfb
commit 397fb4d20a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dns/transport/dhcp/dhcp.go
View File

@@ -296,9 +296,14 @@ func (t *Transport) fetchServersResponse(iface *control.Interface, packetConn ne
func (t *Transport) recreateServers(iface *control.Interface, dhcpPacket *dhcpv4.DHCPv4) error { func (t *Transport) recreateServers(iface *control.Interface, dhcpPacket *dhcpv4.DHCPv4) error {
searchList := dhcpPacket.DomainSearch() searchList := dhcpPacket.DomainSearch()
if searchList != nil && len(searchList.Labels) > 0 { if searchList != nil && len(searchList.Labels) > 0 {
t.search = searchList.Labels t.search = common.Filter(common.Map(searchList.Labels, mDNS.Fqdn), func(it string) bool {
return it != "."
})
} else if dhcpPacket.DomainName() != "" { } else if dhcpPacket.DomainName() != "" {
t.search = []string{dhcpPacket.DomainName()} domainName := mDNS.Fqdn(dhcpPacket.DomainName())
if domainName != "." {
t.search = []string{domainName}
}
} }
serverAddrs := common.Map(dhcpPacket.DNS(), func(it net.IP) M.Socksaddr { serverAddrs := common.Map(dhcpPacket.DNS(), func(it net.IP) M.Socksaddr {
return M.SocksaddrFrom(M.AddrFromIP(it), 53) return M.SocksaddrFrom(M.AddrFromIP(it), 53)

6
service/resolved/service.go
View File

@@ -204,10 +204,12 @@ func (i *Service) onNetworkUpdate() {
} }
func (conf *TransportLink) nameList(ndots int, name string) []string { func (conf *TransportLink) nameList(ndots int, name string) []string {
search := common.Map(common.Filter(conf.domain, func(it LinkDomain) bool { search := common.Filter(common.Map(common.Filter(conf.domain, func(it LinkDomain) bool {
return !it.RoutingOnly return !it.RoutingOnly
}), func(it LinkDomain) string { }), func(it LinkDomain) string {
return it.Domain return mDNS.Fqdn(it.Domain)
}), func(it string) bool {
return it != "."
}) })
l := len(name) l := len(name)