TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 4 Projects Releases Packages Wiki Activity Actions

request.Request: remove useless function (#2714)

Browse source 
ErrorMessage was a very shallow function that didn't add anything.
Remove it and remove its usage.

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben 2019-03-24 13:26:15 +00:00 • committed by GitHub
parent 1e281ad8f0
commit f08f7e24d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugin/forward/forward.go
View file

@ -146,7 +146,8 @@ func (f *Forward) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg
if !state.Match(ret) { if !state.Match(ret) {
debug.Hexdumpf(ret, "Wrong reply for id: %d, %s %d", ret.Id, state.QName(), state.QType()) debug.Hexdumpf(ret, "Wrong reply for id: %d, %s %d", ret.Id, state.QName(), state.QType())
formerr := state.ErrorMessage(dns.RcodeFormatError) formerr := new(dns.Msg)
formerr.SetRcode(state.Req, dns.RcodeFormatError)
w.WriteMsg(formerr) w.WriteMsg(formerr)
return 0, taperr return 0, taperr
} }

3
plugin/grpc/grpc.go
View file

@ -77,7 +77,8 @@ func (g *GRPC) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (
if !state.Match(ret) { if !state.Match(ret) {
debug.Hexdumpf(ret, "Wrong reply for id: %d, %s %d", ret.Id, state.QName(), state.QType()) debug.Hexdumpf(ret, "Wrong reply for id: %d, %s %d", ret.Id, state.QName(), state.QType())
formerr := state.ErrorMessage(dns.RcodeFormatError) formerr := new(dns.Msg)
formerr.SetRcode(state.Req, dns.RcodeFormatError)
w.WriteMsg(formerr) w.WriteMsg(formerr)
return 0, nil return 0, nil
} }

8
request/request.go
View file

@ -433,14 +433,6 @@ func (r *Request) QClass() uint16 {
} }
// ErrorMessage returns an error message suitable for sending
// back to the client.
func (r *Request) ErrorMessage(rcode int) *dns.Msg {
m := new(dns.Msg)
m.SetRcode(r.Req, rcode)
return m
}
// Clear clears all caching from Request s. // Clear clears all caching from Request s.
func (r *Request) Clear() { func (r *Request) Clear() {
r.name = "" r.name = ""