diff --git a/core/dnsserver/https.go b/core/dnsserver/https.go index 015c52ec5..437c561f2 100644 --- a/core/dnsserver/https.go +++ b/core/dnsserver/https.go @@ -43,6 +43,11 @@ func (d *DoHWriter) LocalAddr() net.Addr { return d.laddr } +// Network no-op implementation. +func (d *DoHWriter) Network() string { + return "" +} + // Request returns the HTTP request. func (d *DoHWriter) Request() *http.Request { return d.request diff --git a/core/dnsserver/quic.go b/core/dnsserver/quic.go index dbe9552a8..f7cde74a8 100644 --- a/core/dnsserver/quic.go +++ b/core/dnsserver/quic.go @@ -65,3 +65,4 @@ func (w *DoQWriter) TsigTimersOnly(b bool) {} func (w *DoQWriter) Hijack() {} func (w *DoQWriter) LocalAddr() net.Addr { return w.localAddr } func (w *DoQWriter) RemoteAddr() net.Addr { return w.remoteAddr } +func (w *DoQWriter) Network() string { return "" } diff --git a/core/dnsserver/server_grpc.go b/core/dnsserver/server_grpc.go index dbf85d77b..369ef0ff6 100644 --- a/core/dnsserver/server_grpc.go +++ b/core/dnsserver/server_grpc.go @@ -181,4 +181,5 @@ func (r *gRPCresponse) TsigTimersOnly(b bool) {} func (r *gRPCresponse) Hijack() {} func (r *gRPCresponse) LocalAddr() net.Addr { return r.localAddr } func (r *gRPCresponse) RemoteAddr() net.Addr { return r.remoteAddr } +func (r *gRPCresponse) Network() string { return "" } func (r *gRPCresponse) WriteMsg(m *dns.Msg) error { r.Msg = m; return nil } diff --git a/go.mod b/go.mod index 3168f05a2..5f7279639 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 github.com/infobloxopen/go-trees v0.0.0-20200715205103-96a057b8dfb9 github.com/matttproud/golang_protobuf_extensions v1.0.4 - github.com/miekg/dns v1.1.66 + github.com/miekg/dns v1.1.67 github.com/opentracing/opentracing-go v1.2.0 github.com/openzipkin-contrib/zipkin-go-opentracing v0.5.0 github.com/openzipkin/zipkin-go v0.4.3 diff --git a/go.sum b/go.sum index 7d912363c..091abd9a7 100644 --- a/go.sum +++ b/go.sum @@ -238,8 +238,8 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.1.31/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -github.com/miekg/dns v1.1.66 h1:FeZXOS3VCVsKnEAd+wBkjMC3D2K+ww66Cq3VnCINuJE= -github.com/miekg/dns v1.1.66/go.mod h1:jGFzBsSNbJw6z1HYut1RKBKHA9PBdxeHrZG8J+gC2WE= +github.com/miekg/dns v1.1.67 h1:kg0EHj0G4bfT5/oOys6HhZw4vmMlnoZ+gDu8tJ/AlI0= +github.com/miekg/dns v1.1.67/go.mod h1:fujopn7TB3Pu3JM69XaawiU0wqjpL9/8xGop5UrTPps= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= diff --git a/plugin/test/responsewriter.go b/plugin/test/responsewriter.go index 32167008a..7c6f10068 100644 --- a/plugin/test/responsewriter.go +++ b/plugin/test/responsewriter.go @@ -39,6 +39,9 @@ func (t *ResponseWriter) RemoteAddr() net.Addr { return &net.UDPAddr{IP: ip, Port: port, Zone: t.Zone} } +// Network implements dns.ResponseWriter interface. +func (t *ResponseWriter) Network() string { return "" } + // WriteMsg implements dns.ResponseWriter interface. func (t *ResponseWriter) WriteMsg(m *dns.Msg) error { return nil }