mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 13:37:55 +00:00
Code Issues Releases Wiki Activity

[3088] Minor review fixes.

Browse Source 
Fixed two missed minor cleanups from the initial review.
This commit is contained in:
Thomas Markwalder
2013-12-17 11:38:47 -05:00
parent 59bd021c72
commit 13d812dc84
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/d2/nc_trans.cc
View File

@@ -263,20 +263,17 @@ NameChangeTransaction::addLeaseAddressRdata(dns::RRsetPtr& rrset) {
try {
// Manufacture an RData from the lease address then add it to the RR.
dns::rdata::ConstRdataPtr rdata;
if (ncr_->isV4()) {
dns::rdata::ConstRdataPtr rdata(new dns::rdata::in::
A(ncr_->getIpAddress()));
rrset->addRdata(rdata);
rdata.reset(new dns::rdata::in::A(ncr_->getIpAddress()));
} else {
dns::rdata::ConstRdataPtr rdata(new dns::rdata::in::
AAAA(ncr_->getIpAddress()));
rrset->addRdata(rdata);
rdata.reset(new dns::rdata::in::AAAA(ncr_->getIpAddress()));
}
rrset->addRdata(rdata);
} catch (const std::exception& ex) {
isc_throw(NameChangeTransactionError, "Cannot add address rdata: "
<< ex.what());
}
}
void

8
src/bin/d2/tests/nc_remove_unittests.cc
View File

@@ -96,7 +96,7 @@ public:
///
/// This method simulates the completion of a DNSClient send. This allows
/// the state handler logic devoted to dealing with IO completion to be
/// fully exercise without requiring any actual IO. The two primary
/// fully exercised without requiring any actual IO. The two primary
/// pieces of information gleaned from IO completion are the DNSClient
/// status which indicates whether or not the IO exchange was successful
/// and the rcode, which indicates the server's reaction to the request.
@@ -292,13 +292,13 @@ TEST(NameRemoveTransaction, construction) {
// Verify that construction with wrong change type fails.
EXPECT_THROW(NameRemoveTransaction(io_service, ncr,
forward_domain, reverse_domain),
NameRemoveTransactionError);
forward_domain, reverse_domain),
NameRemoveTransactionError);
// Verify that a valid construction attempt works.
ncr->setChangeType(isc::dhcp_ddns::CHG_REMOVE);
EXPECT_NO_THROW(NameRemoveTransaction(io_service, ncr,
forward_domain, reverse_domain));
forward_domain, reverse_domain));
}
/// @brief Tests event and state dictionary construction and verification.