July 2014 - tor-commits - lists.torproject.org

[tor/master] Check for orconns and use connection_or_close_for_error() when appropriate in connection_handle_write_impl()
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 65a0f895c7dd913071bcba5f1876ccf3b1286892 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Apr 15 23:03:16 2014 -0700 Check for orconns and use connection_or_close_for_error() when appropriate in connection_handle_write_impl() --- changes/bug11302 | 4 ++++ src/or/connection.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/changes/bug11302 b/changes/bug11302 new file mode 100644 index 0000000..7416c69 --- /dev/null +++ b/changes/bug11302 @@ -0,0 +1,4 @@ + o Bugfixes: + - Check for orconns and use connection_or_close_for_error() rather than + connection_mark_for_close() directly in the getsockopt() failure case + of connection_handle_write_impl(). Fixes bug #11302. diff --git a/src/or/connection.c b/src/or/connection.c index 1be4c45..33b7d31 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3705,9 +3705,15 @@ connection_handle_write_impl(connection_t *conn, int force) if (connection_state_is_connecting(conn)) { if (getsockopt(conn->s, SOL_SOCKET, SO_ERROR, (void*)&e, &len) < 0) { log_warn(LD_BUG, "getsockopt() syscall failed"); - if (CONN_IS_EDGE(conn)) - connection_edge_end_errno(TO_EDGE_CONN(conn)); - connection_mark_for_close(conn); + if (conn->type == CONN_TYPE_OR) { + or_connection_t *orconn = TO_OR_CONN(conn); + connection_or_close_for_error(orconn, 0); + } else { + if (CONN_IS_EDGE(conn)) { + connection_edge_end_errno(TO_EDGE_CONN(conn)); + } + connection_mark_for_close(conn); + } return -1; } if (e) {

1 0

[tor/master] Merge remote-tracking branch 'andrea/bug11302'
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit b408125288ad6943d7ed3b468ad9179a93d1359c Merge: 0ef5d4d 65a0f89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 16 16:58:41 2014 +0200 Merge remote-tracking branch 'andrea/bug11302' changes/bug11302 | 4 ++++ src/or/connection.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[tor/master] Add a changes file for bug12202
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 0ef5d4d633dc40ad12eaf65608325d1e5045b812 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 16 16:54:42 2014 +0200 Add a changes file for bug12202 --- changes/bug12202 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug12202 b/changes/bug12202 new file mode 100644 index 0000000..566d37e --- /dev/null +++ b/changes/bug12202 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Change the entry_is_live() function to take named bitfield elements + instead of an unnamed list of booleans. Closes ticket 12202.

1 0

[tor/master] Change the interface of entry_is_live() to take a bitmap.
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 8bbb217964a8d3a2d77a69f670a53ff65643ff27 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 25 15:44:36 2014 -0400 Change the interface of entry_is_live() to take a bitmap. --- src/or/entrynodes.c | 41 ++++++++++++++++++++++++++++++++--------- src/or/entrynodes.h | 14 +++++++++++--- src/test/test_entrynodes.c | 12 ++++++++---- 3 files changed, 51 insertions(+), 16 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index d025a54..65a3ae3 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -191,11 +191,15 @@ entry_is_time_to_retry(const entry_guard_t *e, time_t now) * a descriptor (routerinfo or microdesc) for it. */ STATIC INLINE const node_t * -entry_is_live(const entry_guard_t *e, int need_uptime, int need_capacity, - int assume_reachable, int need_descriptor, const char **msg) +entry_is_live(const entry_guard_t *e, entry_is_live_flags_t flags, const char **msg) { const node_t *node; const or_options_t *options = get_options(); + int need_uptime = (flags & ENTRY_NEED_UPTIME) != 0; + int need_capacity = (flags & ENTRY_NEED_CAPACITY) != 0; + const int assume_reachable = (flags & ENTRY_ASSUME_REACHABLE) != 0; + const int need_descriptor = (flags & ENTRY_NEED_DESCRIPTOR) != 0; + tor_assert(msg); if (e->path_bias_disabled) { @@ -257,12 +261,18 @@ num_live_entry_guards(int for_directory) { int n = 0; const char *msg; + /* Set the entry node attributes we are interested in. */ + entry_is_live_flags_t entry_flags = ENTRY_NEED_CAPACITY; + if (!for_directory) { + entry_flags |= ENTRY_NEED_DESCRIPTOR; + } + if (! entry_guards) return 0; SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) { if (for_directory && !entry->is_dir_cache) continue; - if (entry_is_live(entry, 0, 1, 0, !for_directory, &msg)) + if (entry_is_live(entry, entry_flags, &msg)) ++n; } SMARTLIST_FOREACH_END(entry); return n; @@ -291,7 +301,7 @@ log_entry_guards(int severity) SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, e) { const char *msg = NULL; - if (entry_is_live(e, 0, 1, 0, 0, &msg)) + if (entry_is_live(e, ENTRY_NEED_CAPACITY, &msg)) smartlist_add_asprintf(elements, "%s [%s] (up %s)", e->nickname, hex_str(e->identity, DIGEST_LEN), @@ -667,7 +677,7 @@ entry_guards_compute_status(const or_options_t *options, time_t now) SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) { const char *reason = digestmap_get(reasons, entry->identity); const char *live_msg = ""; - const node_t *r = entry_is_live(entry, 0, 1, 0, 0, &live_msg); + const node_t *r = entry_is_live(entry, ENTRY_NEED_CAPACITY, &live_msg); log_info(LD_CIRC, "Summary: Entry %s [%s] is %s, %s%s%s, and %s%s.", entry->nickname, hex_str(entry->identity, DIGEST_LEN), @@ -785,7 +795,9 @@ entry_guard_register_connect_status(const char *digest, int succeeded, break; if (e->made_contact) { const char *msg; - const node_t *r = entry_is_live(e, 0, 1, 1, 0, &msg); + const node_t *r = entry_is_live(e, + ENTRY_NEED_CAPACITY | ENTRY_ASSUME_REACHABLE, + &msg); if (r && e->unreachable_since) { refuse_conn = 1; e->can_retry = 1; @@ -1029,7 +1041,19 @@ populate_live_entry_guards(smartlist_t *live_entry_guards, const int num_needed = decide_num_guards(options, for_directory); smartlist_t *exit_family = smartlist_new(); int retval = 0; - int need_descriptor = !for_directory; + entry_is_live_flags_t entry_flags = 0; + + { /* Set the flags we want our entry node to have */ + if (need_uptime) { + entry_flags |= ENTRY_NEED_UPTIME; + } + if (need_capacity) { + entry_flags |= ENTRY_NEED_CAPACITY; + } + if (!for_directory) { + entry_flags |= ENTRY_NEED_DESCRIPTOR; + } + } tor_assert(all_entry_guards); @@ -1039,8 +1063,7 @@ populate_live_entry_guards(smartlist_t *live_entry_guards, SMARTLIST_FOREACH_BEGIN(all_entry_guards, const entry_guard_t *, entry) { const char *msg; - node = entry_is_live(entry, need_uptime, need_capacity, 0, - need_descriptor, &msg); + node = entry_is_live(entry, entry_flags, &msg); if (!node) continue; /* down, no point */ if (for_directory) { diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index afbe9e9..81f8b9c 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -92,10 +92,18 @@ STATIC int decide_num_guards(const or_options_t *options, int for_directory); STATIC void entry_guards_set_from_config(const or_options_t *options); +/** Flags to be passed to entry_is_live() to indicate what kind of + * entry nodes we are looking for. */ +typedef enum { + ENTRY_NEED_UPTIME = 1<<0, + ENTRY_NEED_CAPACITY = 1<<1, + ENTRY_ASSUME_REACHABLE = 1<<2, + ENTRY_NEED_DESCRIPTOR = 1<<3, +} entry_is_live_flags_t; + STATIC INLINE const node_t *entry_is_live(const entry_guard_t *e, - int need_uptime, int need_capacity, - int assume_reachable, - int need_descriptor,const char **msg); + entry_is_live_flags_t flags, + const char **msg); #endif void remove_all_entry_guards(void); diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 528329a..b81f95a 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -580,20 +580,24 @@ test_entry_is_live(void *arg) /* Require the node to be stable, but it's not. Should fail. Also enable 'assume_reachable' because why not. */ - test_node = entry_is_live(test_entry, 1, 0, 1, 0, &msg); + test_node = entry_is_live(test_entry, + ENTRY_NEED_UPTIME | ENTRY_ASSUME_REACHABLE, + &msg); test_assert(!test_node); /* Require the node to be fast, but it's not. Should fail. */ - test_node = entry_is_live(test_entry, 0, 1, 1, 0, &msg); + test_node = entry_is_live(test_entry, + ENTRY_NEED_CAPACITY | ENTRY_ASSUME_REACHABLE, + &msg); test_assert(!test_node); /* Don't impose any restrictions on the node. Should succeed. */ - test_node = entry_is_live(test_entry, 0, 0, 0, 0, &msg); + test_node = entry_is_live(test_entry, 0, &msg); test_assert(test_node); tt_ptr_op(test_node, ==, node_get_by_id(test_entry->identity)); /* Require descriptor for this node. It has one so it should succeed. */ - test_node = entry_is_live(test_entry, 0, 0, 0, 1, &msg); + test_node = entry_is_live(test_entry, ENTRY_NEED_DESCRIPTOR, &msg); test_assert(test_node); tt_ptr_op(test_node, ==, node_get_by_id(test_entry->identity));

1 0

[tor/master] Merge remote-tracking branch 'asn/bug12202'
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 368ff2291b0b400e0ee908ad465ed6f0f56330ec Merge: f74a932 8bbb217 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 16 16:49:07 2014 +0200 Merge remote-tracking branch 'asn/bug12202' src/or/entrynodes.c | 43 ++++++++++++++++++++++------- src/or/entrynodes.h | 13 +++++++++ src/test/test_entrynodes.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 10 deletions(-)

1 0

[tor/master] Fix wide lines, make entry_is_live() non-inline
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 5690284559af012c279e9b989497ccc2e03cfc70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 16 16:52:16 2014 +0200 Fix wide lines, make entry_is_live() non-inline --- src/or/entrynodes.c | 5 +++-- src/or/entrynodes.h | 6 +++--- src/test/test_entrynodes.c | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 65a3ae3..4d09195 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -190,8 +190,9 @@ entry_is_time_to_retry(const entry_guard_t *e, time_t now) * If need_descriptor is true, only return the node if we currently have * a descriptor (routerinfo or microdesc) for it. */ -STATIC INLINE const node_t * -entry_is_live(const entry_guard_t *e, entry_is_live_flags_t flags, const char **msg) +STATIC const node_t * +entry_is_live(const entry_guard_t *e, entry_is_live_flags_t flags, + const char **msg) { const node_t *node; const or_options_t *options = get_options(); diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 81f8b9c..5d91756 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -101,9 +101,9 @@ typedef enum { ENTRY_NEED_DESCRIPTOR = 1<<3, } entry_is_live_flags_t; -STATIC INLINE const node_t *entry_is_live(const entry_guard_t *e, - entry_is_live_flags_t flags, - const char **msg); +STATIC const node_t *entry_is_live(const entry_guard_t *e, + entry_is_live_flags_t flags, + const char **msg); #endif void remove_all_entry_guards(void); diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 47d8bc3..1be0ce1 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -553,6 +553,7 @@ test_entry_is_live(void *arg) const node_t *test_node = NULL; const entry_guard_t *test_entry = NULL; const char *msg; + int which_node; (void) arg; @@ -576,7 +577,8 @@ test_entry_is_live(void *arg) tt_int_op(smartlist_len(all_entry_guards), ==, NUMBER_OF_DESCRIPTORS); /* Now get a random test entry that we will use for this unit test. */ - test_entry = smartlist_get(all_entry_guards, 3); /* chosen by fair dice roll */ + which_node = 3; /* (chosen by fair dice roll) */ + test_entry = smartlist_get(all_entry_guards, which_node); /* Let's do some entry_is_live() tests! */

1 0

[tor/master] Basic entry_is_live() unittest.
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 46d41e6e9b4208b1a951f2d7f14da92606b82195 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 25 15:39:00 2014 -0400 Basic entry_is_live() unittest. --- src/or/entrynodes.c | 2 +- src/or/entrynodes.h | 5 ++++ src/test/test_entrynodes.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 3dcb8f7..d025a54 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -190,7 +190,7 @@ entry_is_time_to_retry(const entry_guard_t *e, time_t now) * If need_descriptor is true, only return the node if we currently have * a descriptor (routerinfo or microdesc) for it. */ -static INLINE const node_t * +STATIC INLINE const node_t * entry_is_live(const entry_guard_t *e, int need_uptime, int need_capacity, int assume_reachable, int need_descriptor, const char **msg) { diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index d49ca50..afbe9e9 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -91,6 +91,11 @@ STATIC int populate_live_entry_guards(smartlist_t *live_entry_guards, STATIC int decide_num_guards(const or_options_t *options, int for_directory); STATIC void entry_guards_set_from_config(const or_options_t *options); + +STATIC INLINE const node_t *entry_is_live(const entry_guard_t *e, + int need_uptime, int need_capacity, + int assume_reachable, + int need_descriptor,const char **msg); #endif void remove_all_entry_guards(void); diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 09a847f..528329a 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -542,6 +542,65 @@ test_entry_guards_set_from_config(void *arg) routerset_free(options->EntryNodes); } +/** XXX Do some tests that entry_is_live() */ +static void +test_entry_is_live(void *arg) +{ + smartlist_t *our_nodelist = NULL; + const smartlist_t *all_entry_guards = get_entry_guards(); + const node_t *test_node = NULL; + const entry_guard_t *test_entry = NULL; + const char *msg; + + (void) arg; + + /* The global entry guards smartlist should be empty now. */ + tt_int_op(smartlist_len(all_entry_guards), ==, 0); + + /* Walk the nodelist and add all nodes as entry guards. */ + our_nodelist = nodelist_get_list(); + tt_int_op(smartlist_len(our_nodelist), ==, NUMBER_OF_DESCRIPTORS); + + SMARTLIST_FOREACH_BEGIN(our_nodelist, const node_t *, node) { + const node_t *node_tmp; + node_tmp = add_an_entry_guard(node, 0, 1, 0, 0); + test_assert(node_tmp); + + tt_int_op(node->is_stable, ==, 0); + tt_int_op(node->is_fast, ==, 0); + } SMARTLIST_FOREACH_END(node); + + /* Make sure the nodes were added as entry guards. */ + tt_int_op(smartlist_len(all_entry_guards), ==, NUMBER_OF_DESCRIPTORS); + + /* Now get a random test entry that we will use for this unit test. */ + test_entry = smartlist_get(all_entry_guards, 3); /* chosen by fair dice roll */ + + /* Let's do some entry_is_live() tests! */ + + /* Require the node to be stable, but it's not. Should fail. + Also enable 'assume_reachable' because why not. */ + test_node = entry_is_live(test_entry, 1, 0, 1, 0, &msg); + test_assert(!test_node); + + /* Require the node to be fast, but it's not. Should fail. */ + test_node = entry_is_live(test_entry, 0, 1, 1, 0, &msg); + test_assert(!test_node); + + /* Don't impose any restrictions on the node. Should succeed. */ + test_node = entry_is_live(test_entry, 0, 0, 0, 0, &msg); + test_assert(test_node); + tt_ptr_op(test_node, ==, node_get_by_id(test_entry->identity)); + + /* Require descriptor for this node. It has one so it should succeed. */ + test_node = entry_is_live(test_entry, 0, 0, 0, 1, &msg); + test_assert(test_node); + tt_ptr_op(test_node, ==, node_get_by_id(test_entry->identity)); + + done: + ; /* XXX */ +} + static const struct testcase_setup_t fake_network = { fake_network_setup, fake_network_cleanup }; @@ -567,6 +626,9 @@ struct testcase_t entrynodes_tests[] = { { "entry_guards_set_from_config", test_entry_guards_set_from_config, TT_FORK, &fake_network, NULL }, + { "entry_is_live", + test_entry_is_live, + TT_FORK, &fake_network, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Only active relays should be given HSDir
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 43bba9541af26ababa4854fa960ffe0e37d920e9 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Jul 9 00:08:09 2014 +0000 Only active relays should be given HSDir We should only assign a relay the HSDir flag if it is currently considered valid. We can accomplish this by only considering active relays, and as a consequence of this we also exclude relays that are currently hibernating. Fixes #12573 --- changes/bug12573 | 5 +++++ src/or/dirserv.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug12573 b/changes/bug12573 new file mode 100644 index 0000000..46e3ee2 --- /dev/null +++ b/changes/bug12573 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Relays should not be assigned the HSDir flag if they are + considered invalid. Also, do not assign the HSDir flag to relays + that are currently hibernating. Fixes #12573. Bugfix on + tor-0.2.0.10-alpha diff --git a/src/or/dirserv.c b/src/or/dirserv.c index aedd092..a033f8b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1468,7 +1468,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router, * to fix the bug was 0.2.2.25-alpha. */ return (router->wants_to_be_hs_dir && router->dir_port && uptime >= get_options()->MinUptimeHidServDirectoryV2 && - node->is_running); + router_is_active(router, node, now)); } /** Don't consider routers with less bandwidth than this when computing

1 0

[tor/master] Merge remote-tracking branch 'sysrqb/bug12573'
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit f74a932e0b68205b180c6894b036ab3193144390 Merge: e669e91 43bba95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 16 15:38:10 2014 +0200 Merge remote-tracking branch 'sysrqb/bug12573' changes/bug12573 | 5 +++++ src/or/dirserv.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Document choose_random_entry_impl() and populate_live_entry_guards().
by nickm＠torproject.org 16 Jul '14

16 Jul '14

commit 61629b4f6ccb06ec190c4078797fcb48d83208d5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sun Jun 15 19:02:35 2014 -0700 Document choose_random_entry_impl() and populate_live_entry_guards(). --- src/or/entrynodes.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 360c738..3dcb8f7 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -997,8 +997,25 @@ choose_random_dirguard(dirinfo_type_t type) return choose_random_entry_impl(NULL, 1, type, NULL); } -/* DOCDOCODC - Return 1 if we should choose a guard right away. */ +/** Filter all_entry_guards for usable entry guards and put them + * in live_entry_guards. We filter based on whether the node is + * currently alive, and on whether it satisfies the restrictions + * imposed by the other arguments of this function. + * + * We don't place more guards than NumEntryGuards in live_entry_guards. + * + * If chosen_exit is set, it contains the exit node of this + * circuit. Make sure to not use it or its family as an entry guard. + * + * If need_uptime is set, we are looking for a stable entry guard. + * if need_capacity is set, we are looking for a fast entry guard. + * + * The rest of the arguments are the same as in choose_random_entry_impl(). + * + * Return 1 if we should choose a guard right away. Return 0 if we + * should try to add more nodes to our list before deciding on a + * guard. + */ STATIC int populate_live_entry_guards(smartlist_t *live_entry_guards, const smartlist_t *all_entry_guards, @@ -1058,7 +1075,24 @@ populate_live_entry_guards(smartlist_t *live_entry_guards, return retval; } -/** Helper for choose_random{entry,dirguard}. */ +/** Pick a node to be used as the entry guard of a circuit. + * + * If state is set, it contains the information we know about + * the upcoming circuit. + * + * If for_directory is set, we are looking for a directory guard. + * + * dirinfo_type contains the kind of directory information we + * are looking for in our node. + * + * If n_options_out is set, we set it to the number of + * candidate guard nodes we had before picking a specific guard node. + * + * On success, return the node that should be used as the entry guard + * of the circuit. Return NULL if no such node could be found. + * + * Helper for choose_random{entry,dirguard}. +*/ static const node_t * choose_random_entry_impl(cpath_build_state_t *state, int for_directory, dirinfo_type_t dirinfo_type, int *n_options_out)

1 0