From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 6 Apr 2021 18:18:04 +0000 (+0200)
Subject: more polish
X-Git-Tag: dnsdist-1.6.0-rc1~23^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10256%2Fhead;p=thirdparty%2Fpdns.git

more polish
---

diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc
index 1a1fbde99e..ccdcddfd07 100644
--- a/pdns/dnsparser.cc
+++ b/pdns/dnsparser.cc
@@ -386,7 +386,7 @@ void PacketReader::xfrNodeOrLocatorID(NodeOrLocatorID& ret)
   if (d_pos + sizeof(ret) > d_content.size()) {
     throw std::out_of_range("Attempt to read 64 bit value outside of packet");
   }
-  memcpy(&ret, &d_content.at(d_pos), sizeof(ret));
+  memcpy(&ret.content, &d_content.at(d_pos), sizeof(ret.content));
   d_pos += sizeof(ret);
 }
 
diff --git a/pdns/dnswriter.cc b/pdns/dnswriter.cc
index bcb2884779..1255dbea73 100644
--- a/pdns/dnswriter.cc
+++ b/pdns/dnswriter.cc
@@ -140,7 +140,7 @@ template <typename Container> void GenericDNSPacketWriter<Container>::xfr48BitIn
   d_content.insert(d_content.end(), bytes, bytes + sizeof(bytes));
 }
 
-template <typename Container> void GenericDNSPacketWriter<Container>::xfrNodeOrLocatorID(NodeOrLocatorID val)
+template <typename Container> void GenericDNSPacketWriter<Container>::xfrNodeOrLocatorID(const NodeOrLocatorID& val)
 {
   d_content.insert(d_content.end(), val.content, val.content + sizeof(val.content));
 }
diff --git a/pdns/dnswriter.hh b/pdns/dnswriter.hh
index 96e8d4f9a2..55b5f6f062 100644
--- a/pdns/dnswriter.hh
+++ b/pdns/dnswriter.hh
@@ -86,7 +86,7 @@ public:
   void truncate();
 
   void xfr48BitInt(uint64_t val);
-  void xfrNodeOrLocatorID(NodeOrLocatorID val);
+  void xfrNodeOrLocatorID(const NodeOrLocatorID& val);
   void xfr32BitInt(uint32_t val);
   void xfr16BitInt(uint16_t val);
   void xfrType(uint16_t val)
diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc
index 20f707cb0c..3b5ce6f1ad 100644
--- a/pdns/rcpgenerator.cc
+++ b/pdns/rcpgenerator.cc
@@ -66,7 +66,7 @@ void RecordTextReader::xfrNodeOrLocatorID(NodeOrLocatorID& val) {
     throw RecordTextException("while parsing colon-delimited 64-bit field: '" + d_string.substr(d_pos, len) + "' is invalid");
   }
 
-  std::memcpy(&val, tmpbuf.s6_addr, sizeof(val));
+  std::memcpy(&val.content, tmpbuf.s6_addr, sizeof(val.content));
   d_pos += len;
 }