From: Otto <otto.moerbeek@open-xchange.com>
Date: Mon, 15 Feb 2021 08:55:27 +0000 (+0100)
Subject: Process review comments; most importantly a separate type for
X-Git-Tag: dnsdist-1.6.0-alpha2~39^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adf0f3686d08905df7e66afb99a79e2100403ebc;p=thirdparty%2Fpdns.git

Process review comments; most importantly a separate type for
RecursorControlChannel::Answer
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 45e44b62eb..07c8f2dc6b 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -3842,13 +3842,6 @@ static vector<pair<DNSName, uint16_t> >& operator+=(vector<pair<DNSName, uint16_
   return a;
 }
 
-static pair<int, string>& operator+=(std::pair<int, string>& a, const std::pair<int, string>& b)
-{
-  a.first |= b.first;
-  a.second += b.second;
-  return a;
-}
-
 /*
   This function should only be called by the handler to gather metrics, wipe the cache,
   reload the Lua script (not the Lua config) or change the current trace regex,
@@ -3891,7 +3884,7 @@ template<class T> T broadcastAccFunction(const boost::function<T*()>& func)
 }
 
 template string broadcastAccFunction(const boost::function<string*()>& fun); // explicit instantiation
-template std::pair<int, string> broadcastAccFunction(const boost::function<pair<int,string>*()>& fun); // explicit instantiation
+template RecursorControlChannel::Answer broadcastAccFunction(const boost::function<RecursorControlChannel::Answer *()>& fun); // explicit instantiation
 template uint64_t broadcastAccFunction(const boost::function<uint64_t*()>& fun); // explicit instantiation
 template vector<ComboAddress> broadcastAccFunction(const boost::function<vector<ComboAddress> *()>& fun); // explicit instantiation
 template vector<pair<DNSName,uint16_t> > broadcastAccFunction(const boost::function<vector<pair<DNSName, uint16_t> > *()>& fun); // explicit instantiation
@@ -3901,7 +3894,7 @@ static void handleRCC(int fd, FDMultiplexer::funcparam_t& var)
 {
   try {
     string remote;
-    string msg = s_rcc.recv(&remote).second;
+    string msg = s_rcc.recv(&remote).d_str;
     RecursorControlParser rcp;
     RecursorControlParser::func_t* command;
 
@@ -4117,14 +4110,14 @@ static FDMultiplexer* getMultiplexer()
 }
 
 
-static std::pair<int, string>* doReloadLuaScript()
+static RecursorControlChannel::Answer* doReloadLuaScript()
 {
   string fname= ::arg()["lua-dns-script"];
   try {
     if(fname.empty()) {
       t_pdl.reset();
       g_log<<Logger::Info<<t_id<<" Unloaded current lua script"<<endl;
-      return new std::pair<int, string>(0, string("unloaded\n"));
+      return new RecursorControlChannel::Answer{0, string("unloaded\n")};
     }
     else {
       t_pdl = std::make_shared<RecursorLua4>();
@@ -4132,25 +4125,25 @@ static std::pair<int, string>* doReloadLuaScript()
       if (err != 0) {
         string msg = std::to_string(t_id) + " Retaining current script, could not read '" + fname + "': " + stringerror(err);
         g_log<<Logger::Error<<msg<<endl;
-        return new std::pair<int, string>(1, msg + "\n");
+        return new RecursorControlChannel::Answer{1, msg + "\n"};
       }
     }
   }
   catch(std::exception& e) {
     g_log<<Logger::Error<<t_id<<" Retaining current script, error from '"<<fname<<"': "<< e.what() <<endl;
-    return new std::pair<int, string>(1, string("retaining current script, error from '"+fname+"': "+e.what()+"\n"));
+    return new RecursorControlChannel::Answer{1, string("retaining current script, error from '"+fname+"': "+e.what()+"\n")};
   }
 
   g_log<<Logger::Warning<<t_id<<" (Re)loaded lua script from '"<<fname<<"'"<<endl;
-  return new std::pair<int, string>(0, string("(re)loaded '"+fname+"'\n"));
+  return new RecursorControlChannel::Answer{0, string("(re)loaded '"+fname+"'\n")};
 }
 
-std::pair<int,string> doQueueReloadLuaScript(vector<string>::const_iterator begin, vector<string>::const_iterator end)
+RecursorControlChannel::Answer doQueueReloadLuaScript(vector<string>::const_iterator begin, vector<string>::const_iterator end)
 {
   if(begin != end)
     ::arg().set("lua-dns-script") = *begin;
 
-  return broadcastAccFunction<std::pair<int, string>>(doReloadLuaScript);
+  return broadcastAccFunction<RecursorControlChannel::Answer>(doReloadLuaScript);
 }
 
 static string* pleaseUseNewTraceRegex(const std::string& newRegex)
diff --git a/pdns/rec_channel.cc b/pdns/rec_channel.cc
index 3d95e5b772..d610d14a18 100644
--- a/pdns/rec_channel.cc
+++ b/pdns/rec_channel.cc
@@ -179,7 +179,7 @@ static void sendfd(int s, int fd, const string* remote)
   }
 }
 
-void RecursorControlChannel::send(const std::pair<int, const string&>& msg, const std::string* remote, unsigned int timeout, int fd)
+void RecursorControlChannel::send(const Answer& msg, const std::string* remote, unsigned int timeout, int fd)
 {
   int ret = waitForRWData(d_fd, false, timeout, 0);
   if(ret == 0) {
@@ -197,15 +197,15 @@ void RecursorControlChannel::send(const std::pair<int, const string&>& msg, cons
     strncpy(remoteaddr.sun_path, remote->c_str(), sizeof(remoteaddr.sun_path)-1);
     remoteaddr.sun_path[sizeof(remoteaddr.sun_path)-1] = '\0';
 
-    if(::sendto(d_fd, &msg.first, sizeof(msg.first), 0, (struct sockaddr*) &remoteaddr, sizeof(remoteaddr) ) < 0)
+    if(::sendto(d_fd, &msg.d_ret, sizeof(msg.d_ret), 0, (struct sockaddr*) &remoteaddr, sizeof(remoteaddr) ) < 0)
       throw PDNSException("Unable to send message over control channel '"+string(remoteaddr.sun_path)+"': "+stringerror());
-    if(::sendto(d_fd, msg.second.c_str(), msg.second.length(), 0, (struct sockaddr*) &remoteaddr, sizeof(remoteaddr) ) < 0)
+    if(::sendto(d_fd, msg.d_str.c_str(), msg.d_str.length(), 0, (struct sockaddr*) &remoteaddr, sizeof(remoteaddr) ) < 0)
       throw PDNSException("Unable to send message over control channel '"+string(remoteaddr.sun_path)+"': "+stringerror());
   }
   else {
-    if(::send(d_fd, &msg.first, sizeof(msg.first), 0) < 0)
+    if(::send(d_fd, &msg.d_ret, sizeof(msg.d_ret), 0) < 0)
       throw PDNSException("Unable to send message over control channel: "+stringerror());
-    if(::send(d_fd, msg.second.c_str(), msg.second.length(), 0) < 0)
+    if(::send(d_fd, msg.d_str.c_str(), msg.d_str.length(), 0) < 0)
       throw PDNSException("Unable to send message over control channel: "+stringerror());
   }
   if (fd != -1) {
@@ -213,7 +213,7 @@ void RecursorControlChannel::send(const std::pair<int, const string&>& msg, cons
   }
 }
 
-std::pair<int, string> RecursorControlChannel::recv(std::string* remote, unsigned int timeout)
+RecursorControlChannel::Answer RecursorControlChannel::recv(std::string* remote, unsigned int timeout)
 {
   char buffer[16384];
   ssize_t len;
@@ -225,10 +225,10 @@ std::pair<int, string> RecursorControlChannel::recv(std::string* remote, unsigne
     throw PDNSException("Timeout waiting for answer from control channel");
   }
   int err;
-  if (ret < 0 || ::recvfrom(d_fd, &err, sizeof(err), 0, (struct sockaddr*)&remoteaddr, &addrlen) < 0) {
+  if (::recvfrom(d_fd, &err, sizeof(err), 0, (struct sockaddr*)&remoteaddr, &addrlen) != sizeof(err)) {
     throw PDNSException("Unable to receive return status over control channel: " + stringerror());
   }
-  if (ret < 0 || (len = ::recvfrom(d_fd, buffer, sizeof(buffer), 0, (struct sockaddr*)&remoteaddr, &addrlen)) < 0) {
+  if ((len = ::recvfrom(d_fd, buffer, sizeof(buffer), 0, (struct sockaddr*)&remoteaddr, &addrlen)) < 0) {
     throw PDNSException("Unable to receive message over control channel: "+stringerror());
   }
 
@@ -236,6 +236,6 @@ std::pair<int, string> RecursorControlChannel::recv(std::string* remote, unsigne
     *remote=remoteaddr.sun_path;
   }
 
-  return make_pair(err, string(buffer, buffer+len));
+  return {err, string(buffer, buffer + len)};
 }
 
diff --git a/pdns/rec_channel.hh b/pdns/rec_channel.hh
index 2a03b44666..0b1610827e 100644
--- a/pdns/rec_channel.hh
+++ b/pdns/rec_channel.hh
@@ -51,11 +51,26 @@ public:
 
   uint64_t getStat(const std::string& name);
 
-  void send(const std::pair<int, const std::string&>&, const std::string* remote=nullptr, unsigned int timeout=5, int fd = -1);
-  std::pair<int, std::string> recv(std::string* remote=0, unsigned int timeout=5);
+  struct Answer
+  {
+    Answer& operator+=(const Answer& rhs)
+    {
+      if (d_ret == 0 && rhs.d_ret != 0) {
+        d_ret = rhs.d_ret;
+      }
+      d_str += rhs.d_str;
+      return *this;
+    }
+    int d_ret{0};
+    std::string d_str;
+  };
+
+  void send(const Answer&, const std::string* remote = nullptr, unsigned int timeout = 5, int fd = -1);
+  RecursorControlChannel::Answer recv(std::string* remote = nullptr, unsigned int timeout = 5);
 
   int d_fd;
   static volatile sig_atomic_t stop;
+
 private:
   struct sockaddr_un d_local;
 };
@@ -68,9 +83,11 @@ public:
   }
   static void nop(void){}
   typedef void func_t(void);
-  pair<int, std::string> getAnswer(int s, const std::string& question, func_t** func);
+
+  RecursorControlChannel::Answer getAnswer(int s, const std::string& question, func_t** func);
 };
 
+
 enum class StatComponent { API, Carbon, RecControl, SNMP };
 
 struct StatsMapEntry {
@@ -101,3 +118,4 @@ void registerAllStats();
 void doExitGeneric(bool nicely);
 void doExit();
 void doExitNicely();
+RecursorControlChannel::Answer doQueueReloadLuaScript(vector<string>::const_iterator begin, vector<string>::const_iterator end);
diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index b67796292e..dc688835e2 100644
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -315,16 +315,19 @@ getfd(int s)
   msg.msg_iov = io_vector;
   msg.msg_iovlen = 1;
 
-  if (recvmsg(s, &msg, 0) == -1)
+  if (recvmsg(s, &msg, 0) == -1) {
     throw PDNSException("recvmsg");
-  if ((msg.msg_flags & MSG_TRUNC) || (msg.msg_flags & MSG_CTRUNC))
+  }
+  if ((msg.msg_flags & MSG_TRUNC) || (msg.msg_flags & MSG_CTRUNC)) {
     throw PDNSException("control message truncated");
+  }
   for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
        cmsg = CMSG_NXTHDR(&msg, cmsg)) {
     if (cmsg->cmsg_len == CMSG_LEN(sizeof(int)) &&
         cmsg->cmsg_level == SOL_SOCKET &&
         cmsg->cmsg_type == SCM_RIGHTS) {
       fd = *(int *)CMSG_DATA(cmsg);
+      break;
     }
   }
   return fd;
@@ -1712,21 +1715,21 @@ static string clearDontThrottleNetmasks(T begin, T end) {
 }
 
 
-std::pair<int, string> RecursorControlParser::getAnswer(int s, const string& question, RecursorControlParser::func_t** command)
+RecursorControlChannel::Answer RecursorControlParser::getAnswer(int s, const string& question, RecursorControlParser::func_t** command)
 {
   *command=nop;
   vector<string> words;
   stringtok(words, question);
 
   if(words.empty())
-    return make_pair(1, "invalid command\n");
+    return {1, "invalid command\n"};
 
   string cmd=toLower(words[0]);
   vector<string>::const_iterator begin=words.begin()+1, end=words.end();
 
   // should probably have a smart dispatcher here, like auth has
   if(cmd=="help")
-    return make_pair(0,
+    return {0,
 "add-dont-throttle-names [N...]   add names that are not allowed to be throttled\n"
 "add-dont-throttle-netmasks [N...]\n"
 "                                 add netmasks that are not allowed to be throttled\n"
@@ -1782,53 +1785,53 @@ std::pair<int, string> RecursorControlParser::getAnswer(int s, const string& que
 "unload-lua-script                unload Lua script\n"
 "version                          return Recursor version number\n"
 "wipe-cache domain0 [domain1] ..  wipe domain data from cache\n"
-"wipe-cache-typed type domain0 [domain1] ..  wipe domain data with qtype from cache\n");
+"wipe-cache-typed type domain0 [domain1] ..  wipe domain data with qtype from cache\n"};
 
   if (cmd == "get-all") {
-    return make_pair(0, getAllStats());
+    return {0, getAllStats()};
   }
   if (cmd == "get") {
-    return make_pair(0, doGet(begin, end));
+    return {0, doGet(begin, end)};
   }
   if (cmd == "get-parameter") {
-    return make_pair(0, doGetParameter(begin, end));
+    return {0, doGetParameter(begin, end)};
   }
   if (cmd == "quit") {
     *command=&doExit;
-    return make_pair(0, "bye\n");
+    return {0, "bye\n"};
   }
   if (cmd == "version") {
-    return make_pair(0, getPDNSVersion()+"\n");
+    return {0, getPDNSVersion()+"\n"};
   }
   if (cmd == "quit-nicely") {
     *command=&doExitNicely;
-    return make_pair(0, "bye nicely\n");
+    return {0, "bye nicely\n"};
   }
   if (cmd == "dump-cache") {
-    return make_pair(0, doDumpCache(s));
+    return {0, doDumpCache(s)};
   }
   if (cmd == "dump-ednsstatus" || cmd == "dump-edns") {
-    return make_pair(0, doDumpEDNSStatus(begin, end));
+    return {0, doDumpEDNSStatus(begin, end)};
   }
   if (cmd == "dump-nsspeeds") {
-    return make_pair(0, doDumpNSSpeeds(begin, end));
+    return {0, doDumpNSSpeeds(begin, end)};
   }
   if (cmd == "dump-failedservers") {
-    return make_pair(0, doDumpFailedServers(begin, end));
+    return {0, doDumpFailedServers(begin, end)};
   }
   if (cmd == "dump-rpz") {
-    return make_pair(0, doDumpRPZ(begin, end));
+    return {0, doDumpRPZ(begin, end)};
   }
   if (cmd == "dump-throttlemap") {
-    return make_pair(0, doDumpThrottleMap(begin, end));
+    return {0, doDumpThrottleMap(begin, end)};
   }
   if (cmd == "wipe-cache" || cmd == "flushname") {
-    return make_pair(0, doWipeCache(begin, end, 0xffff));
+    return {0, doWipeCache(begin, end, 0xffff)};
   }
   if (cmd == "wipe-cache-typed") {
     uint16_t qtype = QType::chartocode(begin->c_str());
     ++begin;
-    return make_pair(0, doWipeCache(begin, end, qtype));
+    return {0, doWipeCache(begin, end, qtype)};
   }
   if (cmd == "reload-lua-script") {
     return doQueueReloadLuaScript(begin, end);
@@ -1842,20 +1845,20 @@ std::pair<int, string> RecursorControlParser::getAnswer(int s, const string& que
       loadRecursorLuaConfig(::arg()["lua-config-file"], delayedLuaThreads);
       startLuaConfigDelayedThreads(delayedLuaThreads, g_luaconfs.getCopy().generation);
       g_log<<Logger::Warning<<"Reloaded Lua configuration file '"<<::arg()["lua-config-file"]<<"', requested via control channel"<<endl;
-      return make_pair(0, "Reloaded Lua configuration file '"+::arg()["lua-config-file"]+"'\n");
+      return {0, "Reloaded Lua configuration file '"+::arg()["lua-config-file"]+"'\n"};
     }
     catch(std::exception& e) {
-      return make_pair(1, "Unable to load Lua script from '"+::arg()["lua-config-file"]+"': "+e.what()+"\n");
+      return {1, "Unable to load Lua script from '"+::arg()["lua-config-file"]+"': "+e.what()+"\n"};
     }
     catch(const PDNSException& e) {
-      return make_pair(1, "Unable to load Lua script from '"+::arg()["lua-config-file"]+"': "+e.reason+"\n");
+      return {1, "Unable to load Lua script from '"+::arg()["lua-config-file"]+"': "+e.reason+"\n"};
     }
   }
   if (cmd == "set-carbon-server") {
-    return make_pair(0, doSetCarbonServer(begin, end));
+    return {0, doSetCarbonServer(begin, end)};
   }
   if (cmd == "trace-regex") {
-    return make_pair(0, doTraceRegex(begin, end));
+    return {0, doTraceRegex(begin, end)};
   }
   if (cmd == "unload-lua-script") {
     vector<string> empty;
@@ -1865,7 +1868,7 @@ std::pair<int, string> RecursorControlParser::getAnswer(int s, const string& que
   if (cmd == "reload-acls") {
     if (!::arg()["chroot"].empty()) {
       g_log<<Logger::Error<<"Unable to reload ACL when chroot()'ed, requested via control channel"<<endl;
-      return make_pair(1, "Unable to reload ACL when chroot()'ed, please restart\n");
+      return {1, "Unable to reload ACL when chroot()'ed, please restart\n"};
     }
 
     try {
@@ -1873,114 +1876,114 @@ std::pair<int, string> RecursorControlParser::getAnswer(int s, const string& que
     }
     catch(std::exception& e) {
       g_log<<Logger::Error<<"Reloading ACLs failed (Exception: "<<e.what()<<")"<<endl;
-      return make_pair(1, e.what() + string("\n"));
+      return {1, e.what() + string("\n")};
     }
     catch(PDNSException& ae) {
       g_log<<Logger::Error<<"Reloading ACLs failed (PDNSException: "<<ae.reason<<")"<<endl;
-      return make_pair(1, ae.reason + string("\n"));
+      return {1, ae.reason + string("\n")};
     }
-    return make_pair(0, "ok\n");
+    return {0, "ok\n"};
   }
   if (cmd == "top-remotes") {
-    return make_pair(0, doGenericTopRemotes(pleaseGetRemotes));
+    return {0, doGenericTopRemotes(pleaseGetRemotes)};
   }
   if (cmd == "top-queries") {
-    return make_pair(0, doGenericTopQueries(pleaseGetQueryRing));
+    return {0, doGenericTopQueries(pleaseGetQueryRing)};
   }
   if (cmd == "top-pub-queries") {
-    return make_pair(0, doGenericTopQueries(pleaseGetQueryRing, getRegisteredName));
+    return {0, doGenericTopQueries(pleaseGetQueryRing, getRegisteredName)};
   }
   if (cmd == "top-servfail-queries") {
-    return make_pair(0, doGenericTopQueries(pleaseGetServfailQueryRing));
+    return {0, doGenericTopQueries(pleaseGetServfailQueryRing)};
   }
   if (cmd == "top-pub-servfail-queries") {
-    return make_pair(0, doGenericTopQueries(pleaseGetServfailQueryRing, getRegisteredName));
+    return {0, doGenericTopQueries(pleaseGetServfailQueryRing, getRegisteredName)};
   }
   if (cmd == "top-bogus-queries") {
-    return make_pair(0, doGenericTopQueries(pleaseGetBogusQueryRing));
+    return {0, doGenericTopQueries(pleaseGetBogusQueryRing)};
   }
   if (cmd == "top-pub-bogus-queries") {
-    return make_pair(0, doGenericTopQueries(pleaseGetBogusQueryRing, getRegisteredName));
+    return {0, doGenericTopQueries(pleaseGetBogusQueryRing, getRegisteredName)};
   }
   if (cmd == "top-servfail-remotes") {
-    return make_pair(0, doGenericTopRemotes(pleaseGetServfailRemotes));
+    return {0, doGenericTopRemotes(pleaseGetServfailRemotes)};
   }
   if (cmd == "top-bogus-remotes") {
-    return make_pair(0, doGenericTopRemotes(pleaseGetBogusRemotes));
+    return {0, doGenericTopRemotes(pleaseGetBogusRemotes)};
   }
   if (cmd == "top-largeanswer-remotes") {
-    return make_pair(0, doGenericTopRemotes(pleaseGetLargeAnswerRemotes));
+    return {0, doGenericTopRemotes(pleaseGetLargeAnswerRemotes)};
   }
   if (cmd == "top-timeouts") {
-    return make_pair(0, doGenericTopRemotes(pleaseGetTimeouts));
+    return {0, doGenericTopRemotes(pleaseGetTimeouts)};
   }
   if (cmd == "current-queries") {
-    return make_pair(0, doCurrentQueries());
+    return {0, doCurrentQueries()};
   }
   if (cmd == "ping") {
-    return make_pair(0, broadcastAccFunction<string>(nopFunction));
+    return {0, broadcastAccFunction<string>(nopFunction)};
   }
   if (cmd == "reload-zones") {
     if (!::arg()["chroot"].empty()) {
       g_log<<Logger::Error<<"Unable to reload zones and forwards when chroot()'ed, requested via control channel"<<endl;
-      return make_pair(1, "Unable to reload zones and forwards when chroot()'ed, please restart\n");
+      return {1, "Unable to reload zones and forwards when chroot()'ed, please restart\n"};
     }
-    return make_pair(0, reloadAuthAndForwards());
+    return {0, reloadAuthAndForwards()};
   }
   if (cmd == "set-ecs-minimum-ttl") {
-    return make_pair(0, setMinimumECSTTL(begin, end));
+    return {0, setMinimumECSTTL(begin, end)};
   }
   if (cmd == "set-max-cache-entries") {
-    return make_pair(0, setMaxCacheEntries(begin, end));
+    return {0, setMaxCacheEntries(begin, end)};
   }
   if (cmd == "set-max-packetcache-entries") {
-    return make_pair(0, setMaxPacketCacheEntries(begin, end));
+    return {0, setMaxPacketCacheEntries(begin, end)};
   }
   if (cmd == "set-minimum-ttl") {
-    return make_pair(0, setMinimumTTL(begin, end));
+    return {0, setMinimumTTL(begin, end)};
   }
   if (cmd == "get-qtypelist") {
-    return make_pair(0, g_rs.getQTypeReport());
+    return {0, g_rs.getQTypeReport()};
   }
   if (cmd == "add-nta") {
-    return make_pair(0, doAddNTA(begin, end));
+    return {0, doAddNTA(begin, end)};
   }
   if (cmd == "clear-nta") {
-    return make_pair(0, doClearNTA(begin, end));
+    return {0, doClearNTA(begin, end)};
   }
   if (cmd == "get-ntas") {
-    return make_pair(0, getNTAs());
+    return {0, getNTAs()};
   }
   if (cmd == "add-ta") {
-    return make_pair(0, doAddTA(begin, end));
+    return {0, doAddTA(begin, end)};
   }
   if (cmd == "clear-ta") {
-    return make_pair(0, doClearTA(begin, end));
+    return {0, doClearTA(begin, end)};
   }
   if (cmd == "get-tas") {
-    return make_pair(0, getTAs());
+    return {0, getTAs()};
   }
   if (cmd == "set-dnssec-log-bogus") {
-    return make_pair(0, doSetDnssecLogBogus(begin, end));
+    return {0, doSetDnssecLogBogus(begin, end)};
   }
   if (cmd == "get-dont-throttle-names") {
-    return make_pair(0, getDontThrottleNames());
+    return {0, getDontThrottleNames()};
   }
   if (cmd == "get-dont-throttle-netmasks") {
-    return make_pair(0, getDontThrottleNetmasks());
+    return {0, getDontThrottleNetmasks()};
   }
   if (cmd == "add-dont-throttle-names") {
-    return make_pair(0, addDontThrottleNames(begin, end));
+    return {0, addDontThrottleNames(begin, end)};
   }
   if (cmd == "add-dont-throttle-netmasks") {
-    return make_pair(0, addDontThrottleNetmasks(begin, end));
+    return {0, addDontThrottleNetmasks(begin, end)};
   }
   if (cmd == "clear-dont-throttle-names") {
-    return make_pair(0, clearDontThrottleNames(begin, end));
+    return {0, clearDontThrottleNames(begin, end)};
   }
   if (cmd == "clear-dont-throttle-netmasks") {
-    return make_pair(0, clearDontThrottleNetmasks(begin, end));
+    return {0, clearDontThrottleNetmasks(begin, end)};
   }
 
-  return make_pair(1, "Unknown command '"+cmd+"', try 'help'\n");
+  return {1, "Unknown command '"+cmd+"', try 'help'\n"};
 }
diff --git a/pdns/rec_control.cc b/pdns/rec_control.cc
index ce70cdf786..ce29a77c72 100644
--- a/pdns/rec_control.cc
+++ b/pdns/rec_control.cc
@@ -120,15 +120,15 @@ int main(int argc, char** argv)
     }
 
     auto timeout = arg().asNum("timeout");
-    rccS.send(make_pair(0, command), nullptr, timeout, fd);
+    rccS.send({0, command}, nullptr, timeout, fd);
 
     auto receive = rccS.recv(0, timeout);
-    if (receive.first != 0) {
-      cerr << receive.second;
+    if (receive.d_ret != 0) {
+      cerr << receive.d_str;
     } else {
-      cout << receive.second;
+      cout << receive.d_str;
     }
-    return receive.first;
+    return receive.d_ret;
   }
   catch(PDNSException& ae) {
     cerr<<"Fatal: "<<ae.reason<<"\n";
diff --git a/pdns/syncres.hh b/pdns/syncres.hh
index 5c2109c516..864abcd0ce 100644
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@ -1077,7 +1077,6 @@ extern thread_local std::unique_ptr<addrringbuf_t> t_servfailremotes, t_largeans
 
 extern thread_local std::unique_ptr<boost::circular_buffer<pair<DNSName,uint16_t> > > t_queryring, t_servfailqueryring, t_bogusqueryring;
 extern thread_local std::shared_ptr<NetmaskGroup> t_allowFrom;
-std::pair<int, string> doQueueReloadLuaScript(vector<string>::const_iterator begin, vector<string>::const_iterator end);
 string doTraceRegex(vector<string>::const_iterator begin, vector<string>::const_iterator end);
 void parseACLs();
 extern RecursorStats g_stats;