May 2011 - tor-commits - lists.torproject.org

[tor/maint-0.2.2] Preserve bridge download status across SETCONF, HUP
by nickm＠torproject.org 16 May '11

16 May '11

commit 2b9c5ee301f705cbf69c725ca749d4ac752c06d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 12:46:26 2011 -0400 Preserve bridge download status across SETCONF, HUP This code changes it so that we don't remove bridges immediately when we start re-parsing our configuration. Instead, we mark them all, and remove all the marked ones after re-parsing our bridge lines. As we add a bridge, we see if it's already in the list. If so, we just unmark it. This new behavior will lose the property we used to have that bridges were in bridge_list in the same order in which they appeared in the torrc. I took a quick look through the code, and I'm pretty sure we didn't actually depend on that anywhere. This is for bug 3019; it's a fix on 0.2.0.3-alpha. --- changes/bug3019 | 4 +++ src/or/circuitbuild.c | 57 +++++++++++++++++++++++++++++++++++++++++++------ src/or/circuitbuild.h | 9 ++++--- src/or/config.c | 3 +- 4 files changed, 61 insertions(+), 12 deletions(-) diff --git a/changes/bug3019 b/changes/bug3019 new file mode 100644 index 0000000..4df709f --- /dev/null +++ b/changes/bug3019 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Do not reset the bridge descriptor download status every time we + re-parse our configuration or get a configuration change. Fixes + bug 3019; bugfix on Tor 0.2.0.3-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index a9986d3..860cd27 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4471,6 +4471,9 @@ typedef struct { tor_addr_t addr; /** TLS port for the bridge. */ uint16_t port; + /** Boolean: We are re-parsing our bridge list, and we are going to remove + * this one if we don't find it in the list of configured bridges. */ + unsigned marked_for_removal : 1; /** Expected identity digest, or all zero bytes if we don't know what the * digest should be. */ char identity[DIGEST_LEN]; @@ -4479,11 +4482,39 @@ typedef struct { } bridge_info_t; /** A list of configured bridges. Whenever we actually get a descriptor - * for one, we add it as an entry guard. */ + * for one, we add it as an entry guard. Note that the order of bridges + * in this list does not necessarily correspond to the order of bridges + * in the torrc. */ static smartlist_t *bridge_list = NULL; -/** Initialize the bridge list to empty, creating it if needed. */ +/** Mark every entry of the bridge list to be removed on our next call to + * sweep_bridge_list unless it has first been un-marked. */ +void +mark_bridge_list(void) +{ + if (!bridge_list) + bridge_list = smartlist_create(); + SMARTLIST_FOREACH(bridge_list, bridge_info_t *, b, + b->marked_for_removal = 1); +} + +/** Remove every entry of the bridge list that was marked with + * mark_bridge_list if it has not subsequently been un-marked. */ void +sweep_bridge_list(void) +{ + if (!bridge_list) + bridge_list = smartlist_create(); + SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, b) { + if (b->marked_for_removal) { + SMARTLIST_DEL_CURRENT(bridge_list, b); + tor_free(b); + } + } SMARTLIST_FOREACH_END(b); +} + +/** Initialize the bridge list to empty, creating it if needed. */ +static void clear_bridge_list(void) { if (!bridge_list) @@ -4496,7 +4527,8 @@ clear_bridge_list(void) * (either by comparing keys if possible, else by comparing addr/port). * Else return NULL. */ static bridge_info_t * -get_configured_bridge_by_addr_port_digest(tor_addr_t *addr, uint16_t port, +get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr, + uint16_t port, const char *digest) { if (!bridge_list) @@ -4537,7 +4569,8 @@ routerinfo_is_a_configured_bridge(routerinfo_t *ri) * If it was a bridge, and we still don't know its digest, record it. */ void -learned_router_identity(tor_addr_t *addr, uint16_t port, const char *digest) +learned_router_identity(const tor_addr_t *addr, uint16_t port, + const char *digest) { bridge_info_t *bridge = get_configured_bridge_by_addr_port_digest(addr, port, digest); @@ -4549,11 +4582,20 @@ learned_router_identity(tor_addr_t *addr, uint16_t port, const char *digest) } /** Remember a new bridge at addr:port. If digest - * is set, it tells us the identity key too. */ + * is set, it tells us the identity key too. If we already had the + * bridge in our list, unmark it, and don't actually add anything new. */ void -bridge_add_from_config(const tor_addr_t *addr, uint16_t port, char *digest) +bridge_add_from_config(const tor_addr_t *addr, uint16_t port, + const char *digest) { - bridge_info_t *b = tor_malloc_zero(sizeof(bridge_info_t)); + bridge_info_t *b; + + if ((b = get_configured_bridge_by_addr_port_digest(addr, port, digest))) { + b->marked_for_removal = 0; + return; + } + + b = tor_malloc_zero(sizeof(bridge_info_t)); tor_addr_copy(&b->addr, addr); b->port = port; if (digest) @@ -4561,6 +4603,7 @@ bridge_add_from_config(const tor_addr_t *addr, uint16_t port, char *digest) b->fetch_status.schedule = DL_SCHED_BRIDGE; if (!bridge_list) bridge_list = smartlist_create(); + smartlist_add(bridge_list, b); } diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index af24931..0e673e1 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -62,12 +62,13 @@ int getinfo_helper_entry_guards(control_connection_t *conn, const char *question, char **answer, const char **errmsg); -void clear_bridge_list(void); +void mark_bridge_list(void); +void sweep_bridge_list(void); int routerinfo_is_a_configured_bridge(routerinfo_t *ri); -void -learned_router_identity(tor_addr_t *addr, uint16_t port, const char *digest); +void learned_router_identity(const tor_addr_t *addr, uint16_t port, + const char *digest); void bridge_add_from_config(const tor_addr_t *addr, uint16_t port, - char *digest); + const char *digest); void retry_bridge_descriptor_fetch_directly(const char *digest); void fetch_bridge_descriptors(or_options_t *options, time_t now); void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); diff --git a/src/or/config.c b/src/or/config.c index 0997fe2..6a2742d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1172,7 +1172,7 @@ options_act(or_options_t *old_options) return -1; if (options->Bridges) { - clear_bridge_list(); + mark_bridge_list(); for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 0)<0) { log_warn(LD_BUG, @@ -1180,6 +1180,7 @@ options_act(or_options_t *old_options) return -1; } } + sweep_bridge_list(); } if (running_tor && rend_config_services(options, 0)<0) {

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 16 May '11

16 May '11

commit 68acfefbdb7a25ac1585c9480a8c98cadca50b7a Merge: ced06a8 bc44393 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 20:12:20 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' src/common/container.h | 2 +- src/common/di_ops.h | 1 + src/or/config.c | 7 ++++--- src/or/dirvote.c | 13 ++++++++----- src/or/routerlist.c | 9 +++++---- 5 files changed, 19 insertions(+), 13 deletions(-)

1 0

[tor/master] Fixup whitespace issues from 3122 commit in 0.2.3
by nickm＠torproject.org 16 May '11

16 May '11

commit aa8db013e4691237e23b24d2f4658b2595af7c54 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 20:13:12 2011 -0400 Fixup whitespace issues from 3122 commit in 0.2.3 --- src/test/test_util.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index f4b17c9..ee2d455 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1418,7 +1418,6 @@ test_util_spawn_background_fail(void *ptr) } #endif - static void test_util_di_ops(void) {

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 16 May '11

16 May '11

commit 4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611 Merge: d29c2eb 00ff80e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 20:09:10 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 Conflicts: src/or/networkstatus.c src/common/container.h | 2 +- src/common/di_ops.h | 1 + src/or/dirvote.c | 10 ++++++---- src/or/routerlist.c | 9 +++++---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --cc src/or/dirvote.c index dd156bd,f138198..517dac5 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@@ -1765,11 -881,9 +1767,11 @@@ networkstatus_compute_consensus(smartli /* Figure out the most popular opinion of what the most recent * routerinfo and its contents are. */ - rs = compute_routerstatus_consensus(matching_descs); + memset(microdesc_digest, 0, sizeof(microdesc_digest)); + rs = compute_routerstatus_consensus(matching_descs, consensus_method, + microdesc_digest); /* Copy bits of that into rs_out. */ - tor_assert(fast_memeq(lowest_id, rs->status.identity_digest, DIGEST_LEN)); + tor_assert(fast_memeq(lowest_id, rs->status.identity_digest,DIGEST_LEN)); memcpy(rs_out.identity_digest, lowest_id, DIGEST_LEN); memcpy(rs_out.descriptor_digest, rs->status.descriptor_digest, DIGEST_LEN);

1 0

[tor/master] Fixup whitespace issues from 3122 commit
by nickm＠torproject.org 16 May '11

16 May '11

commit bc44393eb59a1d303314b4b646b4d815f4eadc22 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 20:12:01 2011 -0400 Fixup whitespace issues from 3122 commit --- src/or/config.c | 7 ++++--- src/or/dirvote.c | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 9c68b6f..0997fe2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1288,9 +1288,10 @@ options_act(or_options_t *old_options) if (revise_trackexithosts) addressmap_clear_excluded_trackexithosts(options); - if (old_options->AutomapHostsOnResolve && !options->AutomapHostsOnResolve) { - revise_automap_entries = 1; - } else if (options->AutomapHostsOnResolve) { + if (!options->AutomapHostsOnResolve) { + if (old_options->AutomapHostsOnResolve) + revise_automap_entries = 1; + } else { if (!smartlist_strings_eq(old_options->AutomapHostsSuffixes, options->AutomapHostsSuffixes)) revise_automap_entries = 1; diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 517dac5..96e3df5 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2213,7 +2213,8 @@ networkstatus_add_detached_signatures(networkstatus_t *target, } for (alg = DIGEST_SHA1; alg < N_DIGEST_ALGORITHMS; ++alg) { if (!tor_mem_is_zero(digests->d[alg], DIGEST256_LEN)) { - if (fast_memeq(target->digests.d[alg], digests->d[alg], DIGEST256_LEN)) { + if (fast_memeq(target->digests.d[alg], digests->d[alg], + DIGEST256_LEN)) { ++n_matches; } else { *msg_out = "Mismatched digest.";

1 0

[tor/master] Fixup whitespace issues from 3122 commit
by nickm＠torproject.org 16 May '11

16 May '11

commit 00ff80e0ae3a07ff3e2148d66d59716bc4630096 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 20:06:36 2011 -0400 Fixup whitespace issues from 3122 commit --- src/common/container.h | 2 +- src/common/di_ops.h | 1 + src/or/dirvote.c | 10 ++++++---- src/or/networkstatus.c | 5 +++-- src/or/routerlist.c | 9 +++++---- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/common/container.h b/src/common/container.h index bb7cb89..39619b0 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -241,7 +241,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, * Example use: * SMARTLIST_FOREACH_JOIN(routerstatus_list, routerstatus_t *, rs, * routerinfo_list, routerinfo_t *, ri, - * tor_memcmp(rs->identity_digest, ri->identity_digest, 20), + * tor_memcmp(rs->identity_digest, ri->identity_digest, 20), * log_info(LD_GENERAL,"No match for %s", ri->nickname)) { * log_info(LD_GENERAL, "%s matches routerstatus %p", ri->nickname, rs); * } SMARTLIST_FOREACH_JOIN_END(rs, ri); diff --git a/src/common/di_ops.h b/src/common/di_ops.h index 4a212b0..fa7d868 100644 --- a/src/common/di_ops.h +++ b/src/common/di_ops.h @@ -28,3 +28,4 @@ int tor_memeq(const void *a, const void *b, size_t sz); #define fast_memneq(a,b,c) (0!=memcmp((a),(b),(c))) #endif + diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9e763bd..f138198 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -314,8 +314,9 @@ compare_vote_rs(const vote_routerstatus_t *a, const vote_routerstatus_t *b) if ((r = fast_memcmp(a->status.identity_digest, b->status.identity_digest, DIGEST_LEN))) return r; - if ((r = fast_memcmp(a->status.descriptor_digest, b->status.descriptor_digest, - DIGEST_LEN))) + if ((r = fast_memcmp(a->status.descriptor_digest, + b->status.descriptor_digest, + DIGEST_LEN))) return r; if ((r = (int)(b->status.published_on - a->status.published_on))) return r; @@ -823,7 +824,8 @@ networkstatus_compute_consensus(smartlist_t *votes, if (index[v_sl_idx] < size[v_sl_idx]) { rs = smartlist_get(v->routerstatus_list, index[v_sl_idx]); if (!lowest_id || - fast_memcmp(rs->status.identity_digest, lowest_id, DIGEST_LEN) < 0) + fast_memcmp(rs->status.identity_digest, + lowest_id, DIGEST_LEN) < 0) lowest_id = rs->status.identity_digest; } }); @@ -881,7 +883,7 @@ networkstatus_compute_consensus(smartlist_t *votes, * routerinfo and its contents are. */ rs = compute_routerstatus_consensus(matching_descs); /* Copy bits of that into rs_out. */ - tor_assert(fast_memeq(lowest_id, rs->status.identity_digest, DIGEST_LEN)); + tor_assert(fast_memeq(lowest_id, rs->status.identity_digest,DIGEST_LEN)); memcpy(rs_out.identity_digest, lowest_id, DIGEST_LEN); memcpy(rs_out.descriptor_digest, rs->status.descriptor_digest, DIGEST_LEN); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index dcd8159..34d1e6e 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1433,8 +1433,9 @@ networkstatus_set_current_consensus(const char *consensus, unsigned flags) } if (current_consensus && - tor_memeq(c->networkstatus_digest, current_consensus->networkstatus_digest, - DIGEST_LEN)) { + tor_memeq(c->networkstatus_digest, + current_consensus->networkstatus_digest, + DIGEST_LEN)) { /* We already have this one. That's a failure. */ log_info(LD_DIR, "Got a consensus we already have"); goto done; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 9f04620..be7ba0e 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2008,8 +2008,8 @@ router_get_by_nickname(const char *nickname, int warn_if_unnamed) if (n_matches <= 1 || router->is_running) best_match = router; } else if (maybedigest && - tor_memeq(digest, router->cache_info.identity_digest, DIGEST_LEN) - ) { + tor_memeq(digest, router->cache_info.identity_digest, + DIGEST_LEN)) { if (router_hex_digest_matches(router, nickname)) return router; /* If we reach this point, we have a ID=name syntax that matches the @@ -4665,8 +4665,9 @@ routerinfo_incompatible_with_extrainfo(routerinfo_t *ri, extrainfo_t *ei, /* The identity must match exactly to have been generated at the same time * by the same router. */ - if (tor_memneq(ri->cache_info.identity_digest, ei->cache_info.identity_digest, - DIGEST_LEN)) { + if (tor_memneq(ri->cache_info.identity_digest, + ei->cache_info.identity_digest, + DIGEST_LEN)) { if (msg) *msg = "Extrainfo nickname or identity did not match routerinfo"; goto err; /* different servers */ }

1 0

[tor/maint-0.2.2] Fixup whitespace issues from 3122 commit
by nickm＠torproject.org 16 May '11

16 May '11

commit 00ff80e0ae3a07ff3e2148d66d59716bc4630096 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 20:06:36 2011 -0400 Fixup whitespace issues from 3122 commit --- src/common/container.h | 2 +- src/common/di_ops.h | 1 + src/or/dirvote.c | 10 ++++++---- src/or/networkstatus.c | 5 +++-- src/or/routerlist.c | 9 +++++---- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/common/container.h b/src/common/container.h index bb7cb89..39619b0 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -241,7 +241,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, * Example use: * SMARTLIST_FOREACH_JOIN(routerstatus_list, routerstatus_t *, rs, * routerinfo_list, routerinfo_t *, ri, - * tor_memcmp(rs->identity_digest, ri->identity_digest, 20), + * tor_memcmp(rs->identity_digest, ri->identity_digest, 20), * log_info(LD_GENERAL,"No match for %s", ri->nickname)) { * log_info(LD_GENERAL, "%s matches routerstatus %p", ri->nickname, rs); * } SMARTLIST_FOREACH_JOIN_END(rs, ri); diff --git a/src/common/di_ops.h b/src/common/di_ops.h index 4a212b0..fa7d868 100644 --- a/src/common/di_ops.h +++ b/src/common/di_ops.h @@ -28,3 +28,4 @@ int tor_memeq(const void *a, const void *b, size_t sz); #define fast_memneq(a,b,c) (0!=memcmp((a),(b),(c))) #endif + diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9e763bd..f138198 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -314,8 +314,9 @@ compare_vote_rs(const vote_routerstatus_t *a, const vote_routerstatus_t *b) if ((r = fast_memcmp(a->status.identity_digest, b->status.identity_digest, DIGEST_LEN))) return r; - if ((r = fast_memcmp(a->status.descriptor_digest, b->status.descriptor_digest, - DIGEST_LEN))) + if ((r = fast_memcmp(a->status.descriptor_digest, + b->status.descriptor_digest, + DIGEST_LEN))) return r; if ((r = (int)(b->status.published_on - a->status.published_on))) return r; @@ -823,7 +824,8 @@ networkstatus_compute_consensus(smartlist_t *votes, if (index[v_sl_idx] < size[v_sl_idx]) { rs = smartlist_get(v->routerstatus_list, index[v_sl_idx]); if (!lowest_id || - fast_memcmp(rs->status.identity_digest, lowest_id, DIGEST_LEN) < 0) + fast_memcmp(rs->status.identity_digest, + lowest_id, DIGEST_LEN) < 0) lowest_id = rs->status.identity_digest; } }); @@ -881,7 +883,7 @@ networkstatus_compute_consensus(smartlist_t *votes, * routerinfo and its contents are. */ rs = compute_routerstatus_consensus(matching_descs); /* Copy bits of that into rs_out. */ - tor_assert(fast_memeq(lowest_id, rs->status.identity_digest, DIGEST_LEN)); + tor_assert(fast_memeq(lowest_id, rs->status.identity_digest,DIGEST_LEN)); memcpy(rs_out.identity_digest, lowest_id, DIGEST_LEN); memcpy(rs_out.descriptor_digest, rs->status.descriptor_digest, DIGEST_LEN); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index dcd8159..34d1e6e 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1433,8 +1433,9 @@ networkstatus_set_current_consensus(const char *consensus, unsigned flags) } if (current_consensus && - tor_memeq(c->networkstatus_digest, current_consensus->networkstatus_digest, - DIGEST_LEN)) { + tor_memeq(c->networkstatus_digest, + current_consensus->networkstatus_digest, + DIGEST_LEN)) { /* We already have this one. That's a failure. */ log_info(LD_DIR, "Got a consensus we already have"); goto done; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 9f04620..be7ba0e 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2008,8 +2008,8 @@ router_get_by_nickname(const char *nickname, int warn_if_unnamed) if (n_matches <= 1 || router->is_running) best_match = router; } else if (maybedigest && - tor_memeq(digest, router->cache_info.identity_digest, DIGEST_LEN) - ) { + tor_memeq(digest, router->cache_info.identity_digest, + DIGEST_LEN)) { if (router_hex_digest_matches(router, nickname)) return router; /* If we reach this point, we have a ID=name syntax that matches the @@ -4665,8 +4665,9 @@ routerinfo_incompatible_with_extrainfo(routerinfo_t *ri, extrainfo_t *ei, /* The identity must match exactly to have been generated at the same time * by the same router. */ - if (tor_memneq(ri->cache_info.identity_digest, ei->cache_info.identity_digest, - DIGEST_LEN)) { + if (tor_memneq(ri->cache_info.identity_digest, + ei->cache_info.identity_digest, + DIGEST_LEN)) { if (msg) *msg = "Extrainfo nickname or identity did not match routerinfo"; goto err; /* different servers */ }

1 0

[tor/maint-0.2.2] Fixup whitespace issues from 3122 commit
by nickm＠torproject.org 16 May '11

16 May '11

commit bc44393eb59a1d303314b4b646b4d815f4eadc22 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 20:12:01 2011 -0400 Fixup whitespace issues from 3122 commit --- src/or/config.c | 7 ++++--- src/or/dirvote.c | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 9c68b6f..0997fe2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1288,9 +1288,10 @@ options_act(or_options_t *old_options) if (revise_trackexithosts) addressmap_clear_excluded_trackexithosts(options); - if (old_options->AutomapHostsOnResolve && !options->AutomapHostsOnResolve) { - revise_automap_entries = 1; - } else if (options->AutomapHostsOnResolve) { + if (!options->AutomapHostsOnResolve) { + if (old_options->AutomapHostsOnResolve) + revise_automap_entries = 1; + } else { if (!smartlist_strings_eq(old_options->AutomapHostsSuffixes, options->AutomapHostsSuffixes)) revise_automap_entries = 1; diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 517dac5..96e3df5 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2213,7 +2213,8 @@ networkstatus_add_detached_signatures(networkstatus_t *target, } for (alg = DIGEST_SHA1; alg < N_DIGEST_ALGORITHMS; ++alg) { if (!tor_mem_is_zero(digests->d[alg], DIGEST256_LEN)) { - if (fast_memeq(target->digests.d[alg], digests->d[alg], DIGEST256_LEN)) { + if (fast_memeq(target->digests.d[alg], digests->d[alg], + DIGEST256_LEN)) { ++n_matches; } else { *msg_out = "Mismatched digest.";

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by nickm＠torproject.org 16 May '11

16 May '11

commit 4c3853aca8708ecf2d6eb4e2d8fcf8ef5fd68611 Merge: d29c2eb 00ff80e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 20:09:10 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 Conflicts: src/or/networkstatus.c src/common/container.h | 2 +- src/common/di_ops.h | 1 + src/or/dirvote.c | 10 ++++++---- src/or/routerlist.c | 9 +++++---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --cc src/or/dirvote.c index dd156bd,f138198..517dac5 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@@ -1765,11 -881,9 +1767,11 @@@ networkstatus_compute_consensus(smartli /* Figure out the most popular opinion of what the most recent * routerinfo and its contents are. */ - rs = compute_routerstatus_consensus(matching_descs); + memset(microdesc_digest, 0, sizeof(microdesc_digest)); + rs = compute_routerstatus_consensus(matching_descs, consensus_method, + microdesc_digest); /* Copy bits of that into rs_out. */ - tor_assert(fast_memeq(lowest_id, rs->status.identity_digest, DIGEST_LEN)); + tor_assert(fast_memeq(lowest_id, rs->status.identity_digest,DIGEST_LEN)); memcpy(rs_out.identity_digest, lowest_id, DIGEST_LEN); memcpy(rs_out.descriptor_digest, rs->status.descriptor_digest, DIGEST_LEN);

1 0

[tor/maint-0.2.1] Fixup whitespace issues from 3122 commit
by nickm＠torproject.org 16 May '11

16 May '11

commit 00ff80e0ae3a07ff3e2148d66d59716bc4630096 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 20:06:36 2011 -0400 Fixup whitespace issues from 3122 commit --- src/common/container.h | 2 +- src/common/di_ops.h | 1 + src/or/dirvote.c | 10 ++++++---- src/or/networkstatus.c | 5 +++-- src/or/routerlist.c | 9 +++++---- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/common/container.h b/src/common/container.h index bb7cb89..39619b0 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -241,7 +241,7 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, * Example use: * SMARTLIST_FOREACH_JOIN(routerstatus_list, routerstatus_t *, rs, * routerinfo_list, routerinfo_t *, ri, - * tor_memcmp(rs->identity_digest, ri->identity_digest, 20), + * tor_memcmp(rs->identity_digest, ri->identity_digest, 20), * log_info(LD_GENERAL,"No match for %s", ri->nickname)) { * log_info(LD_GENERAL, "%s matches routerstatus %p", ri->nickname, rs); * } SMARTLIST_FOREACH_JOIN_END(rs, ri); diff --git a/src/common/di_ops.h b/src/common/di_ops.h index 4a212b0..fa7d868 100644 --- a/src/common/di_ops.h +++ b/src/common/di_ops.h @@ -28,3 +28,4 @@ int tor_memeq(const void *a, const void *b, size_t sz); #define fast_memneq(a,b,c) (0!=memcmp((a),(b),(c))) #endif + diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9e763bd..f138198 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -314,8 +314,9 @@ compare_vote_rs(const vote_routerstatus_t *a, const vote_routerstatus_t *b) if ((r = fast_memcmp(a->status.identity_digest, b->status.identity_digest, DIGEST_LEN))) return r; - if ((r = fast_memcmp(a->status.descriptor_digest, b->status.descriptor_digest, - DIGEST_LEN))) + if ((r = fast_memcmp(a->status.descriptor_digest, + b->status.descriptor_digest, + DIGEST_LEN))) return r; if ((r = (int)(b->status.published_on - a->status.published_on))) return r; @@ -823,7 +824,8 @@ networkstatus_compute_consensus(smartlist_t *votes, if (index[v_sl_idx] < size[v_sl_idx]) { rs = smartlist_get(v->routerstatus_list, index[v_sl_idx]); if (!lowest_id || - fast_memcmp(rs->status.identity_digest, lowest_id, DIGEST_LEN) < 0) + fast_memcmp(rs->status.identity_digest, + lowest_id, DIGEST_LEN) < 0) lowest_id = rs->status.identity_digest; } }); @@ -881,7 +883,7 @@ networkstatus_compute_consensus(smartlist_t *votes, * routerinfo and its contents are. */ rs = compute_routerstatus_consensus(matching_descs); /* Copy bits of that into rs_out. */ - tor_assert(fast_memeq(lowest_id, rs->status.identity_digest, DIGEST_LEN)); + tor_assert(fast_memeq(lowest_id, rs->status.identity_digest,DIGEST_LEN)); memcpy(rs_out.identity_digest, lowest_id, DIGEST_LEN); memcpy(rs_out.descriptor_digest, rs->status.descriptor_digest, DIGEST_LEN); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index dcd8159..34d1e6e 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1433,8 +1433,9 @@ networkstatus_set_current_consensus(const char *consensus, unsigned flags) } if (current_consensus && - tor_memeq(c->networkstatus_digest, current_consensus->networkstatus_digest, - DIGEST_LEN)) { + tor_memeq(c->networkstatus_digest, + current_consensus->networkstatus_digest, + DIGEST_LEN)) { /* We already have this one. That's a failure. */ log_info(LD_DIR, "Got a consensus we already have"); goto done; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 9f04620..be7ba0e 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2008,8 +2008,8 @@ router_get_by_nickname(const char *nickname, int warn_if_unnamed) if (n_matches <= 1 || router->is_running) best_match = router; } else if (maybedigest && - tor_memeq(digest, router->cache_info.identity_digest, DIGEST_LEN) - ) { + tor_memeq(digest, router->cache_info.identity_digest, + DIGEST_LEN)) { if (router_hex_digest_matches(router, nickname)) return router; /* If we reach this point, we have a ID=name syntax that matches the @@ -4665,8 +4665,9 @@ routerinfo_incompatible_with_extrainfo(routerinfo_t *ri, extrainfo_t *ei, /* The identity must match exactly to have been generated at the same time * by the same router. */ - if (tor_memneq(ri->cache_info.identity_digest, ei->cache_info.identity_digest, - DIGEST_LEN)) { + if (tor_memneq(ri->cache_info.identity_digest, + ei->cache_info.identity_digest, + DIGEST_LEN)) { if (msg) *msg = "Extrainfo nickname or identity did not match routerinfo"; goto err; /* different servers */ }

1 0