Fix compilation with DEBUG_DNS_CACHE

Reported by cypherpunks.

Fix for #11761; bugfix on 0.2.3.13-alpha where we made ht.h stop using
_identifiers.

diff --git a/changes/bug11761 b/changes/bug11761
new file mode 100644 (file)
index 0000000..ffcae5a
--- /dev/null
+++ b/changes/bug11761
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Fix compilation when DNS_CACHE_DEBUG is enabled. Fixes bug 11761;
+      bugfix on 0.2.3.13-alpha. Found by "cypherpunks".
+

diff --git a/src/ext/ht.h b/src/ext/ht.h
index 4a68673e6e5e930b369d31a565eff98b84c8fc9c..871f5bbd2d27e3ea6f945556b77155ae00215141 100644 (file)
--- a/src/ext/ht.h
+++ b/src/ext/ht.h
@@ -58,6 +58,7 @@
 #define HT_NEXT_RMV(name, head, elm) name##_HT_NEXT_RMV((head), (elm))
 #define HT_CLEAR(name, head)         name##_HT_CLEAR(head)
 #define HT_INIT(name, head)          name##_HT_INIT(head)
+#define HT_REP_IS_BAD_(name, head)    name##_HT_REP_IS_BAD_(head)
 /* Helper: */
 static INLINE unsigned
 ht_improve_hash(unsigned h)

diff --git a/src/or/dns.c b/src/or/dns.c
index 36271939b4fabd3d16415bd72db599c31a6f6516..a9c431865195a4dc1d2fe84b28de7bccf25c5fec 100644 (file)
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -2174,7 +2174,7 @@ static void
 assert_cache_ok_(void)
 {
   cached_resolve_t **resolve;
-  int bad_rep = _cache_map_HT_REP_IS_BAD(&cache_root);
+  int bad_rep = HT_REP_IS_BAD_(cache_map, &cache_root);
   if (bad_rep) {
     log_err(LD_BUG, "Bad rep type %d on dns cache hash table", bad_rep);
     tor_assert(!bad_rep);