Changeset 1982 for trunk/pdns/pdns/dnsseckeeper.hh

Timestamp:

02/07/11 10:31:12 (2 years ago)

Author:

ahu

Message:

make sure that addKey lets us know if it worked, allowing us to spot non-working configurations
unthread the keycache, reintroducing the 'shared key' problem, but plugging a massive memory leak

Files:

• trunk/pdns/pdns/dnsseckeeper.hh (modified) (3 diffs)

trunk/pdns/pdns/dnsseckeeper.hh

@@ -33 +33 @@
   DNSSECKeeper() : d_keymetadb("key-only")
   {
-    if(!t_keycache)
-      t_keycache = new keycache_t();
   }
   bool isSecuredZone(const std::string& zone);
@@ -40 +38 @@
   keyset_t getKeys(const std::string& zone, boost::tribool allOrKeyOrZone = boost::indeterminate);
   DNSSECPrivateKey getKeyById(const std::string& zone, unsigned int id);
-  void addKey(const std::string& zname, bool keyOrZone, int algorithm=5, int bits=0, bool active=true);
-  void addKey(const std::string& zname, const DNSSECPrivateKey& dpk, bool active=true);
+  bool addKey(const std::string& zname, bool keyOrZone, int algorithm=5, int bits=0, bool active=true);
+  bool addKey(const std::string& zname, const DNSSECPrivateKey& dpk, bool active=true);
   void removeKey(const std::string& zname, unsigned int id);
   void activateKey(const std::string& zname, unsigned int id);
   void deactivateKey(const std::string& zname, unsigned int id);
 
-  void secureZone(const std::string& fname, int algorithm);
+  bool secureZone(const std::string& fname, int algorithm);
 
   bool getNSEC3PARAM(const std::string& zname, NSEC3PARAMRecordContent* n3p=0, bool* narrow=0);
@@ -107 +105 @@
   > metacache_t;
 
-  static __thread keycache_t* t_keycache;
+  static keycache_t s_keycache;
   static metacache_t s_metacache;
   static pthread_mutex_t s_metacachelock;
+  static pthread_mutex_t s_keycachelock;
 };