astra/doggo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: Simplify resolvers

Browse source
This commit is contained in:
Karan Sharma 2020-12-16 19:40:01 +05:30
parent ec46ed5990
commit 114e5ba68b
5 changed files with 67 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

36
pkg/resolvers/udp.go → pkg/resolvers/classic.go
View file

@ -6,33 +6,47 @@ import (
"github.com/miekg/dns"
)
// UDPResolver represents the config options for setting up a Resolver.
type UDPResolver struct {
// ClassicResolver represents the config options for setting up a Resolver.
type ClassicResolver struct {
client *dns.Client
server string
}
// UDPResolverOpts holds options for setting up a Classic resolver.
type UDPResolverOpts struct {
// ClassicResolverOpts holds options for setting up a Classic resolver.
type ClassicResolverOpts struct {
IPv4Only bool
IPv6Only bool
Timeout time.Duration
UseTLS bool
UseTCP bool
}
// NewUDPResolver accepts a list of nameservers and configures a DNS resolver.
func NewUDPResolver(server string, opts UDPResolverOpts) (Resolver, error) {
// NewClassicResolver accepts a list of nameservers and configures a DNS resolver.
func NewClassicResolver(server string, opts ClassicResolverOpts) (Resolver, error) {
net := "udp"
client := &dns.Client{
Timeout: opts.Timeout,
Net: "udp",
}
if opts.UseTCP {
net = "tcp"
}
client.Net = "udp"
if opts.IPv4Only {
client.Net = "udp4"
net = net + "4"
}
if opts.IPv6Only {
client.Net = "udp6"
net = net + "6"
}
return &UDPResolver{
if opts.UseTLS {
net = net + "-tls"
}
client.Net = net
return &ClassicResolver{
client: client,
server: server,
}, nil
@ -41,7 +55,7 @@ func NewUDPResolver(server string, opts UDPResolverOpts) (Resolver, error) {
// Lookup prepare a list of DNS messages to be sent to the server.
// It's possible to send multiple question in one message
// but some nameservers are not able to
func (r *UDPResolver) Lookup(questions []dns.Question) ([]Response, error) {
func (r *ClassicResolver) Lookup(questions []dns.Question) ([]Response, error) {
var (
messages = prepareMessages(questions)
responses []Response

64
pkg/resolvers/tcp.go
View file

@ -1,64 +0,0 @@
package resolvers
import (
"time"
"github.com/miekg/dns"
)
// TCPResolver represents the config options for setting up a Resolver.
type TCPResolver struct {
client *dns.Client
server string
}
// TCPResolverOpts represents the config options for setting up a TCPResolver.
type TCPResolverOpts struct {
IPv4Only bool
IPv6Only bool
Timeout time.Duration
}
// NewTCPResolver accepts a list of nameservers and configures a DNS resolver.
func NewTCPResolver(server string, opts TCPResolverOpts) (Resolver, error) {
client := &dns.Client{
Timeout: opts.Timeout,
}
client.Net = "tcp"
if opts.IPv4Only {
client.Net = "tcp4"
}
if opts.IPv6Only {
client.Net = "tcp6"
}
return &TCPResolver{
client: client,
server: server,
}, nil
}
// Lookup prepare a list of DNS messages to be sent to the server.
// It's possible to send multiple question in one message
// but some nameservers are not able to
func (r *TCPResolver) Lookup(questions []dns.Question) ([]Response, error) {
var (
messages = prepareMessages(questions)
responses []Response
)
for _, msg := range messages {
in, rtt, err := r.client.Exchange(&msg, r.server)
if err != nil {
return nil, err
}
msg.Answer = in.Answer
rsp := Response{
Message: msg,
RTT: rtt,
Nameserver: r.server,
}
responses = append(responses, rsp)
}
return responses, nil
}