From 9b0f144f6ee04d2cbbaca3cb9aa26c0806bff485 Mon Sep 17 00:00:00 2001
From: Kees Monshouwer <mind04@monshouwer.org>
Date: Fri, 1 Dec 2017 00:21:52 +0100
Subject: [PATCH] add toLogString() to ComboAddress and start using it

---
 pdns/dynhandler.cc        |  2 +-
 pdns/iputils.hh           |  6 +++++-
 pdns/logger.cc            |  2 +-
 pdns/resolver.cc          | 10 +++++-----
 pdns/rfc2136handler.cc    |  2 +-
 pdns/slavecommunicator.cc | 10 +++++-----
 pdns/ws-auth.cc           |  2 +-
 7 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pdns/dynhandler.cc b/pdns/dynhandler.cc
index 90f01a913c..e71649ea68 100644
--- a/pdns/dynhandler.cc
+++ b/pdns/dynhandler.cc
@@ -252,7 +252,7 @@ string DLNotifyRetrieveHandler(const vector<string>&parts, Utility::pid_t ppid)
 
   random_shuffle(di.masters.begin(), di.masters.end());
   Communicator.addSuckRequest(domain, di.masters.front()); 
-  return "Added retrieval request for '"+domain.toString()+"' from master "+di.masters.front().toStringWithPortExcept(53);
+  return "Added retrieval request for '"+domain.toString()+"' from master "+di.masters.front().toLogString();
 }
 
 string DLNotifyHostHandler(const vector<string>&parts, Utility::pid_t ppid)
diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index aae4902a10..d0f24cf941 100644
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -294,7 +294,11 @@ union ComboAddress {
       return "["+toString() + "]:" + std::to_string(ntohs(sin4.sin_port));
   }
 
-  
+  string toLogString() const
+  {
+    return toStringWithPortExcept(53);
+  }
+
   void truncate(unsigned int bits) noexcept;
 
   uint16_t getPort() const
diff --git a/pdns/logger.cc b/pdns/logger.cc
index 0e3c54c8b0..8bbf03307c 100644
--- a/pdns/logger.cc
+++ b/pdns/logger.cc
@@ -228,7 +228,7 @@ Logger& Logger::operator<<(const DNSName &d)
 
 Logger& Logger::operator<<(const ComboAddress &ca)
 {
-  *this<<ca.toString();
+  *this<<ca.toLogString();
   return *this;
 }
 
diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index 98d26fce7a..115f3d7253 100644
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -321,7 +321,7 @@ int Resolver::resolve(const ComboAddress& to, const DNSName &domain, int type, R
     return parseResult(mdp, domain, type, id, res);
   }
   catch(ResolverException &re) {
-    throw ResolverException(re.reason+" from "+to.toStringWithPortExcept(53));
+    throw ResolverException(re.reason+" from "+to.toLogString());
   }
   return -1;
 }
@@ -338,21 +338,21 @@ void Resolver::getSoaSerial(const ComboAddress& ipport, const DNSName &domain, u
   int ret = resolve(ipport, domain, QType::SOA, &res);
   
   if(ret || res.empty())
-    throw ResolverException("Query to '" + ipport.toStringWithPortExcept(53) + "' for SOA of '" + domain.toString() + "' produced no answers");
+    throw ResolverException("Query to '" + ipport.toLogString() + "' for SOA of '" + domain.toLogString() + "' produced no answers");
 
   if(res[0].qtype.getCode() != QType::SOA) 
-    throw ResolverException("Query to '" + ipport.toStringWithPortExcept(53) + "' for SOA of '" + domain.toString() + "' produced a "+res[0].qtype.getName()+" record");
+    throw ResolverException("Query to '" + ipport.toLogString() + "' for SOA of '" + domain.toLogString() + "' produced a "+res[0].qtype.getName()+" record");
 
   vector<string>parts;
   stringtok(parts, res[0].content);
   if(parts.size()<3)
-    throw ResolverException("Query to '" + ipport.toStringWithPortExcept(53) + "' for SOA of '" + domain.toString() + "' produced an unparseable response");
+    throw ResolverException("Query to '" + ipport.toLogString() + "' for SOA of '" + domain.toLogString() + "' produced an unparseable response");
 
   try {
     *serial=pdns_stou(parts[2]);
   }
   catch(const std::out_of_range& oor) {
-    throw ResolverException("Query to '" + ipport.toStringWithPortExcept(53) + "' for SOA of '" + domain.toString() + "' produced an unparseable serial");
+    throw ResolverException("Query to '" + ipport.toLogString() + "' for SOA of '" + domain.toLogString() + "' produced an unparseable serial");
   }
 }
 
diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index ca84451795..bfa0cb31b8 100644
--- a/pdns/rfc2136handler.cc
+++ b/pdns/rfc2136handler.cc
@@ -586,7 +586,7 @@ int PacketHandler::forwardPacket(const string &msgPrefix, DNSPacket *p, DomainIn
   }
 
   for(const auto& remote : di->masters) {
-    g_log<<Logger::Notice<<msgPrefix<<"Forwarding packet to master "<<remote.toStringWithPortExcept(53)<<endl;
+    g_log<<Logger::Notice<<msgPrefix<<"Forwarding packet to master "<<remote<<endl;
 
     ComboAddress local;
     if (remote.sin4.sin_family == AF_INET && !::arg()["query-local-address"].empty()) {
diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index d1aef8fe87..abfc48b6bc 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -299,7 +299,7 @@ void CommunicatorClass::suck(const DNSName &domain, const ComboAddress& remote)
   }
   RemoveSentinel rs(domain, this); // this removes us from d_inprogress when we go out of scope
 
-  L<<Logger::Error<<"Initiating transfer of '"<<domain<<"' from remote '"<<remote.toStringWithPortExcept(53)<<"'"<<endl;
+  g_log<<Logger::Error<<"Initiating transfer of '"<<domain<<"' from remote '"<<remote<<"'"<<endl;
   UeberBackend B; // fresh UeberBackend
 
   DomainInfo di;
@@ -398,10 +398,10 @@ void CommunicatorClass::suck(const DNSName &domain, const ComboAddress& remote)
       B.getDomainMetadata(domain, "IXFR", meta);
       if(!meta.empty() && meta[0]=="1") {
         vector<DNSRecord> axfr;
-        g_log<<Logger::Warning<<"Starting IXFR of '"<<domain<<"' from remote "<<remote.toStringWithPortExcept(53)<<endl;
+        g_log<<Logger::Warning<<"Starting IXFR of '"<<domain<<"' from remote "<<remote<<endl;
         ixfrSuck(domain, tt, laddr, remote, pdl, zs, &axfr);
         if(!axfr.empty()) {
-          g_log<<Logger::Warning<<"IXFR of '"<<domain<<"' from remote '"<<remote.toStringWithPortExcept(53)<<"' turned into an AXFR"<<endl;
+          g_log<<Logger::Warning<<"IXFR of '"<<domain<<"' from remote '"<<remote<<"' turned into an AXFR"<<endl;
           bool firstNSEC3=true;
           rrs.reserve(axfr.size());
           for(const auto& dr : axfr) {
@@ -426,9 +426,9 @@ void CommunicatorClass::suck(const DNSName &domain, const ComboAddress& remote)
     }
 
     if(rrs.empty()) {
-      g_log<<Logger::Warning<<"Starting AXFR of '"<<domain<<"' from remote "<<remote.toStringWithPortExcept(53)<<endl;
+      g_log<<Logger::Warning<<"Starting AXFR of '"<<domain<<"' from remote "<<remote<<endl;
       rrs = doAxfr(remote, domain, tt, laddr, pdl, zs);
-      g_log<<Logger::Warning<<"AXFR of '"<<domain<<"' from remote "<<remote.toStringWithPortExcept(53)<<" done"<<endl;
+      g_log<<Logger::Warning<<"AXFR of '"<<domain<<"' from remote "<<remote<<" done"<<endl;
     }
  
     if(zs.isNSEC3) {
diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index 7bfc822150..0afd0c4f9f 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -1458,7 +1458,7 @@ static void apiServerZoneAxfrRetrieve(HttpRequest* req, HttpResponse* resp) {
 
   random_shuffle(di.masters.begin(), di.masters.end());
   Communicator.addSuckRequest(zonename, di.masters.front());
-  resp->setSuccessResult("Added retrieval request for '"+zonename.toString()+"' from master "+di.masters.front().toStringWithPortExcept(53));
+  resp->setSuccessResult("Added retrieval request for '"+zonename.toString()+"' from master "+di.masters.front().toLogString());
 }
 
 static void apiServerZoneNotify(HttpRequest* req, HttpResponse* resp) {
-- 
2.47.3