[2098] move the MessageRenderer: writeName to the base call as virtual method.

The TreeNodeRRset version will need to use that.

diff --git a/src/lib/datasrc/memory/rdata_serialization.cc b/src/lib/datasrc/memory/rdata_serialization.cc
index 841bc13daf2b38da18afc60380e481ff24238246..6c3e06c35b245eae79146dbe8bbf61cf9890ba00 100644 (file)
--- a/src/lib/datasrc/memory/rdata_serialization.cc
+++ b/src/lib/datasrc/memory/rdata_serialization.cc
@@ -248,6 +248,9 @@ public:
     virtual void setTruncated() {}
     virtual void setLengthLimit(size_t) {}
     virtual void setCompressMode(CompressMode) {}
+    virtual void writeName(const LabelSequence&, bool) {
+        // We don't need this version of writeName
+    }
 
     // Called for each domain name in the RDATA, from the RDATA's toWire()
     // implementation.

diff --git a/src/lib/dns/benchmarks/message_renderer_bench.cc b/src/lib/dns/benchmarks/message_renderer_bench.cc
index cc2fc8853142d0547a8bc63d9906c2747b2c03fc..752b1f664c72e7258c2fe3035ee9399a349e6ee1 100644 (file)
--- a/src/lib/dns/benchmarks/message_renderer_bench.cc
+++ b/src/lib/dns/benchmarks/message_renderer_bench.cc
@@ -15,6 +15,7 @@
 #include <bench/benchmark.h>
 
 #include <dns/name.h>
+#include <dns/labelsequence.h>
 #include <dns/messagerenderer.h>
 #include <oldmessagerenderer.h>
 
@@ -115,6 +116,7 @@ public:
     virtual void writeName(const Name& name, const bool = false) {
         name.toWire(getBuffer());
     }
+    virtual void writeName(const LabelSequence&, const bool) {} // unused
 };
 
 void

diff --git a/src/lib/dns/benchmarks/oldmessagerenderer.cc b/src/lib/dns/benchmarks/oldmessagerenderer.cc
index cd5c4e2cf53b2b57e03773e6c2db5a8b6c7c9c6d..a6c7990115a98d9247c9765c448bace21798041a 100644 (file)
--- a/src/lib/dns/benchmarks/oldmessagerenderer.cc
+++ b/src/lib/dns/benchmarks/oldmessagerenderer.cc
@@ -15,6 +15,7 @@
 #include <exceptions/exceptions.h>
 #include <util/buffer.h>
 #include <dns/name.h>
+#include <dns/labelsequence.h>
 #include <oldmessagerenderer.h>
 
 #include <cctype>
@@ -274,5 +275,10 @@ OldMessageRenderer::writeName(const Name& name, const bool compress) {
     }
 }
 
+void
+OldMessageRenderer::writeName(const LabelSequence&, const bool) {
+    // we don't use this mode for the benchmark
+}
+
 }
 }

diff --git a/src/lib/dns/messagerenderer.h b/src/lib/dns/messagerenderer.h
index d8f4634b6f49de765dae65a33ece767c42347fa3..fc05641361fd2d76bbc7f7d96b6fb2df5997ef65 100644 (file)
--- a/src/lib/dns/messagerenderer.h
+++ b/src/lib/dns/messagerenderer.h
@@ -334,6 +334,7 @@ public:
     /// \param name A \c Name object to be written.
     /// \param compress A boolean indicating whether to enable name compression.
     virtual void writeName(const Name& name, bool compress = true) = 0;
+    virtual void writeName(const LabelSequence& ls, bool compress = true) = 0;
     //@}
 };
 
@@ -391,7 +392,7 @@ public:
     ///
     /// \param ls A \c LabelSequence object to be written.
     /// \param compress A boolean indicating whether to enable name compression.
-    void writeName(const LabelSequence& ls, bool compress = true);
+    virtual void writeName(const LabelSequence& ls, bool compress = true);
 
 private:
     struct MessageRendererImpl;

diff --git a/src/lib/dns/rdatafields.cc b/src/lib/dns/rdatafields.cc
index 94c9dbf41df29a7b4e042ec7972af4f8d0012dd4..5737ef7bbca0ff0dc91c39404732567473a1de39 100644 (file)
--- a/src/lib/dns/rdatafields.cc
+++ b/src/lib/dns/rdatafields.cc
@@ -81,6 +81,7 @@ public:
     virtual void setTruncated() { truncated_ = true; }
     virtual void setLengthLimit(size_t len) { length_limit_ = len; }
     virtual void setCompressMode(CompressMode mode) { mode_ = mode; }
+    virtual void writeName(const LabelSequence&, bool) {}
     virtual void writeName(const Name& name, bool compress) {
         extendData();
         const RdataFields::Type field_type =