diff options
| author |  Miek Gieben <miek@miek.nl>
| 2019-03-24 13:26:15 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-03-24 13:26:15 +0000 |
| commit | f08f7e24d6a1ad9d41277e3dcf2d57edb7b9e00f (patch) | |
| tree | f93376af9c52702030d87d280bb4cee88c6c498d | |
| parent | 1e281ad8f0f73bfa68d022e53309cde5ca0840e6 (diff) | |
| download | coredns-f08f7e24d6a1ad9d41277e3dcf2d57edb7b9e00f.tar.gz coredns-f08f7e24d6a1ad9d41277e3dcf2d57edb7b9e00f.tar.zst coredns-f08f7e24d6a1ad9d41277e3dcf2d57edb7b9e00f.zip | |
request.Request: remove useless function (#2714)
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>
| -rw-r--r-- | plugin/forward/forward.go | 3 | ||||
| -rw-r--r-- | plugin/grpc/grpc.go | 3 | ||||
| -rw-r--r-- | request/request.go | 8 |
3 files changed, 4 insertions, 10 deletions
diff --git a/plugin/forward/forward.go b/plugin/forward/forward.go index c7f7a83c4..da2e175fe 100644 --- a/plugin/forward/forward.go +++ b/plugin/forward/forward.go @@ -146,7 +146,8 @@ func (f *Forward) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg if !state.Match(ret) { 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) return 0, taperr } diff --git a/plugin/grpc/grpc.go b/plugin/grpc/grpc.go index 655be00c1..3dda225df 100644 --- a/plugin/grpc/grpc.go +++ b/plugin/grpc/grpc.go @@ -77,7 +77,8 @@ func (g *GRPC) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) ( if !state.Match(ret) { 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) return 0, nil } diff --git a/request/request.go b/request/request.go index f9dddda93..bd107c9ee 100644 --- a/request/request.go +++ b/request/request.go @@ -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. func (r *Request) Clear() { r.name = "" |