From 6e3de8530e49b926d25ba071720b7c8054b6d8ac Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 7 Nov 2008 01:50:37 +0000 Subject: [PATCH] Remove bug 811/845 debugging code svn:r17199 --- src/or/or.h | 2 -- src/or/policies.c | 42 ------------------------------------------ 2 files changed, 44 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 5a1d611fec..4d1b7de2fe 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4223,12 +4223,10 @@ typedef enum { CRN_NEED_CAPACITY = 1<<1, CRN_NEED_GUARD = 1<<2, CRN_ALLOW_INVALID = 1<<3, -#if 0 /* XXXX021 not used, apparently. */ CRN_STRICT_PREFERRED = 1<<4, /* XXXX021 not used, apparently. */ CRN_WEIGHT_AS_EXIT = 1<<5 -#endif } router_crn_flags_t; routerinfo_t *router_choose_random_node(const char *preferred, diff --git a/src/or/policies.c b/src/or/policies.c index 4a6204621b..64d73375c8 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -1237,48 +1237,6 @@ addr_policy_free(addr_policy_t *p) search.policy = p; found = HT_REMOVE(policy_map, &policy_root, &search); if (found) { - if (p != found->policy) { - /* Debugging code for bug 811/845. XXXX021 remove once that's - * fixed. */ - char *t1, *t2; - char b1[TOR_ADDR_BUF_LEN], b2[TOR_ADDR_BUF_LEN]; - switch (p->policy_type) { - case ADDR_POLICY_ACCEPT: t1 = tor_strdup("accept"); break; - case ADDR_POLICY_REJECT: t1 = tor_strdup("reject"); break; - default: - t1 = tor_malloc(16); - tor_snprintf(t1, 16, "%d", (int)p->policy_type); - break; - } - switch (found->policy->policy_type) { - case ADDR_POLICY_ACCEPT: t2 = tor_strdup("accept"); break; - case ADDR_POLICY_REJECT: t2 = tor_strdup("reject"); break; - default: - t2 = tor_malloc(16); - tor_snprintf(t2, 16, "%d", (int)found->policy->policy_type); - break; - } - - tor_addr_to_str(b1, &p->addr, sizeof(b1), 1); - tor_addr_to_str(b2, &found->policy->addr, sizeof(b2), 1); - log_err(LD_GENERAL, - "Mismatch between cached policy and freed policy. " - "p==%s %s/%d:%d-%d%s%s. " - "found->policy==%s %s/%d:%d-%d%s%s.", - t1, b1, (int)p->maskbits, (int)p->prt_min, (int)p->prt_max, - p->is_private?" [Private]":"", - p->is_canonical?" [Canonical]":"", - t2, b2, (int)found->policy->maskbits, - (int)found->policy->prt_min, (int)found->policy->prt_max, - found->policy->is_private?" [Private]":"", - found->policy->is_canonical?" [Canonical]":""); - - log_err(LD_GENERAL, - "cmp_single_addr_policy(p,found->policy)==%d. " - "tor_addr_compare(&p->addr, &found->policy->addr, CMP_EXACT)==%d", - cmp_single_addr_policy(p,found->policy), - tor_addr_compare(&p->addr, &found->policy->addr, CMP_EXACT)); - } tor_assert(p == found->policy); tor_free(found); }