From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 2 May 2016 11:01:23 +0000 (+0200)
Subject: rename a bunch of things
X-Git-Tag: rec-4.0.0-alpha3~15^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3802%2Fhead;p=thirdparty%2Fpdns.git

rename a bunch of things
---

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index f6bb460696..ab7d0055dc 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -472,7 +472,7 @@ void mainthread()
    DNSPacket::s_udpTruncationThreshold = std::max(512, ::arg().asNum("udp-truncation-threshold"));
    DNSPacket::s_doEDNSSubnetProcessing = ::arg().mustDo("edns-subnet-processing");
 
-   secPollParseResolveConf();
+   stubParseResolveConf();
 
    if(!::arg()["chroot"].empty()) {
      triggerLoadOfLibraries();
diff --git a/pdns/secpoll-auth.cc b/pdns/secpoll-auth.cc
index 33570afb26..66cc0ed112 100644
--- a/pdns/secpoll-auth.cc
+++ b/pdns/secpoll-auth.cc
@@ -46,7 +46,7 @@ void doSecPoll(bool first)
 
   vector<DNSResourceRecord> ret;
 
-  int res=doResolve(query, QType::TXT, ret);
+  int res=stubDoResolve(query, QType::TXT, ret);
 
   int security_status=0;
 
diff --git a/pdns/stubresolver.cc b/pdns/stubresolver.cc
index 7dbcf97e58..87505e05c1 100644
--- a/pdns/stubresolver.cc
+++ b/pdns/stubresolver.cc
@@ -14,14 +14,14 @@
 #include "statbag.hh"
 #include "stubresolver.hh"
 
-// s_secpollresolvers contains the ComboAddresses that are used to resolve the
-// secpoll status of PowerDNS
-static vector<ComboAddress> s_secpollresolvers;
+// s_stubresolvers contains the ComboAddresses that are used by
+// stubDoResolve
+static vector<ComboAddress> s_stubresolvers;
 
 /** Parse /etc/resolv.conf and add the nameservers to the vector
- * s_secpollresolvers.
+ * s_stubresolvers.
  */
-void secPollParseResolveConf()
+void stubParseResolveConf()
 {
   ifstream ifs("/etc/resolv.conf");
   if(!ifs)
@@ -41,7 +41,7 @@ void secPollParseResolveConf()
       stringtok(parts, line, " \t,"); // be REALLY nice
       for(vector<string>::const_iterator iter = parts.begin()+1; iter != parts.end(); ++iter) {
         try {
-          s_secpollresolvers.push_back(ComboAddress(*iter, 53));
+          s_stubresolvers.push_back(ComboAddress(*iter, 53));
         }
         catch(...)
         {
@@ -51,34 +51,34 @@ void secPollParseResolveConf()
   }
 
   if(::arg().mustDo("recursor"))
-    s_secpollresolvers.push_back(ComboAddress(::arg()["recursor"], 53));
+    s_stubresolvers.push_back(ComboAddress(::arg()["recursor"], 53));
 
   // Last resort, add 127.0.0.1
-  if(s_secpollresolvers.empty()) {
-    s_secpollresolvers.push_back(ComboAddress("127.0.0.1", 53));
+  if(s_stubresolvers.empty()) {
+    s_stubresolvers.push_back(ComboAddress("127.0.0.1", 53));
   }
 }
 
-// s_secpollresolvers contains the ComboAddresses that are used to resolve the
-int doResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& ret)
+// s_stubresolvers contains the ComboAddresses that are used to resolve the
+int stubDoResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& ret)
 {
   vector<uint8_t> packet;
 
   DNSPacketWriter pw(packet, DNSName(qname), qtype);
   pw.getHeader()->id=dns_random(0xffff);
   pw.getHeader()->rd=1;
-  if (s_secpollresolvers.empty()) {
-    L<<Logger::Warning<<"No recursors set, secpoll impossible."<<endl;
+  if (s_stubresolvers.empty()) {
+    L<<Logger::Warning<<"No recursors set, stub resolving (including secpoll and ALIAS) impossible."<<endl;
     return RCode::ServFail;
   }
 
-  string msg ="Doing secpoll, using resolvers: ";
-  for (const auto& server : s_secpollresolvers) {
+  string msg ="Doing stub resolving, using resolvers: ";
+  for (const auto& server : s_stubresolvers) {
     msg += server.toString() + ", ";
   }
   L<<Logger::Debug<<msg.substr(0, msg.length() - 2)<<endl;
 
-  for(ComboAddress& dest :  s_secpollresolvers) {
+  for(ComboAddress& dest :  s_stubresolvers) {
     Socket sock(dest.sin4.sin_family, SOCK_DGRAM);
     sock.setNonBlocking();
     sock.sendTo(string(packet.begin(), packet.end()), dest);
@@ -103,7 +103,6 @@ int doResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& re
     if(mdp.d_header.rcode == RCode::ServFail)
       continue;
 
-
     for(MOADNSParser::answers_t::const_iterator i=mdp.d_answers.begin(); i!=mdp.d_answers.end(); ++i) {
       if(i->first.d_place == 1 && i->first.d_type==qtype) {
         DNSResourceRecord rr;
@@ -114,7 +113,7 @@ int doResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& re
         ret.push_back(rr);
       }
     }
-    L<<Logger::Debug<<"Secpoll got answered by "<<dest.toString()<<endl;
+    L<<Logger::Debug<<"Question got answered by "<<dest.toString()<<endl;
     return mdp.d_header.rcode;
   }
   return RCode::ServFail;
diff --git a/pdns/stubresolver.hh b/pdns/stubresolver.hh
index da013a2521..3882e6972a 100644
--- a/pdns/stubresolver.hh
+++ b/pdns/stubresolver.hh
@@ -2,5 +2,5 @@
 #include "namespaces.hh"
 #include "dnsparser.hh"
 
-void secPollParseResolveConf();
-int doResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& ret);
+void stubParseResolveConf();
+int stubDoResolve(const string& qname, uint16_t qtype, vector<DNSResourceRecord>& ret);