commit 50a5954003a0478273d9e2c1a546e641e763a997 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 21 16:48:54 2018 -0400
Remove bloom filters, order statistics, and bitarrays from container.h --- src/common/address_set.c | 3 +-- src/common/util_bug.c | 1 + src/lib/container/container.h | 3 --- src/lib/crypt_ops/crypto_digest.h | 3 +-- src/lib/defs/include.am | 2 +- src/or/confparse.c | 4 ++-- src/or/consdiff.c | 1 - src/or/consdiff.h | 3 ++- src/or/dirauth/dirvote.c | 2 ++ src/or/dirserv.c | 3 ++- src/or/entrynodes.c | 3 ++- src/or/geoip.c | 3 ++- src/or/rephist.c | 4 +++- src/or/routerlist.c | 3 ++- src/or/routerparse.c | 3 ++- src/or/routerset.c | 3 +-- src/or/routerset.h | 3 ++- src/test/bench.c | 3 ++- src/test/test_circuitlist.c | 3 ++- src/test/test_containers.c | 5 ++++- src/test/test_entrynodes.c | 3 ++- 21 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/src/common/address_set.c b/src/common/address_set.c index d30343b1c..f4c5f581c 100644 --- a/src/common/address_set.c +++ b/src/common/address_set.c @@ -14,7 +14,7 @@ #include "common/address_set.h" #include "common/address.h" #include "common/compat.h" -#include "lib/container/container.h" +#include "lib/container/bitarray.h" #include "lib/crypt_ops/crypto_rand.h" #include "common/util.h" #include "siphash.h" @@ -126,4 +126,3 @@ address_set_probably_contains(address_set_t *set, } return matches == N_BITS_PER_ITEM; } - diff --git a/src/common/util_bug.c b/src/common/util_bug.c index 3b249bdfc..3d86131e7 100644 --- a/src/common/util_bug.c +++ b/src/common/util_bug.c @@ -12,6 +12,7 @@ #include "common/torlog.h" #include "lib/err/backtrace.h" #include "lib/container/container.h" +#include "lib/malloc/util_malloc.h"
#ifdef __COVERITY__ int bug_macro_deadcode_dummy__ = 0; diff --git a/src/lib/container/container.h b/src/lib/container/container.h index ba8983846..1d0a47749 100644 --- a/src/lib/container/container.h +++ b/src/lib/container/container.h @@ -8,8 +8,5 @@
#include "lib/container/smartlist.h" #include "lib/container/map.h" -#include "lib/container/bitarray.h" -#include "lib/container/bloomfilt.h" -#include "lib/container/order.h"
#endif /* !defined(TOR_CONTAINER_H) */ diff --git a/src/lib/crypt_ops/crypto_digest.h b/src/lib/crypt_ops/crypto_digest.h index 63e8bec70..628224a03 100644 --- a/src/lib/crypt_ops/crypto_digest.h +++ b/src/lib/crypt_ops/crypto_digest.h @@ -13,11 +13,10 @@ #ifndef TOR_CRYPTO_DIGEST_H #define TOR_CRYPTO_DIGEST_H
-#include <stdio.h> - #include "lib/container/container.h" #include "lib/cc/torint.h" #include "lib/defs/digest_sizes.h" +#include "lib/malloc/util_malloc.h"
/** Length of a sha1 message digest when encoded in base32 with trailing = * signs removed. */ diff --git a/src/lib/defs/include.am b/src/lib/defs/include.am index 861406c01..ff48cff07 100644 --- a/src/lib/defs/include.am +++ b/src/lib/defs/include.am @@ -1,3 +1,3 @@
noinst_HEADERS += \ - digest_sizes.h + src/lib/defs/digest_sizes.h diff --git a/src/or/confparse.c b/src/or/confparse.c index e88c4f72d..b38e06c6a 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -1,4 +1,3 @@ - /* Copyright (c) 2001 Matej Pfajfar. * Copyright (c) 2001-2004, Roger Dingledine. * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. @@ -26,6 +25,8 @@ #include "or/confparse.h" #include "or/routerset.h"
+#include "lib/container/bitarray.h" + static uint64_t config_parse_memunit(const char *s, int *ok); static int config_parse_msec_interval(const char *s, int *ok); static int config_parse_interval(const char *s, int *ok); @@ -1186,4 +1187,3 @@ config_parse_interval(const char *s, int *ok) } return (int)r; } - diff --git a/src/or/consdiff.c b/src/or/consdiff.c index 59e27c0ae..6d000997f 100644 --- a/src/or/consdiff.c +++ b/src/or/consdiff.c @@ -1412,4 +1412,3 @@ looks_like_a_consensus_diff(const char *document, size_t len) return (len >= strlen(ns_diff_version) && fast_memeq(document, ns_diff_version, strlen(ns_diff_version))); } - diff --git a/src/or/consdiff.h b/src/or/consdiff.h index 3f73b8536..1cae59a1a 100644 --- a/src/or/consdiff.h +++ b/src/or/consdiff.h @@ -15,6 +15,8 @@ char *consensus_diff_apply(const char *consensus, int looks_like_a_consensus_diff(const char *document, size_t len);
#ifdef CONSDIFF_PRIVATE +#include "lib/container/bitarray.h" + struct memarea_t;
/** Line type used for constructing consensus diffs. Each of these lines @@ -95,4 +97,3 @@ MOCK_DECL(STATIC int, #endif /* defined(CONSDIFF_PRIVATE) */
#endif /* !defined(TOR_CONSDIFF_H) */ - diff --git a/src/or/dirauth/dirvote.c b/src/or/dirauth/dirvote.c index 16439905a..85a0d3e70 100644 --- a/src/or/dirauth/dirvote.c +++ b/src/or/dirauth/dirvote.c @@ -43,6 +43,8 @@ #include "or/vote_routerstatus_st.h" #include "or/vote_timing_st.h"
+#include "lib/container/order.h" + /** * \file dirvote.c * \brief Functions to compute directory consensus, and schedule voting. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 077135841..655c13326 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -46,6 +46,8 @@ #include "or/tor_version_st.h" #include "or/vote_routerstatus_st.h"
+#include "lib/container/order.h" + /** * \file dirserv.c * \brief Directory server core implementation. Manages directory @@ -3591,4 +3593,3 @@ dirserv_free_all(void)
dirserv_clear_measured_bw_cache(); } - diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 1fb621590..3c63d3c1c 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -142,6 +142,8 @@ #include "or/node_st.h" #include "or/origin_circuit_st.h"
+#include "lib/container/bloomfilt.h" + /** A list of existing guard selection contexts. */ static smartlist_t *guard_contexts = NULL; /** The currently enabled guard selection context. */ @@ -3687,4 +3689,3 @@ entry_guards_free_all(void) } circuit_build_times_free_timeouts(get_circuit_build_times_mutable()); } - diff --git a/src/or/geoip.c b/src/or/geoip.c index 634ee707b..330477e4c 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -38,6 +38,8 @@ #include "or/geoip.h" #include "or/routerlist.h"
+#include "lib/container/order.h" + static void init_geoip_countries(void);
/** An entry from the GeoIP IPv4 file: maps an IPv4 range to a country. */ @@ -1884,4 +1886,3 @@ geoip_free_all(void) memset(geoip_digest, 0, sizeof(geoip_digest)); memset(geoip6_digest, 0, sizeof(geoip6_digest)); } - diff --git a/src/or/rephist.c b/src/or/rephist.c index a1cfc4932..2103eecdf 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -92,6 +92,9 @@ #include "or/networkstatus_st.h" #include "or/or_circuit_st.h"
+#include "lib/container/bloomfilt.h" +#include "lib/container/order.h" + static void bw_arrays_init(void); static void predicted_ports_alloc(void);
@@ -3208,4 +3211,3 @@ rep_hist_free_all(void) tor_assert_nonfatal(rephist_total_alloc == 0); tor_assert_nonfatal_once(rephist_total_num == 0); } - diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 97b3270f5..5af09fad2 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -137,6 +137,8 @@ #include "or/routerlist_st.h" #include "or/vote_routerstatus_st.h"
+#include "lib/container/bloomfilt.h" + // #define DEBUG_ROUTERLIST
/****************************************************************************/ @@ -5836,4 +5838,3 @@ refresh_all_country_info(void)
nodelist_refresh_countries(); } - diff --git a/src/or/routerparse.c b/src/or/routerparse.c index a0426b96c..91475cd51 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -98,6 +98,8 @@ #include "or/vote_microdesc_hash_st.h" #include "or/vote_routerstatus_st.h"
+#include "lib/container/bloomfilt.h" + #undef log #include <math.h>
@@ -5684,4 +5686,3 @@ routerparse_free_all(void) { dump_desc_fifo_cleanup(); } - diff --git a/src/or/routerset.c b/src/or/routerset.c index 231ae152a..61b7dc121 100644 --- a/src/or/routerset.c +++ b/src/or/routerset.c @@ -1,5 +1,5 @@ /* Copyright (c) 2001 Matej Pfajfar. - * Copyright (c) 2001-2004, Roger Dingledine. +n * Copyright (c) 2001-2004, Roger Dingledine. * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. * Copyright (c) 2007-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ @@ -460,4 +460,3 @@ routerset_free_(routerset_t *routerset) bitarray_free(routerset->countries); tor_free(routerset); } - diff --git a/src/or/routerset.h b/src/or/routerset.h index 5293c0ebf..8a13ca042 100644 --- a/src/or/routerset.h +++ b/src/or/routerset.h @@ -45,6 +45,8 @@ void routerset_free_(routerset_t *routerset); int routerset_len(const routerset_t *set);
#ifdef ROUTERSET_PRIVATE +#include "lib/container/bitarray.h" + STATIC char * routerset_get_countryname(const char *c); STATIC int routerset_contains(const routerset_t *set, const tor_addr_t *addr, uint16_t orport, @@ -85,4 +87,3 @@ struct routerset_t { }; #endif /* defined(ROUTERSET_PRIVATE) */ #endif /* !defined(TOR_ROUTERSET_H) */ - diff --git a/src/test/bench.c b/src/test/bench.c index 49ac7269e..3cfdd0ae4 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -29,6 +29,8 @@ #include "or/cell_st.h" #include "or/or_circuit_st.h"
+#include "lib/container/bloomfilt.h" + #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID) static uint64_t nanostart; static inline uint64_t @@ -741,4 +743,3 @@ main(int argc, const char **argv)
return 0; } - diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index 96de2eed0..4aa7c596e 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -17,6 +17,8 @@ #include "or/or_circuit_st.h" #include "or/origin_circuit_st.h"
+#include "lib/container/bitarray.h" + static channel_t * new_fake_channel(void) { @@ -470,4 +472,3 @@ struct testcase_t circuitlist_tests[] = { TT_FORK, NULL, NULL }, END_OF_TESTCASES }; - diff --git a/src/test/test_containers.c b/src/test/test_containers.c index efc6a181f..f45082be0 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -9,6 +9,10 @@ #include "or/fp_pair.h" #include "test/test.h"
+#include "lib/container/bitarray.h" +#include "lib/container/bloomfilt.h" +#include "lib/container/order.h" + /** Helper: return a tristate based on comparing the strings in *<b>a</b> and * *<b>b</b>. */ static int @@ -1295,4 +1299,3 @@ struct testcase_t container_tests[] = { CONTAINER(smartlist_strings_eq, 0), END_OF_TESTCASES }; - diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 2391e10cd..4d37d0fe8 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -43,6 +43,8 @@ #include "test/test_helpers.h" #include "test/log_test_helpers.h"
+#include "lib/container/bloomfilt.h" + /* TODO: * choose_random_entry() test with state set. * @@ -3074,4 +3076,3 @@ struct testcase_t entrynodes_tests[] = {
END_OF_TESTCASES }; -