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)
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
Logger& Logger::operator<<(const ComboAddress &ca)
{
- *this<<ca.toString();
+ *this<<ca.toLogString();
return *this;
}
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;
}
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");
}
}
}
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()) {
}
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;
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) {
}
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) {
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) {