mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-05 08:25:16 +00:00
Code Issues Releases Wiki Activity

[1839] Ensure that BasicRRset's methods are actually called (cleanup duplication)

Browse Source
This commit is contained in:
Mukund Sivaraman
2014-01-09 08:43:40 +05:30
parent 6a7967f6f7
commit 57a2ddcad8
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/lib/dns/rrset.cc
View File

@@ -315,15 +315,13 @@ RRset::getRRsigDataCount() const {
unsigned int
RRset::toWire(OutputBuffer& buffer) const {
unsigned int rrs_written;
rrs_written = rrsetToWire<OutputBuffer>(*this, buffer, 0);
unsigned int rrs_written = BasicRRset::toWire(buffer);
if (getRdataCount() > rrs_written) {
return (rrs_written);
}
if (rrsig_) {
rrs_written += rrsetToWire<OutputBuffer>(*(rrsig_.get()), buffer, 0);
rrs_written += rrsig_->toWire(buffer);
}
return (rrs_written);
@@ -331,24 +329,17 @@ RRset::toWire(OutputBuffer& buffer) const {
unsigned int
RRset::toWire(AbstractMessageRenderer& renderer) const {
unsigned int rrs_written;
rrs_written =
rrsetToWire<AbstractMessageRenderer>(*this, renderer,
renderer.getLengthLimit());
unsigned int rrs_written = BasicRRset::toWire(renderer);
if (getRdataCount() > rrs_written) {
renderer.setTruncated();
return (rrs_written);
}
if (rrsig_) {
rrs_written +=
rrsetToWire<AbstractMessageRenderer>(*(rrsig_.get()), renderer,
renderer.getLengthLimit());
}
rrs_written += rrsig_->toWire(renderer);
if (getRdataCount() + getRRsigDataCount() > rrs_written) {
renderer.setTruncated();
if (getRdataCount() + getRRsigDataCount() > rrs_written) {
renderer.setTruncated();
}
}
return (rrs_written);