From bf491f9b8cdcc88ab6bb9cfb9bf967d3d6689608 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <cmouse@desteem.org>
Date: Thu, 20 Feb 2014 08:19:21 +0200
Subject: [PATCH] Replace rcode with RCode::to_s(rcode)

---
 pdns/dnspacket.cc          | 2 +-
 pdns/mastercommunicator.cc | 4 ++--
 pdns/notify.cc             | 2 +-
 pdns/resolver.cc           | 4 ++--
 pdns/syncres.cc            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index 88e831f159..7dcefd9e92 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -544,7 +544,7 @@ try
 
   if(!ntohs(d.qdcount)) {
     if(!d_tcp) {
-      L << Logger::Warning << "No question section in packet from " << getRemote() <<", rcode="<<(int)d.rcode<<endl;
+      L << Logger::Warning << "No question section in packet from " << getRemote() <<", error="<<RCode::to_s(d.rcode)<<endl;
       return -1;
     }
   }
diff --git a/pdns/mastercommunicator.cc b/pdns/mastercommunicator.cc
index 1d88c58f89..8da8dade3a 100644
--- a/pdns/mastercommunicator.cc
+++ b/pdns/mastercommunicator.cc
@@ -175,10 +175,10 @@ time_t CommunicatorClass::doNotifications()
     }
 
     if(p.d.rcode)
-      L<<Logger::Warning<<"Received unsuccessful notification report for '"<<p.qdomain<<"' from "<<from.toStringWithPort()<<", rcode: "<<p.d.rcode<<endl;      
+      L<<Logger::Warning<<"Received unsuccessful notification report for '"<<p.qdomain<<"' from "<<from.toStringWithPort()<<", error: "<<RCode::to_s(p.d.rcode)<<endl;      
 
     if(d_nq.removeIf(from.toStringWithPort(), p.d.id, p.qdomain))
-      L<<Logger::Warning<<"Removed from notification list: '"<<p.qdomain<<"' to "<<from.toStringWithPort()<< (p.d.rcode ? "" : " (was acknowledged)")<<endl;      
+      L<<Logger::Warning<<"Removed from notification list: '"<<p.qdomain<<"' to "<<from.toStringWithPort()<< (p.d.rcode ? RCode::to_s(p.d.rcode) : " (was acknowledged)")<<endl;      
     else {
       L<<Logger::Warning<<"Received spurious notify answer for '"<<p.qdomain<<"' from "<< from.toStringWithPort()<<endl;
       //d_nq.dump();
diff --git a/pdns/notify.cc b/pdns/notify.cc
index 1d3b85ed5a..acb60c05ad 100644
--- a/pdns/notify.cc
+++ b/pdns/notify.cc
@@ -61,7 +61,7 @@ try
   string packet(buffer, len);
   MOADNSParser mdp(packet);
 
-  cerr<<"Received notification response with code: "<<mdp.d_header.rcode<<endl;
+  cerr<<"Received notification response with error: "<<RCode::to_s(mdp.d_header.rcode)<<endl;
   cerr<<"For: '"<<mdp.d_qname<<"'"<<endl;
 }
 catch(std::exception& e)
diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index 92b0656ecd..d0357167bb 100644
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -277,7 +277,7 @@ bool Resolver::tryGetSOASerial(string* domain, uint32_t *theirSerial, uint32_t *
   *domain = stripDot(mdp.d_qname);
   
   if(mdp.d_answers.empty())
-    throw ResolverException("Query to '" + fromaddr.toStringWithPort() + "' for SOA of '" + *domain + "' produced no results (error code: "+strrcode(mdp.d_header.rcode)+")");
+    throw ResolverException("Query to '" + fromaddr.toStringWithPort() + "' for SOA of '" + *domain + "' produced no results (RCode: " + RCode::to_s(mdp.d_header.rcode) + ")");
   
   if(mdp.d_qtype != QType::SOA)
     throw ResolverException("Query to '" + fromaddr.toStringWithPort() + "' for SOA of '" + *domain + "' returned wrong record type");
@@ -467,7 +467,7 @@ int AXFRRetriever::getChunk(Resolver::res_t &res) // Implementation is making su
 
   int err = parseResult(mdp, "", 0, 0, &res);
   if(err) 
-    throw ResolverException("AXFR chunk with a non-zero rcode "+lexical_cast<string>(err));
+    throw ResolverException("AXFR chunk error: " + RCode::to_s(err));
 
   BOOST_FOREACH(const MOADNSParser::answers_t::value_type& answer, mdp.d_answers)
     if (answer.first.d_type == QType::SOA)
diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 1b94a83d88..ac13d4df70 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -981,7 +981,7 @@ int SyncRes::doResolveAt(set<string, CIStringCompare> nameservers, string auth,
           return RCode::ServFail;
         }
         
-        LOG(prefix<<qname<<": Got "<<(unsigned int)lwr.d_result.size()<<" answers from "<<*tns<<" ("<< remoteIP->toString() <<"), rcode="<<lwr.d_rcode<<", aa="<<lwr.d_aabit<<", in "<<lwr.d_usec/1000<<"ms"<<endl);
+        LOG(prefix<<qname<<": Got "<<(unsigned int)lwr.d_result.size()<<" answers from "<<*tns<<" ("<< remoteIP->toString() <<"), rcode="<<lwr.d_rcode<<" ("<<(RCode::to_s(lwr.d_rcode)<<"), aa="<<lwr.d_aabit<<", in "<<lwr.d_usec/1000<<"ms"<<endl);
 
         /*  // for you IPv6 fanatics :-)
         if(remoteIP->sin4.sin_family==AF_INET6)
-- 
2.47.3