Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-02 02:03:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use context.Context

Browse Source 
Rename the old Context to State and use context.Context in the
middleware for intra-middleware communication and more.
This commit is contained in:
Miek Gieben
2016-03-19 07:18:57 +00:00
parent 523cc0a0fd
commit f907311cdf
27 changed files with 358 additions and 919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
middleware/file/file.go
View File

@@ -8,6 +8,8 @@ package file
import (
"strings"
"golang.org/x/net/context"
"github.com/miekg/coredns/middleware"
"github.com/miekg/dns"
)
@@ -26,29 +28,29 @@ type (
}
)
func (f File) ServeDNS(w dns.ResponseWriter, r *dns.Msg) (int, error) {
context := middleware.Context{W: w, Req: r}
qname := context.Name()
func (f File) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
state := middleware.State{W: w, Req: r}
qname := state.Name()
zone := middleware.Zones(f.Zones.Names).Matches(qname)
if zone == "" {
return f.Next.ServeDNS(w, r)
return f.Next.ServeDNS(ctx, w, r)
}
names, nodata := f.Zones.Z[zone].lookup(qname, context.QType())
names, nodata := f.Zones.Z[zone].lookup(qname, state.QType())
var answer *dns.Msg
switch {
case nodata:
answer = context.AnswerMessage()
answer = state.AnswerMessage()
answer.Ns = names
case len(names) == 0:
answer = context.AnswerMessage()
answer = state.AnswerMessage()
answer.Ns = names
answer.Rcode = dns.RcodeNameError
case len(names) > 0:
answer = context.AnswerMessage()
answer = state.AnswerMessage()
answer.Answer = names
default:
answer = context.ErrorMessage(dns.RcodeServerFailure)
answer = state.ErrorMessage(dns.RcodeServerFailure)
}
// Check return size, etc. TODO(miek)
w.WriteMsg(answer)