BIND 10 trac2390, updated. 8abe1c291c6d2869b59b3992cdbcd4fae51fe665 [2390] Use createNameFromLexer()
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Jan 28 07:20:14 UTC 2013
The branch, trac2390 has been updated
via 8abe1c291c6d2869b59b3992cdbcd4fae51fe665 (commit)
from d42715b7e7f0f43943dd47e4a99adca852fb52d5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8abe1c291c6d2869b59b3992cdbcd4fae51fe665
Author: Mukund Sivaraman <muks at isc.org>
Date: Mon Jan 28 12:48:07 2013 +0530
[2390] Use createNameFromLexer()
Also fix tests to use absolute names.
-----------------------------------------------------------------------
Summary of changes:
src/lib/dns/rdata/generic/mx_15.cc | 10 ++++++----
src/lib/dns/rdata/generic/ns_2.cc | 8 +++++---
src/lib/dns/rdata/generic/ptr_12.cc | 6 +++---
src/lib/dns/tests/rdata_mx_unittest.cc | 6 +++---
src/lib/dns/tests/rdata_ns_unittest.cc | 2 +-
src/lib/dns/tests/rdata_ptr_unittest.cc | 2 +-
6 files changed, 19 insertions(+), 15 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/dns/rdata/generic/mx_15.cc b/src/lib/dns/rdata/generic/mx_15.cc
index 48e4c26..32c01f3 100644
--- a/src/lib/dns/rdata/generic/mx_15.cc
+++ b/src/lib/dns/rdata/generic/mx_15.cc
@@ -26,6 +26,8 @@
#include <dns/rdata.h>
#include <dns/rdataclass.h>
+#include <dns/rdata/generic/detail/lexer_util.h>
+
using namespace std;
using boost::lexical_cast;
using namespace isc::util;
@@ -57,17 +59,17 @@ MX::MX(const std::string& mx_str) :
mxname_ = Name(mxname);
}
-MX::MX(MasterLexer& lexer, const Name*, MasterLoader::Options,
- MasterLoaderCallbacks&) :
+MX::MX(MasterLexer& lexer, const Name* origin,
+ MasterLoader::Options, MasterLoaderCallbacks&) :
preference_(0), mxname_(".")
{
uint32_t num = lexer.getNextToken(MasterToken::NUMBER).getNumber();
if (num > 65535) {
isc_throw(InvalidRdataText, "Invalid MX preference");
}
-
preference_ = static_cast<uint16_t>(num);
- mxname_ = Name(lexer.getNextToken(MasterToken::QSTRING).getString());
+
+ mxname_ = createNameFromLexer(lexer, origin);
}
MX::MX(uint16_t preference, const Name& mxname) :
diff --git a/src/lib/dns/rdata/generic/ns_2.cc b/src/lib/dns/rdata/generic/ns_2.cc
index a6891fe..96d5704 100644
--- a/src/lib/dns/rdata/generic/ns_2.cc
+++ b/src/lib/dns/rdata/generic/ns_2.cc
@@ -22,6 +22,8 @@
#include <dns/rdata.h>
#include <dns/rdataclass.h>
+#include <dns/rdata/generic/detail/lexer_util.h>
+
using namespace std;
using namespace isc::util;
@@ -39,9 +41,9 @@ NS::NS(InputBuffer& buffer, size_t) :
// check consistency.
}
-NS::NS(MasterLexer& lexer, const Name*, MasterLoader::Options,
- MasterLoaderCallbacks&) :
- nsname_(lexer.getNextToken(MasterToken::QSTRING).getString())
+NS::NS(MasterLexer& lexer, const Name* origin,
+ MasterLoader::Options, MasterLoaderCallbacks&) :
+ nsname_(createNameFromLexer(lexer, origin))
{}
NS::NS(const NS& other) :
diff --git a/src/lib/dns/rdata/generic/ptr_12.cc b/src/lib/dns/rdata/generic/ptr_12.cc
index 6b47d06..6a3cefa 100644
--- a/src/lib/dns/rdata/generic/ptr_12.cc
+++ b/src/lib/dns/rdata/generic/ptr_12.cc
@@ -39,9 +39,9 @@ PTR::PTR(InputBuffer& buffer, size_t) :
// check consistency.
}
-PTR::PTR(MasterLexer& lexer, const Name*, MasterLoader::Options,
- MasterLoaderCallbacks&) :
- ptr_name_(lexer.getNextToken(MasterToken::QSTRING).getString())
+PTR::PTR(MasterLexer& lexer, const Name* origin,
+ MasterLoader::Options, MasterLoaderCallbacks&) :
+ ptr_name_(createNameFromLexer(lexer, origin))
{}
PTR::PTR(const PTR& source) :
diff --git a/src/lib/dns/tests/rdata_mx_unittest.cc b/src/lib/dns/tests/rdata_mx_unittest.cc
index 9935dd5..2292dea 100644
--- a/src/lib/dns/tests/rdata_mx_unittest.cc
+++ b/src/lib/dns/tests/rdata_mx_unittest.cc
@@ -65,15 +65,15 @@ TEST_F(Rdata_MX_Test, createFromWire) {
TEST_F(Rdata_MX_Test, createFromLexer) {
EXPECT_EQ(0, rdata_mx.compare(
*test::createRdataUsingLexer(RRType::MX(), RRClass::IN(),
- "10 mx.example.com")));
+ "10 mx.example.com.")));
// Exceptions cause NULL to be returned.
EXPECT_FALSE(test::createRdataUsingLexer(RRType::MX(), RRClass::IN(),
- "10 mx. example.com"));
+ "10 mx. example.com."));
// 65536 is larger than maximum possible preference
EXPECT_FALSE(test::createRdataUsingLexer(RRType::MX(), RRClass::IN(),
- "65536 mx.example.com"));
+ "65536 mx.example.com."));
}
TEST_F(Rdata_MX_Test, toWireRenderer) {
diff --git a/src/lib/dns/tests/rdata_ns_unittest.cc b/src/lib/dns/tests/rdata_ns_unittest.cc
index d536393..8ec2a2b 100644
--- a/src/lib/dns/tests/rdata_ns_unittest.cc
+++ b/src/lib/dns/tests/rdata_ns_unittest.cc
@@ -89,7 +89,7 @@ TEST_F(Rdata_NS_Test, createFromWire) {
TEST_F(Rdata_NS_Test, createFromLexer) {
EXPECT_EQ(0, rdata_ns.compare(
*test::createRdataUsingLexer(RRType::NS(), RRClass::IN(),
- "ns.example.com")));
+ "ns.example.com.")));
// Exceptions cause NULL to be returned.
EXPECT_FALSE(test::createRdataUsingLexer(RRType::NS(), RRClass::IN(),
diff --git a/src/lib/dns/tests/rdata_ptr_unittest.cc b/src/lib/dns/tests/rdata_ptr_unittest.cc
index 44b849a..cecbdd3 100644
--- a/src/lib/dns/tests/rdata_ptr_unittest.cc
+++ b/src/lib/dns/tests/rdata_ptr_unittest.cc
@@ -93,7 +93,7 @@ TEST_F(Rdata_PTR_Test, createFromWire) {
TEST_F(Rdata_PTR_Test, createFromLexer) {
EXPECT_EQ(0, rdata_ptr.compare(
*test::createRdataUsingLexer(RRType::PTR(), RRClass::IN(),
- "ns.example.com")));
+ "ns.example.com.")));
}
TEST_F(Rdata_PTR_Test, toWireBuffer) {
More information about the bind10-changes
mailing list