April 2013 - tor-commits - lists.torproject.org

[tor/release-0.2.4] More constness in dirserv.c
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit c7947619df826f6c4568c857178d54b8dee17749 Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Mar 7 05:05:56 2013 -0800 More constness in dirserv.c --- src/or/dirserv.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 1160f6b..1846dc1 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -90,9 +90,9 @@ static void dirserv_cache_measured_bw(const measured_bw_line_t *parsed_line, static void dirserv_clear_measured_bw_cache(void); static void dirserv_expire_measured_bw_cache(time_t now); static int dirserv_get_measured_bw_cache_size(void); -static int dirserv_query_measured_bw_cache(char *node_id, long *bw_out, +static int dirserv_query_measured_bw_cache(const char *node_id, long *bw_out, time_t *as_of_out); -static uint32_t dirserv_get_bandwidth_for_router(routerinfo_t *ri); +static uint32_t dirserv_get_bandwidth_for_router(const routerinfo_t *ri); /************** Measured Bandwidth parsing code ******/ #define MAX_MEASUREMENT_AGE (3*24*60*60) /* 3 days */ @@ -2162,7 +2162,7 @@ dirserv_get_measured_bw_cache_size(void) /** Query the cache by identity digest, return value indicates whether * we found it. */ static int -dirserv_query_measured_bw_cache(char *node_id, long *bw_out, +dirserv_query_measured_bw_cache(const char *node_id, long *bw_out, time_t *as_of_out) { mbw_cache_entry_t *v = NULL; @@ -2185,7 +2185,7 @@ dirserv_query_measured_bw_cache(char *node_id, long *bw_out, * preferring measured to advertised values if available. */ static uint32_t -dirserv_get_bandwidth_for_router(routerinfo_t *ri) +dirserv_get_bandwidth_for_router(const routerinfo_t *ri) { uint32_t bw = 0; /*

1 0

[tor/release-0.2.4] Use DIGESTMAP_FOREACH_MODIFY in dirserv_expire_measured_bw_cache() for concision
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit b5224348340238f231f81138c09f7f16541d0f1d Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Mar 7 15:55:01 2013 -0800 Use DIGESTMAP_FOREACH_MODIFY in dirserv_expire_measured_bw_cache() for concision --- src/or/dirserv.c | 35 ++++++----------------------------- 1 files changed, 6 insertions(+), 29 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index e97def7..b6ff6f6 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2100,38 +2100,15 @@ dirserv_clear_measured_bw_cache(void) void dirserv_expire_measured_bw_cache(time_t now) { - digestmap_iter_t *itr = NULL; - const char *k = NULL; - void *e_v = NULL; - mbw_cache_entry_t *e = NULL; - int rmv; if (mbw_cache) { - /* Start iterating */ - itr = digestmap_iter_init(mbw_cache); - while (!digestmap_iter_done(itr)) { - rmv = 0; - digestmap_iter_get(itr, &k, &e_v); - e = (mbw_cache_entry_t *)e_v; - if (e) { - /* Check for expiration and remove if so */ - if (now > e->as_of + MAX_MEASUREMENT_AGE) { - tor_free(e); - rmv = 1; - } - } else { - /* Weird; remove it and complain */ - log_warn(LD_BUG, "Saw NULL entry in measured bandwidth cache"); - rmv = 1; + /* Iterate through the cache and check each entry */ + DIGESTMAP_FOREACH_MODIFY(mbw_cache, k, mbw_cache_entry_t *, e) { + if (now > e->as_of + MAX_MEASUREMENT_AGE) { + tor_free(e); + MAP_DEL_CURRENT(k); } - - /* Advance, or remove and advance */ - if (rmv) { - itr = digestmap_iter_next_rmv(mbw_cache, itr); - } else { - itr = digestmap_iter_next(mbw_cache, itr); - } - } + } DIGESTMAP_FOREACH_END; /* Check if we cleared the whole thing and free if so */ if (digestmap_size(mbw_cache) == 0) {

1 0

[tor/release-0.2.4] Add unit test for dirserv measured bandwidth cache
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 6e978ab8294eda5bb9a658c8d062bdd0098a9ac5 Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Mar 7 15:41:22 2013 -0800 Add unit test for dirserv measured bandwidth cache --- src/or/dirserv.c | 20 +++---------- src/or/dirserv.h | 12 ++++++++ src/test/test_dir.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 15 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 3dfa1e7..e97def7 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -85,18 +85,8 @@ static const signed_descriptor_t *get_signed_descriptor_by_fp( time_t publish_cutoff); static was_router_added_t dirserv_add_extrainfo(extrainfo_t *ei, const char **msg); -static void dirserv_cache_measured_bw(const measured_bw_line_t *parsed_line, - time_t as_of); -static void dirserv_clear_measured_bw_cache(void); -static void dirserv_expire_measured_bw_cache(time_t now); -static int dirserv_get_measured_bw_cache_size(void); -static int dirserv_query_measured_bw_cache(const char *node_id, long *bw_out, - time_t *as_of_out); static uint32_t dirserv_get_bandwidth_for_router(const routerinfo_t *ri); -/************** Measured Bandwidth parsing code ******/ -#define MAX_MEASUREMENT_AGE (3*24*60*60) /* 3 days */ - /************** Fingerprint handling code ************/ #define FP_NAMED 1 /**< Listed in fingerprint file. */ @@ -2066,7 +2056,7 @@ static digestmap_t *mbw_cache = NULL; /** Store a measured bandwidth cache entry when reading the measured * bandwidths file. */ -static void +void dirserv_cache_measured_bw(const measured_bw_line_t *parsed_line, time_t as_of) { @@ -2096,7 +2086,7 @@ dirserv_cache_measured_bw(const measured_bw_line_t *parsed_line, } /** Clear and free the measured bandwidth cache */ -static void +void dirserv_clear_measured_bw_cache(void) { if (mbw_cache) { @@ -2107,7 +2097,7 @@ dirserv_clear_measured_bw_cache(void) } /** Scan the measured bandwidth cache and remove expired entries */ -static void +void dirserv_expire_measured_bw_cache(time_t now) { digestmap_iter_t *itr = NULL; @@ -2152,7 +2142,7 @@ dirserv_expire_measured_bw_cache(time_t now) } /** Get the current size of the measured bandwidth cache */ -static int +int dirserv_get_measured_bw_cache_size(void) { if (mbw_cache) return digestmap_size(mbw_cache); @@ -2161,7 +2151,7 @@ dirserv_get_measured_bw_cache_size(void) /** Query the cache by identity digest, return value indicates whether * we found it. */ -static int +int dirserv_query_measured_bw_cache(const char *node_id, long *bw_out, time_t *as_of_out) { diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 0caf55f..887a499 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -138,10 +138,22 @@ void cached_dir_decref(cached_dir_t *d); cached_dir_t *new_cached_dir(char *s, time_t published); #ifdef DIRSERV_PRIVATE + +/* Put the MAX_MEASUREMENT_AGE #define here so unit tests can see it */ +#define MAX_MEASUREMENT_AGE (3*24*60*60) /* 3 days */ + int measured_bw_line_parse(measured_bw_line_t *out, const char *line); int measured_bw_line_apply(measured_bw_line_t *parsed_line, smartlist_t *routerstatuses); + +void dirserv_cache_measured_bw(const measured_bw_line_t *parsed_line, + time_t as_of); +void dirserv_clear_measured_bw_cache(void); +void dirserv_expire_measured_bw_cache(time_t now); +int dirserv_get_measured_bw_cache_size(void); +int dirserv_query_measured_bw_cache(const char *node_id, long *bw_out, + time_t *as_of_out); #endif int dirserv_read_measured_bandwidths(const char *from_file, diff --git a/src/test/test_dir.c b/src/test/test_dir.c index fbd49b7..667e8f4 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -575,6 +575,83 @@ test_dir_measured_bw(void) return; } +#define MBWC_INIT_TIME 1000 + +/** Do the measured bandwidth cache unit test */ +static void +test_dir_measured_bw_cache(void) +{ + /* Initial fake time_t for testing */ + time_t curr = MBWC_INIT_TIME; + /* Some measured_bw_line_ts */ + measured_bw_line_t mbwl[3]; + /* For receiving output on cache queries */ + long bw; + time_t as_of; + + /* First, clear the cache and assert that it's empty */ + dirserv_clear_measured_bw_cache(); + test_eq(dirserv_get_measured_bw_cache_size(), 0); + /* + * Set up test mbwls; none of the dirserv_cache_*() functions care about + * the node_hex field. + */ + memset(mbwl[0].node_id, 0x01, DIGEST_LEN); + mbwl[0].bw = 20; + memset(mbwl[1].node_id, 0x02, DIGEST_LEN); + mbwl[1].bw = 40; + memset(mbwl[2].node_id, 0x03, DIGEST_LEN); + mbwl[2].bw = 80; + /* Try caching something */ + dirserv_cache_measured_bw(&(mbwl[0]), curr); + test_eq(dirserv_get_measured_bw_cache_size(), 1); + /* Okay, let's see if we can retrieve it */ + test_assert(dirserv_query_measured_bw_cache(mbwl[0].node_id, &bw, &as_of)); + test_eq(bw, 20); + test_eq(as_of, MBWC_INIT_TIME); + /* Try retrieving it without some outputs */ + test_assert(dirserv_query_measured_bw_cache(mbwl[0].node_id, NULL, NULL)); + test_assert(dirserv_query_measured_bw_cache(mbwl[0].node_id, &bw, NULL)); + test_eq(bw, 20); + test_assert(dirserv_query_measured_bw_cache(mbwl[0].node_id, NULL, &as_of)); + test_eq(as_of, MBWC_INIT_TIME); + /* Now expire it */ + curr += MAX_MEASUREMENT_AGE + 1; + dirserv_expire_measured_bw_cache(curr); + /* Check that the cache is empty */ + test_eq(dirserv_get_measured_bw_cache_size(), 0); + /* Check that we can't retrieve it */ + test_assert(!dirserv_query_measured_bw_cache(mbwl[0].node_id, NULL, NULL)); + /* Try caching a few things now */ + dirserv_cache_measured_bw(&(mbwl[0]), curr); + test_eq(dirserv_get_measured_bw_cache_size(), 1); + curr += MAX_MEASUREMENT_AGE / 4; + dirserv_cache_measured_bw(&(mbwl[1]), curr); + test_eq(dirserv_get_measured_bw_cache_size(), 2); + curr += MAX_MEASUREMENT_AGE / 4; + dirserv_cache_measured_bw(&(mbwl[2]), curr); + test_eq(dirserv_get_measured_bw_cache_size(), 3); + curr += MAX_MEASUREMENT_AGE / 4 + 1; + /* Do an expire that's too soon to get any of them */ + dirserv_expire_measured_bw_cache(curr); + test_eq(dirserv_get_measured_bw_cache_size(), 3); + /* Push the oldest one off the cliff */ + curr += MAX_MEASUREMENT_AGE / 4; + dirserv_expire_measured_bw_cache(curr); + test_eq(dirserv_get_measured_bw_cache_size(), 2); + /* And another... */ + curr += MAX_MEASUREMENT_AGE / 4; + dirserv_expire_measured_bw_cache(curr); + test_eq(dirserv_get_measured_bw_cache_size(), 1); + /* This should empty it out again */ + curr += MAX_MEASUREMENT_AGE / 4; + dirserv_expire_measured_bw_cache(curr); + test_eq(dirserv_get_measured_bw_cache_size(), 0); + + done: + return; +} + static void test_dir_param_voting(void) { @@ -2141,6 +2218,7 @@ struct testcase_t dir_tests[] = { DIR(scale_bw), DIR_LEGACY(clip_unmeasured_bw), DIR_LEGACY(clip_unmeasured_bw_alt), + DIR_LEGACY(measured_bw_cache), END_OF_TESTCASES };

1 0

[tor/release-0.2.4] Fix to test for bug8444 / 6034
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit d13b996d83cb346cf81f5d9b46486556d98073d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 9 19:45:17 2013 -0500 Fix to test for bug8444 / 6034 --- src/or/circuitbuild.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index f8521c5..2436246 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -540,6 +540,7 @@ circuit_build_times_get_initial_timeout(void) * Check if we have LearnCircuitBuildTimeout, and if we don't, * always use CircuitBuildTimeout, no questions asked. */ + /*XXXX025 this logic could be cleaned up a lot. */ if (get_options()->LearnCircuitBuildTimeout) { if (!unit_tests && get_options()->CircuitBuildTimeout) { timeout = get_options()->CircuitBuildTimeout*1000; @@ -552,7 +553,10 @@ circuit_build_times_get_initial_timeout(void) timeout = circuit_build_times_initial_timeout(); } } else { - timeout = get_options()->CircuitBuildTimeout*1000; + if (get_options()->CircuitBuildTimeout > 0) + timeout = get_options()->CircuitBuildTimeout*1000; + else + timeout = circuit_build_times_initial_timeout(); } return timeout;

1 0

[tor/release-0.2.4] Increase link_proto field to 2 bytes
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit fca578d9b56d7d80fc43f21b77153d7e5cad92d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 12:34:14 2013 -0400 Increase link_proto field to 2 bytes This should have been 2 bytes all along, since version numbers can be 16 bits long. This isn't a live bug, since the call to is_or_protocol_version_known in channel_tls_process_versions_cell will reject any version number not in the range 1..4. Still, let's fix this before we accidentally start supporting version 256. Reported pseudonymously. Fixes bug 8062; bugfix on 0.2.0.10-alpha -- specifically, on commit 6fcda529, where during development I increased the width of a version to 16 bits without changing the type of link_proto. --- changes/bug8062 | 5 +++++ src/or/or.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug8062 b/changes/bug8062 new file mode 100644 index 0000000..805e51e --- /dev/null +++ b/changes/bug8062 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Increase the width of the field used to remember a connection's + link protocol version to two bytes. Harmless for now, since the + only currently recognized versions are one byte long. Reported + pseudynmously. Fixes bug 8062, bugfix on 0.2.0.10-alpha. diff --git a/src/or/or.h b/src/or/or.h index c7d2598..2fe36ba 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1417,8 +1417,8 @@ typedef struct or_connection_t { unsigned int is_outgoing:1; unsigned int proxy_type:2; /**< One of PROXY_NONE...PROXY_SOCKS5 */ unsigned int wide_circ_ids:1; - uint8_t link_proto; /**< What protocol version are we using? 0 for - * "none negotiated yet." */ + uint16_t link_proto; /**< What protocol version are we using? 0 for + * "none negotiated yet." */ or_handshake_state_t *handshake_state; /**< If we are setting this connection * up, state information to do so. */

1 0

[tor/release-0.2.4] Fix a framing bug when reading versions from a versions cell.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit b9037521c6ba333178c3f3197c39be360aba229c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 12:29:28 2013 -0400 Fix a framing bug when reading versions from a versions cell. Our ++ should have been += 2. This means that we'd accept version numbers even when they started at an odd position. This bug should be harmless in practice for so long as every version number we allow begins with a 0 byte, but if we ever have a version number starting with 1, 2, 3, or 4, there will be trouble here. Fix for bug 8059, reported pseudonymously. Bugfix on 0.2.0.10-alpha -- specifically, commit 6fcda529, where during development I increased the width of a version to 16 bits without changing the loop step. --- changes/bug8059 | 6 ++++++ src/or/channeltls.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug8059 b/changes/bug8059 new file mode 100644 index 0000000..47273ed --- /dev/null +++ b/changes/bug8059 @@ -0,0 +1,6 @@ + o Minor bugfixes (protocol conformance): + - Fix a misframing issue when reading the version numbers in a + VERSIONS cell. Previously we would recognize [00 01 00 02] as + 'version 1, version 2, and version 0x100', when it should have + only included versions 1 and 2. Fixes bug 8059; bugfix on + 0.2.0.10-alpha. Reported pseudonymously. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 1035a14..60693da 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1208,7 +1208,7 @@ channel_tls_process_versions_cell(var_cell_t *cell, channel_tls_t *chan) tor_assert(chan->conn->handshake_state); end = cell->payload + cell->payload_len; - for (cp = cell->payload; cp+1 < end; ++cp) { + for (cp = cell->payload; cp+1 < end; cp += 2) { uint16_t v = ntohs(get_uint16(cp)); if (is_or_protocol_version_known(v) && v > highest_supported_version) highest_supported_version = v;

1 0

[tor/release-0.2.4] Better comment for dirserv_query_measured_bw_cache()
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 8027ebb5fdf43b5aa63e498c1f8e3c6b2c87bbb7 Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Mar 7 15:59:30 2013 -0800 Better comment for dirserv_query_measured_bw_cache() --- src/or/dirserv.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index b6ff6f6..37934a0 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2127,7 +2127,8 @@ dirserv_get_measured_bw_cache_size(void) } /** Query the cache by identity digest, return value indicates whether - * we found it. */ + * we found it. The bw_out and as_of_out pointers receive the cached + * bandwidth value and the time it was cached if not NULL. */ int dirserv_query_measured_bw_cache(const char *node_id, long *bw_out, time_t *as_of_out)

1 0

[tor/release-0.2.4] Check more error codes when writing microdescriptors.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 6905c1f60d2d0e658481df70fdcaa73251becacc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 14:50:41 2013 -0400 Check more error codes when writing microdescriptors. Possible partial fix, or diagnosis tool, for bug 8031. --- changes/bug8031 | 7 +++++++ src/or/microdesc.c | 18 ++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/changes/bug8031 b/changes/bug8031 new file mode 100644 index 0000000..17329ec --- /dev/null +++ b/changes/bug8031 @@ -0,0 +1,7 @@ + o Minor bugfixes: + - Use direct writes rather than stdio when building microdescriptor + caches, in an attempt to mitigate bug 8031, or at least make it + less common. + - Warn more aggressively when flushing microdescriptors to a + microdescriptor cache fails, in an attempt to mitegate bug 8031, + or at least make it more diagnosable. diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 0a9724f..7d3f631 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -251,8 +251,14 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, cache->total_len_seen += md->bodylen; } SMARTLIST_FOREACH_END(md); - if (fd >= 0) - finish_writing_to_file(open_file); /*XXX Check me.*/ + if (fd >= 0) { + if (finish_writing_to_file(open_file) < 0) { + log_warn(LD_DIR, "Error appending to microdescriptor file: %s", + strerror(errno)); + smartlist_clear(added); + return added; + } + } { networkstatus_t *ns = networkstatus_get_latest_consensus(); @@ -459,11 +465,15 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) smartlist_add(wrote, md); } + if (finish_writing_to_file(open_file) < 0) { + log_warn(LD_DIR, "Error rebuilding microdescriptor cache: %s", + strerror(errno)); + return -1; + } + if (cache->cache_content) tor_munmap_file(cache->cache_content); - finish_writing_to_file(open_file); /*XXX Check me.*/ - cache->cache_content = tor_mmap_file(cache->cache_fname); if (!cache->cache_content && smartlist_len(wrote)) {

1 0

[tor/release-0.2.4] Give an #error when we want threads and OpenSSL has disabled threads
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit fdafe11a25ad3e7ca8893c8630f86973431217b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 13:23:10 2013 -0400 Give an #error when we want threads and OpenSSL has disabled threads Fixes ticket 6673. --- changes/bug6673 | 4 ++++ src/common/crypto.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/changes/bug6673 b/changes/bug6673 new file mode 100644 index 0000000..506b449 --- /dev/null +++ b/changes/bug6673 @@ -0,0 +1,4 @@ + o Minor features (build): + - Detect and reject attempts to build Tor with threading support + when OpenSSL have been compiled with threading support disabled. + Fixes bug 6673. diff --git a/src/common/crypto.c b/src/common/crypto.c index 22d57c7..3d8b1ba 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -3000,6 +3000,12 @@ memwipe(void *mem, uint8_t byte, size_t sz) } #ifdef TOR_IS_MULTITHREADED + +#ifndef OPENSSL_THREADS +#error OpenSSL has been built without thread support. Tor requires an \ + OpenSSL library with thread support enabled. +#endif + /** Helper: OpenSSL uses this callback to manipulate mutexes. */ static void openssl_locking_cb_(int mode, int n, const char *file, int line)

1 0

[tor/release-0.2.4] Another possible diagnostic for 8031.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 1eebb566911380c22768a8d25061a8f917688349 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 14:52:56 2013 -0400 Another possible diagnostic for 8031. This time, I'm checking whether our calculated offset matches our real offset, in each case, as we go along. I don't think this is the bug, but it can't hurt to check. --- src/or/microdesc.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 7d3f631..bb9668d 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -415,7 +415,7 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) microdesc_t **mdp; smartlist_t *wrote; ssize_t size; - off_t off = 0; + off_t off = 0, off_real; int orig_size, new_size; if (cache == NULL) { @@ -458,6 +458,14 @@ microdesc_cache_rebuild(microdesc_cache_t *cache, int force) tor_assert(((size_t)size) == annotation_len + md->bodylen); md->off = off + annotation_len; off += size; + off_real = tor_fd_getpos(fd); + if (off_real != off) { + log_warn(LD_BUG, "Discontinuity in position in microdescriptor cache." + "By my count, I'm at "I64_FORMAT + ", but I should be at "I64_FORMAT, + I64_PRINTF_ARG(off), I64_PRINTF_ARG(off_real)); + off = off_real; + } if (md->saved_location != SAVED_IN_CACHE) { tor_free(md->body); md->saved_location = SAVED_IN_CACHE;

1 0