]> granicus.if.org Git - pdns/commitdiff
Merge pull request #6688 from rgacogne/dnsdist-const-ds-remote
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Tue, 29 May 2018 10:42:38 +0000 (12:42 +0200)
committerGitHub <noreply@github.com>
Tue, 29 May 2018 10:42:38 +0000 (12:42 +0200)
 dnsdist: Mark the remote member of DownstreamState as const

1  2 
pdns/dnsdist.cc
pdns/dnsdist.hh

diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
index c3d39098f09277a6075fccad8ba41f664853af43,9bca6dcd2dd0669d6b1460555b840992f4b42ed5..cc30c09fd0173b8b5473f9e03debdca3b7f73f58
@@@ -534,13 -501,12 +534,13 @@@ struct DownstreamStat
  
    std::vector<int> sockets;
    std::mutex socketsLock;
 +  std::mutex connectLock;
    std::unique_ptr<FDMultiplexer> mplexer{nullptr};
    std::thread tid;
-   ComboAddress remote;
+   const ComboAddress remote;
    QPSLimiter qps;
    vector<IDState> idStates;
-   ComboAddress sourceAddr;
+   const ComboAddress sourceAddr;
    checkfunc_t checkFunction;
    DNSName checkName{"a.root-servers.net."};
    QType checkType{QType::A};