diff options
| author |  Miek Gieben <miek@miek.nl>
| 2016-11-10 12:58:40 +0000 |
|---|---|---|
| committer | Miek Gieben <miek@miek.nl>
| 2016-11-10 12:58:40 +0000 |
| commit | 9328a8e7a4452bd9a4f4b351be2c7aa25562e6b2 (patch) | |
| tree | 6660daae5a4fbcca0da2a3fd871e27467e2624fe | |
| parent | d383f279a0dd96efa2dd5c43242a383ad6d30b2e (diff) | |
| download | coredns-9328a8e7a4452bd9a4f4b351be2c7aa25562e6b2.tar.gz coredns-9328a8e7a4452bd9a4f4b351be2c7aa25562e6b2.tar.zst coredns-9328a8e7a4452bd9a4f4b351be2c7aa25562e6b2.zip | |
Compile fixes and make it work
| -rw-r--r-- | middleware/auto/auto.go | 2 | ||||
| -rw-r--r-- | middleware/auto/setup.go | 2 | ||||
| -rw-r--r-- | middleware/auto/setup_test.go | 1 | ||||
| -rw-r--r-- | middleware/file/cname_test.go | 2 | ||||
| -rw-r--r-- | middleware/file/lookup.go | 4 | ||||
| -rw-r--r-- | middleware/proxy/lookup.go | 1 |
6 files changed, 9 insertions, 3 deletions
diff --git a/middleware/auto/auto.go b/middleware/auto/auto.go index fabf492e1..115e86dea 100644 --- a/middleware/auto/auto.go +++ b/middleware/auto/auto.go @@ -75,7 +75,7 @@ func (a Auto) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (i return xfr.ServeDNS(ctx, w, r) } - answer, ns, extra, result := z.Lookup(qname, state.QType(), state.Do()) + answer, ns, extra, result := z.Lookup(state, qname) m := new(dns.Msg) m.SetReply(r) diff --git a/middleware/auto/setup.go b/middleware/auto/setup.go index ddb5670f0..bf72f4549 100644 --- a/middleware/auto/setup.go +++ b/middleware/auto/setup.go @@ -147,7 +147,7 @@ func autoParse(c *caddy.Controller) (Auto, error) { case "upstream": args := c.RemainingArgs() if len(args) == 0 { - return a, false, c.ArgErr() + return a, c.ArgErr() } for i := 0; i < len(args); i++ { h, p, e := net.SplitHostPort(args[i]) diff --git a/middleware/auto/setup_test.go b/middleware/auto/setup_test.go index f0368ff6e..3d65a4a86 100644 --- a/middleware/auto/setup_test.go +++ b/middleware/auto/setup_test.go @@ -39,6 +39,7 @@ func TestAutoParse(t *testing.T) { directory /tmp (.*) bliep transfer to 127.0.0.1 transfer to 127.0.0.2 + upstream 8.8.8.8 }`, false, "/tmp", "bliep", `(.*)`, []string{"127.0.0.1:53", "127.0.0.2:53"}, }, diff --git a/middleware/file/cname_test.go b/middleware/file/cname_test.go index bb678f7ff..2eb7e073f 100644 --- a/middleware/file/cname_test.go +++ b/middleware/file/cname_test.go @@ -136,6 +136,8 @@ var exernalTestCases = []test.Case{ Qname: "external.example.org.", Qtype: dns.TypeA, Answer: []dns.RR{ test.CNAME("external.example.org. 1800 CNAME www.example.net."), + // magic 303 TTL that says: don't check TTL. + test.A("www.example.net. 303 IN A 93.184.216.34"), }, }, } diff --git a/middleware/file/lookup.go b/middleware/file/lookup.go index 4afd6262e..fc1ffaacc 100644 --- a/middleware/file/lookup.go +++ b/middleware/file/lookup.go @@ -339,10 +339,12 @@ func cnameForType(targets []dns.RR, origQtype uint16) []dns.RR { func (z *Zone) externalLookup(state request.Request, target string, qtype uint16) []dns.RR { m, e := z.Proxy.Lookup(state, target, qtype) - if e != nil || m == nil { + if e != nil { + println(e.Error()) // TODO(miek): debugMsg for this as well? Log? return nil } + println(m.String()) return m.Answer } diff --git a/middleware/proxy/lookup.go b/middleware/proxy/lookup.go index 340b4e31b..d0f06986b 100644 --- a/middleware/proxy/lookup.go +++ b/middleware/proxy/lookup.go @@ -75,6 +75,7 @@ func (p Proxy) lookup(state request.Request, r *dns.Msg) (*dns.Msg, error) { // hosts until timeout (or until we get a nil host). for time.Now().Sub(start) < tryDuration { host := upstream.Select() + println(host.Name) if host == nil { return nil, errUnreachable } |