From: Charles-Henri Bruyand Date: Thu, 13 Dec 2018 12:40:55 +0000 (+0100) Subject: Prefer prefix ++/-- operators for non-primitive types X-Git-Tag: rec-4.2.0-alpha1~49^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb167afdad78a45d79ceeeb9132e6973e3b64185;p=thirdparty%2Fpdns.git Prefer prefix ++/-- operators for non-primitive types --- diff --git a/pdns/dnsdist-dnscrypt.cc b/pdns/dnsdist-dnscrypt.cc index bc8c75a234..448efcd6ea 100644 --- a/pdns/dnsdist-dnscrypt.cc +++ b/pdns/dnsdist-dnscrypt.cc @@ -40,7 +40,7 @@ int handleDNSCryptQuery(char* packet, uint16_t len, std::shared_ptr(sizeof(struct dnsheader))) { - g_stats.nonCompliantQueries++; + ++g_stats.nonCompliantQueries; return false; } diff --git a/pdns/dnsdist-tcp.cc b/pdns/dnsdist-tcp.cc index e30cbe14de..e369aa0e07 100644 --- a/pdns/dnsdist-tcp.cc +++ b/pdns/dnsdist-tcp.cc @@ -324,12 +324,12 @@ void tcpClientThread(int pipefd) queriesCount++; if (qlen < sizeof(dnsheader)) { - g_stats.nonCompliantQueries++; + ++g_stats.nonCompliantQueries; break; } ci.cs->queries++; - g_stats.queries++; + ++g_stats.queries; if (g_maxTCPQueriesPerConn && queriesCount > g_maxTCPQueriesPerConn) { vinfolog("Terminating TCP connection from %s because it reached the maximum number of queries per conn (%d / %d)", ci.remote.toStringWithPort(), queriesCount, g_maxTCPQueriesPerConn); @@ -413,7 +413,7 @@ void tcpClientThread(int pipefd) } #endif handler.writeSizeAndMsg(query, dq.len, g_tcpSendTimeout); - g_stats.selfAnswered++; + ++g_stats.selfAnswered; continue; } @@ -465,14 +465,14 @@ void tcpClientThread(int pipefd) } #endif handler.writeSizeAndMsg(cachedResponse, cachedResponseSize, g_tcpSendTimeout); - g_stats.cacheHits++; + ++g_stats.cacheHits; continue; } - g_stats.cacheMisses++; + ++g_stats.cacheMisses; } if(!ds) { - g_stats.noPolicy++; + ++g_stats.noPolicy; if (g_servFailOnNoPolicy) { restoreFlags(dh, origFlags); @@ -662,7 +662,7 @@ void tcpClientThread(int pipefd) sockets.erase(ds->remote); } - g_stats.responses++; + ++g_stats.responses; struct timespec answertime; gettime(&answertime); unsigned int udiff = 1000000.0*DiffTime(now,answertime); @@ -722,7 +722,7 @@ void tcpAcceptorThread(void* p) } if(!acl->match(remote)) { - g_stats.aclDrops++; + ++g_stats.aclDrops; vinfolog("Dropped TCP connection from %s because of ACL", remote.toStringWithPort()); continue; } diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc index 915d90484f..1d3752bf94 100644 --- a/pdns/dnsdist.cc +++ b/pdns/dnsdist.cc @@ -196,12 +196,12 @@ DelayPipe * g_delay = 0; void doLatencyStats(double udiff) { - if(udiff < 1000) g_stats.latency0_1++; - else if(udiff < 10000) g_stats.latency1_10++; - else if(udiff < 50000) g_stats.latency10_50++; - else if(udiff < 100000) g_stats.latency50_100++; - else if(udiff < 1000000) g_stats.latency100_1000++; - else g_stats.latencySlow++; + if(udiff < 1000) ++g_stats.latency0_1; + else if(udiff < 10000) ++g_stats.latency1_10; + else if(udiff < 50000) ++g_stats.latency10_50; + else if(udiff < 100000) ++g_stats.latency50_100; + else if(udiff < 1000000) ++g_stats.latency100_1000; + else ++g_stats.latencySlow; auto doAvg = [](double& var, double n, double weight) { var = (weight -1) * var/weight + n/weight; @@ -228,7 +228,7 @@ bool responseContentMatches(const char* response, const uint16_t responseLen, co return true; } else { - g_stats.nonCompliantResponses++; + ++g_stats.nonCompliantResponses; return false; } } @@ -239,7 +239,7 @@ bool responseContentMatches(const char* response, const uint16_t responseLen, co catch(std::exception& e) { if(responseLen > (ssize_t)sizeof(dnsheader)) infolog("Backend %s sent us a response with id %d that did not parse: %s", remote.toStringWithPort(), ntohs(dh->id), e.what()); - g_stats.nonCompliantResponses++; + ++g_stats.nonCompliantResponses; return false; } @@ -535,7 +535,7 @@ try { sendUDPResponse(origFD, response, responseLen, ids->delayMsec, ids->destHarvested ? ids->origDest : empty, ids->origRemote); } - g_stats.responses++; + ++g_stats.responses; double udiff = ids->sentTime.udiff(); vinfolog("Got answer from %s, relayed to %s, took %f usec", dss->remote.toStringWithPort(), ids->origRemote.toStringWithPort(), udiff); @@ -544,8 +544,9 @@ try { gettime(&ts); g_rings.insertResponse(ts, ids->origRemote, ids->qname, ids->qtype, (unsigned int)udiff, (unsigned int)got, *dh, dss->remote); - if(dh->rcode == RCode::ServFail) - g_stats.servfailResponses++; + if(dh->rcode == RCode::ServFail) { + ++g_stats.servfailResponses; + } dss->latencyUsec = (127.0 * dss->latencyUsec / 128.0) + udiff/128.0; doLatencyStats(udiff); @@ -961,7 +962,7 @@ bool processQuery(LocalHolders& holders, DNSQuestion& dq, string& poolname, int* if(auto got = holders.dynNMGBlock->lookup(*dq.remote)) { auto updateBlockStats = [&got]() { - g_stats.dynBlocked++; + ++g_stats.dynBlocked; got->second.blocks++; }; @@ -1018,7 +1019,7 @@ bool processQuery(LocalHolders& holders, DNSQuestion& dq, string& poolname, int* if(auto got = holders.dynSMTBlock->lookup(*dq.qname)) { auto updateBlockStats = [&got]() { - g_stats.dynBlocked++; + ++g_stats.dynBlocked; got->blocks++; }; @@ -1083,25 +1084,25 @@ bool processQuery(LocalHolders& holders, DNSQuestion& dq, string& poolname, int* return true; break; case DNSAction::Action::Drop: - g_stats.ruleDrop++; + ++g_stats.ruleDrop; return false; break; case DNSAction::Action::Nxdomain: dq.dh->rcode = RCode::NXDomain; dq.dh->qr=true; - g_stats.ruleNXDomain++; + ++g_stats.ruleNXDomain; return true; break; case DNSAction::Action::Refused: dq.dh->rcode = RCode::Refused; dq.dh->qr=true; - g_stats.ruleRefused++; + ++g_stats.ruleRefused; return true; break; case DNSAction::Action::ServFail: dq.dh->rcode = RCode::ServFail; dq.dh->qr=true; - g_stats.ruleServFail++; + ++g_stats.ruleServFail; return true; break; case DNSAction::Action::Spoof: @@ -1213,18 +1214,18 @@ static bool isUDPQueryAcceptable(ClientState& cs, LocalHolders& holders, const s if (msgh->msg_flags & MSG_TRUNC) { /* message was too large for our buffer */ vinfolog("Dropping message too large for our buffer"); - g_stats.nonCompliantQueries++; + ++g_stats.nonCompliantQueries; return false; } if(!holders.acl->match(remote)) { vinfolog("Query from %s dropped because of ACL", remote.toStringWithPort()); - g_stats.aclDrops++; + ++g_stats.aclDrops; return false; } cs.queries++; - g_stats.queries++; + ++g_stats.queries; if (HarvestDestinationAddress(msgh, &dest)) { /* we don't get the port, only the address */ @@ -1264,17 +1265,17 @@ static bool checkDNSCryptQuery(const ClientState& cs, const char* query, uint16_ bool checkQueryHeaders(const struct dnsheader* dh) { if (dh->qr) { // don't respond to responses - g_stats.nonCompliantQueries++; + ++g_stats.nonCompliantQueries; return false; } if (dh->qdcount == 0) { - g_stats.emptyQueries++; + ++g_stats.emptyQueries; return false; } if (dh->rd) { - g_stats.rdQueries++; + ++g_stats.rdQueries; } return true; @@ -1376,7 +1377,7 @@ static void processUDPQuery(ClientState& cs, LocalHolders& holders, const struct sendUDPResponse(cs.udpFD, response, responseLen, delayMsec, dest, remote); } - g_stats.selfAnswered++; + ++g_stats.selfAnswered; doLatencyStats(0); // we're not going to measure this } @@ -1443,15 +1444,15 @@ static void processUDPQuery(ClientState& cs, LocalHolders& holders, const struct } } - g_stats.cacheHits++; + ++g_stats.cacheHits; doLatencyStats(0); // we're not going to measure this return; } - g_stats.cacheMisses++; + ++g_stats.cacheMisses; } if(!ss) { - g_stats.noPolicy++; + ++g_stats.noPolicy; if (g_servFailOnNoPolicy && !cs.muted) { char* response = query; @@ -1511,7 +1512,7 @@ static void processUDPQuery(ClientState& cs, LocalHolders& holders, const struct } else { ss->reuseds++; - g_stats.downstreamTimeouts++; + ++g_stats.downstreamTimeouts; } ids->cs = &cs; @@ -1561,7 +1562,7 @@ static void processUDPQuery(ClientState& cs, LocalHolders& holders, const struct if(ret < 0) { ss->sendErrors++; - g_stats.downstreamSendErrors++; + ++g_stats.downstreamSendErrors; } vinfolog("Got query for %s|%s from %s, relayed to %s", ids->qname.toString(), QType(ids->qtype).getName(), remote.toStringWithPort(), ss->getName()); @@ -1688,7 +1689,7 @@ try ssize_t got = recvmsg(cs->udpFD, &msgh, 0); if (got < 0 || static_cast(got) < sizeof(struct dnsheader)) { - g_stats.nonCompliantQueries++; + ++g_stats.nonCompliantQueries; continue; } @@ -1981,7 +1982,7 @@ static void healthChecksThread() ids.age = 0; dss->reuseds++; --dss->outstanding; - g_stats.downstreamTimeouts++; // this is an 'actively' discovered timeout + ++g_stats.downstreamTimeouts; // this is an 'actively' discovered timeout vinfolog("Had a downstream timeout from %s (%s) for query for %s|%s from %s", dss->remote.toStringWithPort(), dss->name, ids.qname.toString(), QType(ids.qtype).getName(), ids.origRemote.toStringWithPort()); diff --git a/pdns/dynhandler.cc b/pdns/dynhandler.cc index b03b0a3605..50a29dd043 100644 --- a/pdns/dynhandler.cc +++ b/pdns/dynhandler.cc @@ -299,10 +299,10 @@ string DLNotifyHandler(const vector&parts, Utility::pid_t ppid) int total = 0; int notified = 0; - for (vector::const_iterator di=domains.begin(); di != domains.end(); di++) { - if (di->kind == 0) { // MASTER + for (const auto& di : domains) { + if (di.kind == 0) { // MASTER total++; - if(Communicator.notifyDomain(di->zone)) + if(Communicator.notifyDomain(di.zone)) notified++; } } @@ -366,9 +366,9 @@ string DLListZones(const vector&parts, Utility::pid_t ppid) int count = 0; - for (vector::const_iterator di=domains.begin(); di != domains.end(); di++) { - if (di->kind == kindFilter || kindFilter == -1) { - ret<zone.toString()<::const_iterator di=domains.begin(); di != domains.end(); di++) { - if (di->kind == kindFilter || kindFilter == -1) { - cout<zone<::iterator iter = meta.begin(); - for(;iter != meta.end(); iter++) if (*iter == name) break; + for(;iter != meta.end(); ++iter) if (*iter == name) break; if (iter != meta.end()) meta.erase(iter); if (B.setDomainMetadata(zname, metaKey, meta)) { cout << "Disabled TSIG key " << name << " for " << zname << endl; @@ -2920,8 +2920,8 @@ try std::map > meta; std::cout << "Metadata for '" << zone << "'" << endl; B.getAllDomainMetadata(zone, meta); - for(std::map >::const_iterator each_meta = meta.begin(); each_meta != meta.end(); each_meta++) { - cout << each_meta->first << " = " << boost::join(each_meta->second, ", ") << endl; + for(const auto& each_meta: meta) { + cout << each_meta.first << " = " << boost::join(each_meta.second, ", ") << endl; } } return 0; @@ -3164,9 +3164,8 @@ try nm=0; std::map > meta; if (src->getAllDomainMetadata(di.zone, meta)) { - std::map >::iterator i; - for(i=meta.begin(); i != meta.end(); i++) { - if (!tgt->setDomainMetadata(di.zone, i->first, i->second)) throw PDNSException("Failed to feed domain metadata"); + for (const auto& i : meta) { + if (!tgt->setDomainMetadata(di.zone, i.first, i.second)) throw PDNSException("Failed to feed domain metadata"); nm++; } } diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc index ce38487718..f060a009f0 100644 --- a/pdns/rfc2136handler.cc +++ b/pdns/rfc2136handler.cc @@ -197,10 +197,10 @@ uint PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *rr, // It's not possible to have multiple CNAME's with the same NAME. So we always update. } else if (rrType == QType::CNAME) { int changedCNames = 0; - for (vector::iterator i = rrset.begin(); i != rrset.end(); i++) { - if (i->ttl != rr->d_ttl || i->content != rr->d_content->getZoneRepresentation()) { - i->ttl = rr->d_ttl; - i->setContent(rr->d_content->getZoneRepresentation()); + for (auto& i : rrset) { + if (i.ttl != rr->d_ttl || i.content != rr->d_content->getZoneRepresentation()) { + i.ttl = rr->d_ttl; + i.setContent(rr->d_content->getZoneRepresentation()); changedCNames++; } } @@ -216,12 +216,12 @@ uint PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord *rr, } else { int updateTTL=0; foundRecord = false; - for (vector::iterator i = rrset.begin(); i != rrset.end(); i++) { + for (auto& i : rrset) { string content = rr->d_content->getZoneRepresentation(); - if (rrType == i->qtype.getCode() && i->getZoneRepresentation() == content) { + if (rrType == i.qtype.getCode() && i.getZoneRepresentation() == content) { foundRecord=true; - if (i->ttl != rr->d_ttl) { - i->ttl = rr->d_ttl; + if (i.ttl != rr->d_ttl) { + i.ttl = rr->d_ttl; updateTTL++; } } @@ -718,8 +718,9 @@ int PacketHandler::processUpdate(DNSPacket *p) { stringtok(allowedRanges, ::arg()["allow-dnsupdate-from"], ", \t" ); NetmaskGroup ng; - for(vector::const_iterator i=allowedRanges.begin(); i != allowedRanges.end(); i++) - ng.addMask(*i); + for(const auto& i: allowedRanges) { + ng.addMask(i); + } if ( ! ng.match(&p->d_remote)) { g_log<d_tsig_algo == TSIG_GSS) { GssName inputname(p->d_peer_principal); // match against principal since GSS - for(vector::const_iterator key=tsigKeys.begin(); key != tsigKeys.end(); key++) { - if (inputname.match(*key)) { + for(const auto& key: tsigKeys) { + if (inputname.match(key)) { validKey = true; break; } } } else { - for(vector::const_iterator key=tsigKeys.begin(); key != tsigKeys.end(); key++) { - if (inputkey == DNSName(*key)) { // because checkForCorrectTSIG has already been performed earlier on, if the names of the ky match with the domain given. THis is valid. + for(const auto& key: tsigKeys) { + if (inputkey == DNSName(key)) { // because checkForCorrectTSIG has already been performed earlier on, if the names of the ky match with the domain given. THis is valid. validKey=true; break; } @@ -838,7 +839,7 @@ int PacketHandler::processUpdate(DNSPacket *p) { typedef vector rrVector_t; typedef std::map RRsetMap_t; RRsetMap_t preReqRRsets; - for(const auto& i : mdp.d_answers) { + for(const auto& i: mdp.d_answers) { const DNSRecord* rr = &i.first; if (rr->d_place == DNSResourceRecord::ANSWER) { // Last line of 3.2.3 @@ -994,10 +995,10 @@ int PacketHandler::processUpdate(DNSPacket *p) { nsRRInZone.push_back(rec); } if (nsRRInZone.size() > nsRRtoDelete.size()) { // only delete if the NS's we delete are less then what we have in the zone (3.4.2.4) - for (vector::iterator inZone=nsRRInZone.begin(); inZone != nsRRInZone.end(); inZone++) { - for (vector::iterator rr=nsRRtoDelete.begin(); rr != nsRRtoDelete.end(); rr++) { - if (inZone->getZoneRepresentation() == (*rr)->d_content->getZoneRepresentation()) - changedRecords += performUpdate(msgPrefix, *rr, &di, isPresigned, &narrow, &haveNSEC3, &ns3pr, &updatedSerial); + for (auto& inZone: nsRRInZone) { + for (auto& rr: nsRRtoDelete) { + if (inZone.getZoneRepresentation() == (rr)->d_content->getZoneRepresentation()) + changedRecords += performUpdate(msgPrefix, rr, &di, isPresigned, &narrow, &haveNSEC3, &ns3pr, &updatedSerial); } } } diff --git a/pdns/statbag.cc b/pdns/statbag.cc index 7815e1e809..a4b0436f01 100644 --- a/pdns/statbag.cc +++ b/pdns/statbag.cc @@ -53,12 +53,9 @@ string StatBag::directory() string dir; ostringstream o; - for(map::const_iterator i=d_stats.begin(); - i!=d_stats.end(); - i++) - { - o<first<<"="<<*(i->second)<<","; - } + for(const auto& i: d_stats) { + o<StatBag::getEntries() { vector ret; - for(map::const_iterator i=d_stats.begin(); - i!=d_stats.end(); - i++) - ret.push_back(i->first); + for(const auto& i: d_stats) { + ret.push_back(i.first); + } for(const funcstats_t::value_type& val : d_funcstats) { ret.push_back(val.first); @@ -154,12 +150,9 @@ AtomicCounter *StatBag::getPointer(const string &key) StatBag::~StatBag() { - for(map::const_iterator i=d_stats.begin(); - i!=d_stats.end(); - i++) - { - delete i->second; - } + for(const auto& i: d_stats) { + delete i.second; + } } diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc index 9b45cdf39e..cf573c5788 100644 --- a/pdns/tcpreceiver.cc +++ b/pdns/tcpreceiver.cc @@ -959,12 +959,12 @@ int TCPNameserver::doAXFR(const DNSName &target, shared_ptr q, int ou n3rc.d_iterations = ns3pr.d_iterations; n3rc.d_algorithm = 1; // SHA1, fixed in PowerDNS for now nsecxrepo_t::const_iterator inext = iter; - inext++; + ++inext; if(inext == nsecxrepo.end()) inext = nsecxrepo.begin(); while(!inext->second.d_auth && inext != iter) { - inext++; + ++inext; if(inext == nsecxrepo.end()) inext = nsecxrepo.begin(); } diff --git a/pdns/zone2ldap.cc b/pdns/zone2ldap.cc index 05b626ef83..1d760dec35 100644 --- a/pdns/zone2ldap.cc +++ b/pdns/zone2ldap.cc @@ -303,19 +303,19 @@ int main( int argc, char* argv[] ) // ZP.setDirectory( BP.getDirectory() ); const vector &domains = BP.getDomains(); - for( vector::const_iterator i = domains.begin(); i != domains.end(); i++ ) + for(const auto& i: domains) { - if(i->type!="master" && i->type!="slave") { - cerr<<" Warning! Skipping '"<type<<"' zone '"<name<<"'"<name != g_rootdnsname && i->name != DNSName("localhost") && i->name != DNSName("0.0.127.in-addr.arpa") ) + if( i.name != g_rootdnsname && i.name != DNSName("localhost") && i.name != DNSName("0.0.127.in-addr.arpa") ) { - cerr << "Parsing file: " << i->filename << ", domain: " << i->name << endl; - g_zonename = i->name; - ZoneParserTNG zpt(i->filename, i->name, BP.getDirectory()); + cerr << "Parsing file: " << i.filename << ", domain: " << i.name << endl; + g_zonename = i.name; + ZoneParserTNG zpt(i.filename, i.name, BP.getDirectory()); DNSResourceRecord rr; while(zpt.get(rr)) { callback(g_domainid, rr.qname, rr.qtype.getName(), encode_non_ascii(rr.content), rr.ttl);