]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #5236 from rgacogne/rec-doresolveat-refactor
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 25 May 2017 16:51:29 +0000 (18:51 +0200)
committerGitHub <noreply@github.com>
Thu, 25 May 2017 16:51:29 +0000 (18:51 +0200)
rec: Move to thread_local, refactor `SyncRes::doResolveAt()` and auth zones

1  2 
pdns/recursor_cache.cc
pdns/recursor_cache.hh
pdns/recursordist/Makefile.am

Simple merge
index baa988b3e22587ece94dc74a87fdb8097b544f05,6bfe31636fe4d82dd877f06c7a19818d3999e963..8999335f9ab306e2ddd57300fc6f9d317bcb1539
@@@ -57,8 -57,8 +57,7 @@@ public
  
    void replace(time_t, const DNSName &qname, const QType& qt,  const vector<DNSRecord>& content, const vector<shared_ptr<RRSIGRecordContent>>& signatures, bool auth, boost::optional<Netmask> ednsmask=boost::optional<Netmask>());
    void doPrune(void);
 -  void doSlash(int perc);
    uint64_t doDump(int fd);
-   uint64_t doDumpNSSpeeds(int fd);
  
    int doWipeCache(const DNSName& name, bool sub, uint16_t qtype=0xffff);
    bool doAgeCache(time_t now, const DNSName& name, uint16_t qtype, uint32_t newTTL);
Simple merge