Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-27 16:24:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

core: export ClientWrite (#849)

Browse Source 
Make ClientWrite available for middleware to use.
This commit is contained in:
Miek Gieben
2017-08-07 07:39:57 -07:00
committed by GitHub
parent 760e667063
commit 468d5b57de
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/dnsserver/server.go
View File

@@ -205,7 +205,7 @@ func (s *Server) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg)
if h, ok := s.zones[string(b[:l])]; ok { if h, ok := s.zones[string(b[:l])]; ok {
if r.Question[0].Qtype != dns.TypeDS { if r.Question[0].Qtype != dns.TypeDS {
rcode, _ := h.middlewareChain.ServeDNS(ctx, w, r) rcode, _ := h.middlewareChain.ServeDNS(ctx, w, r)
if rcodeNoClientWrite(rcode) { if !middleware.ClientWrite(rcode) {
DefaultErrorFunc(w, r, rcode) DefaultErrorFunc(w, r, rcode)
} }
return return
@@ -226,7 +226,7 @@ func (s *Server) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg)
if dshandler != nil { if dshandler != nil {
// DS request, and we found a zone, use the handler for the query // DS request, and we found a zone, use the handler for the query
rcode, _ := dshandler.middlewareChain.ServeDNS(ctx, w, r) rcode, _ := dshandler.middlewareChain.ServeDNS(ctx, w, r)
if rcodeNoClientWrite(rcode) { if !middleware.ClientWrite(rcode) {
DefaultErrorFunc(w, r, rcode) DefaultErrorFunc(w, r, rcode)
} }
return return
@@ -235,7 +235,7 @@ func (s *Server) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg)
// Wildcard match, if we have found nothing try the root zone as a last resort. // Wildcard match, if we have found nothing try the root zone as a last resort.
if h, ok := s.zones["."]; ok { if h, ok := s.zones["."]; ok {
rcode, _ := h.middlewareChain.ServeDNS(ctx, w, r) rcode, _ := h.middlewareChain.ServeDNS(ctx, w, r)
if rcodeNoClientWrite(rcode) { if !middleware.ClientWrite(rcode) {
DefaultErrorFunc(w, r, rcode) DefaultErrorFunc(w, r, rcode)
} }
return return
@@ -282,20 +282,6 @@ func DefaultErrorFunc(w dns.ResponseWriter, r *dns.Msg, rc int) {
w.WriteMsg(answer) w.WriteMsg(answer)
} }
func rcodeNoClientWrite(rcode int) bool {
switch rcode {
case dns.RcodeServerFailure:
fallthrough
case dns.RcodeRefused:
fallthrough
case dns.RcodeFormatError:
fallthrough
case dns.RcodeNotImplemented:
return true
}
return false
}
const ( const (
tcp = 0 tcp = 0
udp = 1 udp = 1

16
middleware/middleware.go
View File

@@ -82,5 +82,21 @@ func NextOrFailure(name string, next Handler, ctx context.Context, w dns.Respons
return dns.RcodeServerFailure, Error(name, errors.New("no next middleware found")) return dns.RcodeServerFailure, Error(name, errors.New("no next middleware found"))
} }
// ClientWrite returns true if the response has been written to the client.
// Each middleware to adhire to this protocol.
func ClientWrite(rcode int) bool {
switch rcode {
case dns.RcodeServerFailure:
fallthrough
case dns.RcodeRefused:
fallthrough
case dns.RcodeFormatError:
fallthrough
case dns.RcodeNotImplemented:
return false
}
return true
}
// Namespace is the namespace used for the metrics. // Namespace is the namespace used for the metrics.
const Namespace = "coredns" const Namespace = "coredns"