request: add LocalIP (#1925)

* request: add LocalIP

Fix TODO that was added: Add LocalIP and test the Clear() method.

Signed-off-by: Miek Gieben <miek@miek.nl>

* Move to Errorf

PR feedback and move to Errorf instead Fatalf.

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben
2018-07-03 09:47:26 +01:00
committed by GitHub
parent 6dd2cf8c4b
commit 908d4fbd23
2 changed files with 34 additions and 7 deletions

View File

@@ -32,7 +32,7 @@ type Request struct {
port string // client's port.
family int // transport's family.
localPort string // server's port.
// TODO(miek): localIP once that is merged.
localIP string // server's ip.
}
// NewWithQuestion returns a new request based on the old, but with a new question
@@ -61,11 +61,18 @@ func (r *Request) IP() string {
// LocalIP gets the (local) IP address of server handling the request.
func (r *Request) LocalIP() string {
if r.localIP != "" {
return r.localIP
}
ip, _, err := net.SplitHostPort(r.W.LocalAddr().String())
if err != nil {
return r.W.LocalAddr().String()
r.localIP = r.W.LocalAddr().String()
return r.localIP
}
return ip
r.localIP = ip
return r.localIP
}
// Port gets the (remote) port of the client making the request.
@@ -423,6 +430,7 @@ func (r *Request) ErrorMessage(rcode int) *dns.Msg {
func (r *Request) Clear() {
r.name = ""
r.ip = ""
r.localIP = ""
r.port = ""
r.localPort = ""
r.family = 0