From cd176f859b2e71d8919c56ff67235c226ab5b48e Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Tue, 25 Jun 2019 08:00:33 +0100 Subject: Run gofmt -s and golint on the codebase (#2918) * Run gofmt -s and golint on the codebase Run golint and fix everythign it flagged (except the context arg ordering), mostly edits in the rewrite plugin. Signed-off-by: Miek Gieben * ... and ofcourse the test as well Signed-off-by: Miek Gieben --- plugin/rewrite/reverter.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'plugin/rewrite/reverter.go') diff --git a/plugin/rewrite/reverter.go b/plugin/rewrite/reverter.go index 570b7d39e..5a55c7ad5 100644 --- a/plugin/rewrite/reverter.go +++ b/plugin/rewrite/reverter.go @@ -1,10 +1,11 @@ package rewrite import ( - "github.com/miekg/dns" "regexp" "strconv" "strings" + + "github.com/miekg/dns" ) // ResponseRule contains a rule to rewrite a response with. @@ -13,7 +14,7 @@ type ResponseRule struct { Type string Pattern *regexp.Regexp Replacement string - Ttl uint32 + TTL uint32 } // ResponseReverter reverses the operations done on the question section of a packet. @@ -39,10 +40,12 @@ func (r *ResponseReverter) WriteMsg(res *dns.Msg) error { res.Question[0] = r.originalQuestion if r.ResponseRewrite { for _, rr := range res.Answer { - var isNameRewritten bool = false - var isTtlRewritten bool = false - var name string = rr.Header().Name - var ttl uint32 = rr.Header().Ttl + var ( + isNameRewritten bool + isTTLRewritten bool + name = rr.Header().Name + ttl = rr.Header().Ttl + ) for _, rule := range r.ResponseRules { if rule.Type == "" { rule.Type = "name" @@ -63,14 +66,14 @@ func (r *ResponseReverter) WriteMsg(res *dns.Msg) error { name = s isNameRewritten = true case "ttl": - ttl = rule.Ttl - isTtlRewritten = true + ttl = rule.TTL + isTTLRewritten = true } } - if isNameRewritten == true { + if isNameRewritten { rr.Header().Name = name } - if isTtlRewritten == true { + if isTTLRewritten { rr.Header().Ttl = ttl } } -- cgit v1.2.3