feat: ipv6 joins the ride.

This commit is contained in:
ohaiibuzzle 2024-08-10 14:02:50 +07:00
parent a86b7b3d07
commit 714daeab99
2 changed files with 34 additions and 16 deletions

View File

@ -90,10 +90,17 @@ func dohLookup(domain string) (string, error) {
dnsUpstream := util.GetConfig().DnsAddr dnsUpstream := util.GetConfig().DnsAddr
client := GetDoHClient(*dnsUpstream) client := GetDoHClient(*dnsUpstream)
resp, err := client.Resolve(domain, dns.TypeA) // try up to 3 times
if err != nil { for i := 0; i < 3; i++ {
return "", errors.New("couldn not resolve the domain(doh)") resp, err := client.Resolve(domain, []uint16{dns.TypeA, dns.TypeAAAA})
if err == nil {
if len(resp) == 0 { // yes this happens
return "", errors.New("no record found(doh)")
}
return resp[0], nil
}
} }
return resp[0], nil return "", errors.New("could not resolve the domain(doh)")
} }

View File

@ -88,20 +88,31 @@ func (d *DoHClient) doGetRequest(msg *dns.Msg) (*dns.Msg, error) {
return ret_msg, nil return ret_msg, nil
} }
func (d *DoHClient) Resolve(domain string, dnsType uint16) ([]string, error) { func (d *DoHClient) Resolve(domain string, dnsTypes []uint16) ([]string, error) {
msg := new(dns.Msg)
msg.SetQuestion(dns.Fqdn(domain), dnsType)
resp, err := d.doGetRequest(msg)
if err != nil {
return nil, err
}
var ret []string var ret []string
for _, ans := range resp.Answer {
if a, ok := ans.(*dns.A); ok { for _, dnsType := range dnsTypes {
ret = append(ret, a.A.String()) msg := new(dns.Msg)
msg.SetQuestion(dns.Fqdn(domain), dnsType)
resp, err := d.doGetRequest(msg)
if err != nil {
return nil, err
}
if resp.Rcode != dns.RcodeSuccess {
continue
}
for _, answer := range resp.Answer {
if t, ok := answer.(*dns.A); ok {
ret = append(ret, t.A.String())
}
if t, ok := answer.(*dns.AAAA); ok {
ret = append(ret, t.AAAA.String())
}
} }
} }
return ret, nil return ret, nil
} }