From: Otto Moerbeek Date: Wed, 12 Jan 2022 10:43:58 +0000 (+0100) Subject: As suggested, rename a few types and vars to make them more friendly to the reader X-Git-Tag: auth-4.7.0-alpha1~67^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2e2e2ed98029867800a6d7f977530ea1cba6aaf;p=thirdparty%2Fpdns.git As suggested, rename a few types and vars to make them more friendly to the reader --- diff --git a/pdns/zonemd.cc b/pdns/zonemd.cc index c48357cdfe..fe7fae2bff 100644 --- a/pdns/zonemd.cc +++ b/pdns/zonemd.cc @@ -5,12 +5,12 @@ #include "sha.hh" #include "zoneparser-tng.hh" -typedef std::pair rrSetKey_t; -typedef std::vector> rrVector_t; +typedef std::pair RRSetKey_t; +typedef std::vector> RRVector_t; -struct CanonrrSetKeyCompare : public std::binary_function +struct CanonRRSetKeyCompare : public std::binary_function { - bool operator()(const rrSetKey_t& a, const rrSetKey_t& b) const + bool operator()(const RRSetKey_t& a, const RRSetKey_t& b) const { // FIXME surely we can be smarter here if (a.first.canonCompare(b.first)) { @@ -23,14 +23,14 @@ struct CanonrrSetKeyCompare : public std::binary_function RRsetMap_t; +typedef std::map RRSetMap_t; void pdns::zonemdVerify(const DNSName& zone, ZoneParserTNG& zpt, bool& validationDone, bool& validationOK) { validationDone = false; validationOK = false; - // scheme,hashalgo -> duplicate,zonemdrecord + // scheme,hashalgo -> zonemdrecord,duplicate struct ZoneMDAndDuplicateFlag { std::shared_ptr record; @@ -38,38 +38,38 @@ void pdns::zonemdVerify(const DNSName& zone, ZoneParserTNG& zpt, bool& validatio }; std::map, ZoneMDAndDuplicateFlag> zonemdRecords; - std::shared_ptr soarc; + std::shared_ptr soaRecordContent; - RRsetMap_t RRsets; - std::map RRsetTTLs; + RRSetMap_t resourceRecordSets; + std::map resourceRecordSetTTLs; - DNSResourceRecord dnsrr; + DNSResourceRecord dnsResourceRecord; // Get all records and remember RRSets and TTLs - while (zpt.get(dnsrr)) { - if (!dnsrr.qname.isPartOf(zone) && dnsrr.qname != zone) { + while (zpt.get(dnsResourceRecord)) { + if (!dnsResourceRecord.qname.isPartOf(zone) && dnsResourceRecord.qname != zone) { continue; } - if (dnsrr.qtype == QType::SOA && soarc) { + if (dnsResourceRecord.qtype == QType::SOA && soaRecordContent) { // XXX skip extra SOA? continue; } std::shared_ptr drc; try { - drc = DNSRecordContent::mastermake(dnsrr.qtype, QClass::IN, dnsrr.content); + drc = DNSRecordContent::mastermake(dnsResourceRecord.qtype, QClass::IN, dnsResourceRecord.content); } catch (const PDNSException& pe) { - std::string err = "Bad record content in record for '" + dnsrr.qname.toStringNoDot() + "'|" + dnsrr.qtype.toString() + ": " + pe.reason; + std::string err = "Bad record content in record for '" + dnsResourceRecord.qname.toStringNoDot() + "'|" + dnsResourceRecord.qtype.toString() + ": " + pe.reason; throw PDNSException(err); } catch (const std::exception& e) { - std::string err = "Bad record content in record for '" + dnsrr.qname.toStringNoDot() + "|" + dnsrr.qtype.toString() + "': " + e.what(); + std::string err = "Bad record content in record for '" + dnsResourceRecord.qname.toStringNoDot() + "|" + dnsResourceRecord.qtype.toString() + "': " + e.what(); throw PDNSException(err); } - if (dnsrr.qtype == QType::SOA && dnsrr.qname == zone) { - soarc = std::dynamic_pointer_cast(drc); + if (dnsResourceRecord.qtype == QType::SOA && dnsResourceRecord.qname == zone) { + soaRecordContent = std::dynamic_pointer_cast(drc); } - if (dnsrr.qtype == QType::ZONEMD && dnsrr.qname == zone) { + if (dnsResourceRecord.qtype == QType::ZONEMD && dnsResourceRecord.qname == zone) { auto zonemd = std::dynamic_pointer_cast(drc); auto inserted = zonemdRecords.insert({pair(zonemd->d_scheme, zonemd->d_hashalgo), {zonemd, false}}); if (!inserted.second) { @@ -77,9 +77,9 @@ void pdns::zonemdVerify(const DNSName& zone, ZoneParserTNG& zpt, bool& validatio inserted.first->second.duplicate = true; } } - rrSetKey_t key = std::pair(dnsrr.qname, dnsrr.qtype); - RRsets[key].push_back(drc); - RRsetTTLs[key] = dnsrr.ttl; + RRSetKey_t key = std::pair(dnsResourceRecord.qname, dnsResourceRecord.qtype); + resourceRecordSets[key].push_back(drc); + resourceRecordSetTTLs[key] = dnsResourceRecord.ttl; } // Determine which digests to compute based on accepted zonemd records present @@ -99,7 +99,7 @@ void pdns::zonemdVerify(const DNSName& zone, ZoneParserTNG& zpt, bool& validatio // considered successful with this ZONEMD RR. const auto duplicate = it->second.duplicate; const auto& r = it->second.record; - if (!duplicate && r->d_serial == soarc->d_st.serial && r->d_scheme == 1 && (r->d_hashalgo == 1 || r->d_hashalgo == 2)) { + if (!duplicate && r->d_serial == soaRecordContent->d_st.serial && r->d_scheme == 1 && (r->d_hashalgo == 1 || r->d_hashalgo == 2)) { // A supported ZONEMD record if (r->d_hashalgo == 1) { sha384digest = make_unique(384); @@ -125,7 +125,7 @@ void pdns::zonemdVerify(const DNSName& zone, ZoneParserTNG& zpt, bool& validatio }; // Compute requested digests - for (auto& rrset : RRsets) { + for (auto& rrset : resourceRecordSets) { const auto& qname = rrset.first.first; const auto& qtype = rrset.first.second; if (qtype == QType::ZONEMD && qname == zone) { @@ -145,7 +145,7 @@ void pdns::zonemdVerify(const DNSName& zone, ZoneParserTNG& zpt, bool& validatio if (qtype != QType::RRSIG) { RRSIGRecordContent rrc; - rrc.d_originalttl = RRsetTTLs[rrset.first]; + rrc.d_originalttl = resourceRecordSetTTLs[rrset.first]; rrc.d_type = qtype; auto msg = getMessageForRRSET(qname, rrc, sorted, false, false); hash(msg); @@ -156,7 +156,7 @@ void pdns::zonemdVerify(const DNSName& zone, ZoneParserTNG& zpt, bool& validatio for (const auto& rrsig : sorted) { auto rrsigc = std::dynamic_pointer_cast(rrsig); RRSIGRecordContent rrc; - rrc.d_originalttl = RRsetTTLs[pair(rrset.first.first, rrsigc->d_type)]; + rrc.d_originalttl = resourceRecordSetTTLs[pair(rrset.first.first, rrsigc->d_type)]; rrc.d_type = qtype; auto msg = getMessageForRRSET(qname, rrc, {rrsigc}, false, false); hash(msg);