From 45c43554a8fea6252986bbd50307ed6300894892 Mon Sep 17 00:00:00 2001 From: Zou Nengren Date: Fri, 6 Dec 2019 19:21:34 +0800 Subject: [PATCH] make Prot to method (#3500) Signed-off-by: zouyee --- request/request.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/request/request.go b/request/request.go index 76bb6a787..7374b0bd6 100644 --- a/request/request.go +++ b/request/request.go @@ -111,15 +111,11 @@ func (r *Request) RemoteAddr() string { return r.W.RemoteAddr().String() } func (r *Request) LocalAddr() string { return r.W.LocalAddr().String() } // Proto gets the protocol used as the transport. This will be udp or tcp. -func (r *Request) Proto() string { return Proto(r.W) } - -// Proto gets the protocol used as the transport. This will be udp or tcp. -func Proto(w dns.ResponseWriter) string { - // FIXME(miek): why not a method on Request - if _, ok := w.RemoteAddr().(*net.UDPAddr); ok { +func (r *Request) Proto() string { + if _, ok := r.W.RemoteAddr().(*net.UDPAddr); ok { return "udp" } - if _, ok := w.RemoteAddr().(*net.TCPAddr); ok { + if _, ok := r.W.RemoteAddr().(*net.TCPAddr); ok { return "tcp" } return "udp"