From 96c4999c40f583640bd8d18e21999bef68084617 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Sat, 23 Jun 2018 12:17:03 +0000 Subject: [PATCH] ncdumpzone: Refactor RR printing. --- ncdumpzone/ncdumpzone.go | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/ncdumpzone/ncdumpzone.go b/ncdumpzone/ncdumpzone.go index 430accc..23c0efa 100644 --- a/ncdumpzone/ncdumpzone.go +++ b/ncdumpzone/ncdumpzone.go @@ -8,6 +8,7 @@ import "github.com/hlandau/xlog" import "strings" import "fmt" +import "github.com/miekg/dns" import "gopkg.in/hlandau/easyconfig.v1" import "gopkg.in/hlandau/easyconfig.v1/cflag" @@ -31,6 +32,18 @@ var config = easyconfig.Configurator{ const perCall = 1000 +func printRR(rr dns.RR) { + if formatFlag.Value() == "zonefile" { + fmt.Print(rr.String(), "\n") + } else if formatFlag.Value() == "firefox-override" { + result, err := tlsoverridefirefox.OverrideFromRR(rr) + if err != nil { + panic(err) + } + fmt.Print(result) + } +} + func main() { err := config.Parse(nil) if err != nil { @@ -97,15 +110,7 @@ func main() { log.Warne(err, "error generating RRs") for _, rr := range rrs { - if formatFlag.Value() == "zonefile" { - fmt.Print(rr.String(), "\n") - } else if formatFlag.Value() == "firefox-override" { - result, err := tlsoverridefirefox.OverrideFromRR(rr) - if err != nil { - panic(err) - } - fmt.Print(result) - } + printRR(rr) } }