history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: flatten cname

Browse Source
This commit is contained in:
Skyxim 2023-03-12 12:41:32 +08:00
parent 4b1e00d3aa
commit 0273a6bb9d
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dns/middleware.go
View File

@ -40,7 +40,7 @@ func withHosts(hosts *trie.DomainTrie[resolver.HostValue], mapping *cache.LruCac
hostValue := record.Data() hostValue := record.Data()
msg := r.Copy() msg := r.Copy()
if !hostValue.IsDomain { handleIPs := func() {
for _, ipAddr := range hostValue.IPs { for _, ipAddr := range hostValue.IPs {
if ipAddr.Is4() && q.Qtype == D.TypeA { if ipAddr.Is4() && q.Qtype == D.TypeA {
rr := &D.A{} rr := &D.A{}
@ -61,12 +61,38 @@ func withHosts(hosts *trie.DomainTrie[resolver.HostValue], mapping *cache.LruCac
} }
} }
} }
} else if q.Qtype == D.TypeCNAME { }
fillMsg := func() {
if !hostValue.IsDomain {
handleIPs()
} else {
for {
if hostValue.IsDomain {
if node := hosts.Search(hostValue.Domain); node != nil {
hostValue = node.Data()
} else {
break
}
}else{
break
}
}
if !hostValue.IsDomain {
handleIPs()
}
}
}
switch q.Qtype {
case D.TypeA:
fillMsg()
case D.TypeAAAA:
fillMsg()
case D.TypeCNAME:
rr := &D.CNAME{} rr := &D.CNAME{}
rr.Hdr = D.RR_Header{Name: q.Name, Rrtype: D.TypeCNAME, Class: D.ClassINET, Ttl: 10} rr.Hdr = D.RR_Header{Name: q.Name, Rrtype: D.TypeCNAME, Class: D.ClassINET, Ttl: 10}
rr.Target = hostValue.Domain+"." rr.Target = hostValue.Domain + "."
msg.Answer = append(msg.Answer, rr) msg.Answer = append(msg.Answer, rr)
} else { default:
return next(ctx, r) return next(ctx, r)
} }