nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with DEBUG_DNS_CACHE

Browse Source 
Reported by cypherpunks.

Fix for #11761; bugfix on 0.2.3.13-alpha where we made ht.h stop using
_identifiers.
This commit is contained in:
Nick Mathewson 2014-05-06 10:18:34 -04:00
parent 388478561d
commit 78301d99fe
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug11761 Normal file
View File

@ -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".

1
src/ext/ht.h
View File

@ -58,6 +58,7 @@
#define HT_NEXT_RMV(name, head, elm) name##_HT_NEXT_RMV((head), (elm)) #define HT_NEXT_RMV(name, head, elm) name##_HT_NEXT_RMV((head), (elm))
#define HT_CLEAR(name, head) name##_HT_CLEAR(head) #define HT_CLEAR(name, head) name##_HT_CLEAR(head)
#define HT_INIT(name, head) name##_HT_INIT(head) #define HT_INIT(name, head) name##_HT_INIT(head)
#define HT_REP_IS_BAD_(name, head) name##_HT_REP_IS_BAD_(head)
/* Helper: */ /* Helper: */
static INLINE unsigned static INLINE unsigned
ht_improve_hash(unsigned h) ht_improve_hash(unsigned h)

2
src/or/dns.c
View File

@ -2174,7 +2174,7 @@ static void
assert_cache_ok_(void) assert_cache_ok_(void)
{ {
cached_resolve_t **resolve; 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) { if (bad_rep) {
log_err(LD_BUG, "Bad rep type %d on dns cache hash table", bad_rep); log_err(LD_BUG, "Bad rep type %d on dns cache hash table", bad_rep);
tor_assert(!bad_rep); tor_assert(!bad_rep);