Commit 78301d99 authored by Nick Mathewson's avatar Nick Mathewson 🦞
Browse files

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.
parent 38847856

changes/bug11761

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes:

    - Fix compilation when DNS_CACHE_DEBUG is enabled. Fixes bug 11761;

      bugfix on 0.2.3.13-alpha. Found by "cypherpunks".

src/ext/ht.h

+1 −0
Original line number Diff line number Diff line
@@ -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)

src/or/dns.c

+1 −1
Original line number Diff line number Diff line
@@ -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);