[2656] Use createNameFromLexer() in CNAME, DNAME and SRV constructors (which accept...

diff --git a/src/lib/dns/rdata/generic/cname_5.cc b/src/lib/dns/rdata/generic/cname_5.cc
index b350e5b4bc5ce1d810ec591d7d1c2b15faaaafc5..ba225f9340d0d92984ce1b73ecdf6debd482ce30 100644 (file)
--- a/src/lib/dns/rdata/generic/cname_5.cc
+++ b/src/lib/dns/rdata/generic/cname_5.cc
@@ -22,8 +22,11 @@
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
 
+#include <dns/rdata/generic/detail/lexer_util.h>
+
 using namespace std;
 using namespace isc::util;
+using isc::dns::rdata::generic::detail::createNameFromLexer;
 
 // BEGIN_ISC_NAMESPACE
 // BEGIN_RDATA_NAMESPACE
@@ -39,9 +42,9 @@ CNAME::CNAME(InputBuffer& buffer, size_t) :
     // check consistency.
 }
 
-CNAME::CNAME(MasterLexer& lexer, const Name*, MasterLoader::Options,
-             MasterLoaderCallbacks&) :
-    cname_(lexer.getNextToken(MasterToken::QSTRING).getString())
+CNAME::CNAME(MasterLexer& lexer, const Name* origin,
+             MasterLoader::Options, MasterLoaderCallbacks&) :
+    cname_(createNameFromLexer(lexer, origin))
 {}
 
 CNAME::CNAME(const CNAME& other) :

diff --git a/src/lib/dns/rdata/generic/dname_39.cc b/src/lib/dns/rdata/generic/dname_39.cc
index f7731a2add9aae1e60bfdc6ef000dc5804bbf5b9..ea77d424c6417356ee57161748110a8c98003c10 100644 (file)
--- a/src/lib/dns/rdata/generic/dname_39.cc
+++ b/src/lib/dns/rdata/generic/dname_39.cc
@@ -22,8 +22,11 @@
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
 
+#include <dns/rdata/generic/detail/lexer_util.h>
+
 using namespace std;
 using namespace isc::util;
+using isc::dns::rdata::generic::detail::createNameFromLexer;
 
 // BEGIN_ISC_NAMESPACE
 // BEGIN_RDATA_NAMESPACE
@@ -39,9 +42,9 @@ DNAME::DNAME(InputBuffer& buffer, size_t) :
     // check consistency.
 }
 
-DNAME::DNAME(MasterLexer& lexer, const Name*, MasterLoader::Options,
-             MasterLoaderCallbacks&) :
-    dname_(lexer.getNextToken(MasterToken::QSTRING).getString())
+DNAME::DNAME(MasterLexer& lexer, const Name* origin,
+             MasterLoader::Options, MasterLoaderCallbacks&) :
+    dname_(createNameFromLexer(lexer, origin))
 {}
 
 DNAME::DNAME(const DNAME& other) :

diff --git a/src/lib/dns/rdata/in_1/srv_33.cc b/src/lib/dns/rdata/in_1/srv_33.cc
index 8d900e62f558e50b70154fb12b0c150e909523fc..7166e144014934930ffdfe8249f889496a4d0249 100644 (file)
--- a/src/lib/dns/rdata/in_1/srv_33.cc
+++ b/src/lib/dns/rdata/in_1/srv_33.cc
@@ -25,9 +25,12 @@
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
 
+#include <dns/rdata/generic/detail/lexer_util.h>
+
 using namespace std;
 using namespace isc::util;
 using namespace isc::util::str;
+using isc::dns::rdata::generic::detail::createNameFromLexer;
 
 // BEGIN_ISC_NAMESPACE
 // BEGIN_RDATA_NAMESPACE
@@ -120,8 +123,8 @@ SRV::SRV(InputBuffer& buffer, size_t rdata_len) {
     impl_ = new SRVImpl(priority, weight, port, targetname);
 }
 
-SRV::SRV(MasterLexer& lexer, const Name*, MasterLoader::Options,
-         MasterLoaderCallbacks&)
+SRV::SRV(MasterLexer& lexer, const Name* origin,
+         MasterLoader::Options, MasterLoaderCallbacks&)
 {
     uint32_t num = lexer.getNextToken(MasterToken::NUMBER).getNumber();
     if (num > 65535) {
@@ -141,8 +144,7 @@ SRV::SRV(MasterLexer& lexer, const Name*, MasterLoader::Options,
     }
     const uint16_t port = static_cast<uint16_t>(num);
 
-    const Name targetname =
-        Name(lexer.getNextToken(MasterToken::QSTRING).getString());
+    const Name targetname = createNameFromLexer(lexer, origin);
 
     impl_ = new SRVImpl(priority, weight, port, targetname);
 }

diff --git a/src/lib/dns/tests/rdata_cname_unittest.cc b/src/lib/dns/tests/rdata_cname_unittest.cc
index 6451f72948c06cf4270142b5d49576c1b6cf60d8..eda3aefad941f11450c7060d01197eba9b6e43d1 100644 (file)
--- a/src/lib/dns/tests/rdata_cname_unittest.cc
+++ b/src/lib/dns/tests/rdata_cname_unittest.cc
@@ -90,7 +90,7 @@ TEST_F(Rdata_CNAME_Test, createFromWire) {
 TEST_F(Rdata_CNAME_Test, createFromLexer) {
     EXPECT_EQ(0, rdata_cname.compare(
         *test::createRdataUsingLexer(RRType::CNAME(), RRClass::IN(),
-                                     "cn.example.com")));
+                                     "cn.example.com.")));
 }
 
 TEST_F(Rdata_CNAME_Test, toWireBuffer) {

diff --git a/src/lib/dns/tests/rdata_dname_unittest.cc b/src/lib/dns/tests/rdata_dname_unittest.cc
index c4e517c555c5a4f82a3774bd4fe9e38ea15898d4..1dc3fecdd807be771f4ca42d5771b80b50f2dc3b 100644 (file)
--- a/src/lib/dns/tests/rdata_dname_unittest.cc
+++ b/src/lib/dns/tests/rdata_dname_unittest.cc
@@ -92,7 +92,7 @@ TEST_F(Rdata_DNAME_Test, createFromWire) {
 TEST_F(Rdata_DNAME_Test, createFromLexer) {
     EXPECT_EQ(0, rdata_dname.compare(
         *test::createRdataUsingLexer(RRType::DNAME(), RRClass::IN(),
-                                     "dn.example.com")));
+                                     "dn.example.com.")));
 }
 
 TEST_F(Rdata_DNAME_Test, toWireBuffer) {