From b4a69fad37ef6bcb671c887e4432d56092053035 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Sat, 1 Jan 2011 19:07:23 +0100 Subject: [PATCH] Make the function on a resolver methods --- TODO | 3 ++- resolver/axfr_test.go | 2 +- resolver/resolver.go | 4 ++-- resolver/resolverEdns_test.go | 2 +- resolver/resolver_test.go | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index ef25f230..2b5d82d6 100644 --- a/TODO +++ b/TODO @@ -7,7 +7,6 @@ Todo: * TSIG -- RFC 4635 * IDN? * Unknown RRs? -* query-time, server in string ouput of dns.Msg * Parsing from strings * Server support (signing, receiving queries) * Check the network order, it works now, but this is on Intel @@ -21,3 +20,5 @@ Issues: * Convience functions? - for new(RR*) - ... +* query-time, server in string ouput of dns.Msg + - DnsMsg when doing resolver querying diff --git a/resolver/axfr_test.go b/resolver/axfr_test.go index 039360a5..cf4500c4 100644 --- a/resolver/axfr_test.go +++ b/resolver/axfr_test.go @@ -9,7 +9,7 @@ import ( func TestAXFR(t *testing.T) { res := new(Resolver) - ch := NewXfer(res) + ch := res.NewXfer() res.Servers = []string{"127.0.0.1"} m := new(dns.Msg) diff --git a/resolver/resolver.go b/resolver/resolver.go index a98fa5e5..d62007db 100644 --- a/resolver/resolver.go +++ b/resolver/resolver.go @@ -50,7 +50,7 @@ type Resolver struct { } // Start a new resolver as a goroutine, return the communication channel -func NewQuerier(res *Resolver) (ch chan DnsMsg) { +func (res *Resolver) NewQuerier() (ch chan DnsMsg) { ch = make(chan DnsMsg) go query(res, ch) return @@ -129,7 +129,7 @@ func query(res *Resolver, msg chan DnsMsg) { // Start a new xfr as a goroutine, return a channel. // Channel will be closed when the axfr is finished, until // that time new messages will appear on the channel -func NewXfer(res *Resolver) (ch chan DnsMsg) { +func (res *Resolver) NewXfer() (ch chan DnsMsg) { ch = make(chan DnsMsg) go axfr(res, ch) return diff --git a/resolver/resolverEdns_test.go b/resolver/resolverEdns_test.go index 1ae1ac0d..6e50cc0a 100644 --- a/resolver/resolverEdns_test.go +++ b/resolver/resolverEdns_test.go @@ -7,7 +7,7 @@ import ( func TestResolverEdns(t *testing.T) { res := new(Resolver) - ch := NewQuerier(res) + ch := res.NewQuerier() res.Servers = []string{"127.0.0.1"} res.Timeout = 2 diff --git a/resolver/resolver_test.go b/resolver/resolver_test.go index 33400466..583524c1 100644 --- a/resolver/resolver_test.go +++ b/resolver/resolver_test.go @@ -8,7 +8,7 @@ import ( func TestResolver(t *testing.T) { res := new(Resolver) - ch := NewQuerier(res) + ch := res.NewQuerier() res.Servers = []string{"127.0.0.1"}