From 3d7ff416ffbb425297ae8237e6b341ef310f1b5d Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Fri, 2 Dec 2022 22:09:55 +0100 Subject: [PATCH] fix(misc): minor changes 1. update indirect dependencies 2. Set timeout to 5 seconds instead of 1 - this helps with slow queries 3. Put class back in the default query output - this fixes a problem with using awl to make a root file Signed-off-by: Sam Therapy --- cmd/cli.go | 24 +++++++++++++----------- go.mod | 6 +++--- go.sum | 12 ++++++------ 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/cmd/cli.go b/cmd/cli.go index 076c44c..d1affb2 100644 --- a/cmd/cli.go +++ b/cmd/cli.go @@ -47,7 +47,7 @@ func ParseCLI(args []string, version string) (*util.Options, error) { ipv6 = flagSet.Bool("6", false, "force IPv6", flag.OptShorthand('6')) reverse = flagSet.Bool("reverse", false, "do a reverse lookup", flag.OptShorthand('x')) - timeout = flagSet.Float32("timeout", 1, "Timeout, in `seconds`") + timeout = flagSet.Float32("timeout", 5, "Timeout, in `seconds`") retry = flagSet.Int("retries", 2, "number of `times` to retry") edns = flagSet.Bool("no-edns", false, "disable EDNS entirely") @@ -151,16 +151,18 @@ func ParseCLI(args []string, version string) (*util.Options, error) { Port: *port, }, Display: util.Display{ - Comments: !*noC, - Question: !*noQ, - Opt: !*noOpt, - Answer: !*noAns, - Authority: !*noAuth, - Additional: !*noAdd, - Statistics: !*noStats, - HumanTTL: false, - ShowQuery: false, - TTL: true, + Comments: !*noC, + Question: !*noQ, + Opt: !*noOpt, + Answer: !*noAns, + Authority: !*noAuth, + Additional: !*noAdd, + Statistics: !*noStats, + TTL: true, + ShowClass: true, + ShowQuery: false, + HumanTTL: false, + UcodeTranslate: true, }, EDNS: util.EDNS{ EnableEDNS: !*edns, diff --git a/go.mod b/go.mod index 3f89060..5adbfea 100644 --- a/go.mod +++ b/go.mod @@ -22,13 +22,13 @@ require ( github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect github.com/golang/mock v1.6.0 // indirect github.com/google/go-cmp v0.5.9 // indirect - github.com/google/pprof v0.0.0-20221112000123-84eb7ad69597 // indirect + github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect - github.com/onsi/ginkgo/v2 v2.5.0 // indirect + github.com/onsi/ginkgo/v2 v2.5.1 // indirect golang.org/x/crypto v0.3.0 // indirect - golang.org/x/exp v0.0.0-20221114191408-850992195362 // indirect + golang.org/x/exp v0.0.0-20221126150942-6ab00d035af9 // indirect golang.org/x/mod v0.7.0 // indirect golang.org/x/text v0.4.0 // indirect golang.org/x/tools v0.3.0 // indirect diff --git a/go.sum b/go.sum index c4195d6..efe495f 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,8 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20221112000123-84eb7ad69597 h1:BfATJjOtQYCyv2AM4mh/VFYgJjHDeXGfKdClCrUCh1w= -github.com/google/pprof v0.0.0-20221112000123-84eb7ad69597/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= +github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -37,8 +37,8 @@ github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sN github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= -github.com/onsi/ginkgo/v2 v2.5.0 h1:TRtrvv2vdQqzkwrQ1ke6vtXf7IK34RBUJafIy1wMwls= -github.com/onsi/ginkgo/v2 v2.5.0/go.mod h1:Luc4sArBICYCS8THh8v3i3i5CuSZO+RaQRaJoeNwomw= +github.com/onsi/ginkgo/v2 v2.5.1 h1:auzK7OI497k6x4OvWq+TKAcpcSAlod0doAH72oIN0Jw= +github.com/onsi/ginkgo/v2 v2.5.1/go.mod h1:63DOGlLAH8+REH8jUGdL3YpCpu7JODesutUjdENfUAc= github.com/onsi/gomega v1.24.0 h1:+0glovB9Jd6z3VR+ScSwQqXVTIfJcGA9UBM8yzQxhqg= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -57,8 +57,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/exp v0.0.0-20221114191408-850992195362 h1:NoHlPRbyl1VFI6FjwHtPQCN7wAMXI6cKcqrmXhOOfBQ= -golang.org/x/exp v0.0.0-20221114191408-850992195362/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20221126150942-6ab00d035af9 h1:yZNXmy+j/JpX19vZkVktWqAo7Gny4PBWYYK3zskGpx4= +golang.org/x/exp v0.0.0-20221126150942-6ab00d035af9/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=