From 6ade5b5fffe89e8e1a9ebc5b80bceef321f6646d Mon Sep 17 00:00:00 2001 From: Tom Thorogood Date: Fri, 30 Nov 2018 18:19:06 +1030 Subject: [PATCH] Move compress=false out of packDataDomainNames into caller (#849) This makes packDataDomainNames more consistent with PackDomainName where it will only be called with compress = true for `dns:"cdomain-name"`. --- msg_generate.go | 2 +- msg_helpers.go | 2 +- zmsg.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/msg_generate.go b/msg_generate.go index 8ba609f7..a7763d5d 100644 --- a/msg_generate.go +++ b/msg_generate.go @@ -106,7 +106,7 @@ return off, err case `dns:"nsec"`: o("off, err = packDataNsec(rr.%s, msg, off)\n") case `dns:"domain-name"`: - o("off, err = packDataDomainNames(rr.%s, msg, off, compression, compress)\n") + o("off, err = packDataDomainNames(rr.%s, msg, off, compression, false)\n") default: log.Fatalln(name, st.Field(i).Name(), st.Tag(i)) } diff --git a/msg_helpers.go b/msg_helpers.go index fdc000f2..04f4ec63 100644 --- a/msg_helpers.go +++ b/msg_helpers.go @@ -624,7 +624,7 @@ func unpackDataDomainNames(msg []byte, off, end int) ([]string, int, error) { func packDataDomainNames(names []string, msg []byte, off int, compression map[string]int, compress bool) (int, error) { var err error for j := 0; j < len(names); j++ { - off, err = PackDomainName(names[j], msg, off, compression, false && compress) + off, err = PackDomainName(names[j], msg, off, compression, compress) if err != nil { return len(msg), err } diff --git a/zmsg.go b/zmsg.go index 1a68f74d..057e5e6a 100644 --- a/zmsg.go +++ b/zmsg.go @@ -438,7 +438,7 @@ func (rr *HIP) pack(msg []byte, off int, compression map[string]int, compress bo if err != nil { return off, err } - off, err = packDataDomainNames(rr.RendezvousServers, msg, off, compression, compress) + off, err = packDataDomainNames(rr.RendezvousServers, msg, off, compression, false) if err != nil { return off, err }