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

[stem/master] Descriptions of new CIRC_BW fields
by atagar＠torproject.org 27 May '18

27 May '18

commit 519991aee05f15d42ba938063a674e87d5305e8c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun May 27 12:01:13 2018 -0700 Descriptions of new CIRC_BW fields Thanks to clarifications from Mike on... https://trac.torproject.org/projects/tor/ticket/26110 --- stem/response/events.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stem/response/events.py b/stem/response/events.py index a50d90f8..5623d1a7 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -1229,10 +1229,10 @@ class CircuitBandwidthEvent(Event): :var str id: circuit identifier :var int read: bytes received by tor that second :var int written: bytes sent by tor that second - :var int delivered_read: description pending :trac:`26110` - :var int delivered_written: description pending :trac:`26110` - :var int overhead_read: description pending :trac:`26110` - :var int overhead_written: description pending :trac:`26110` + :var int delivered_read: user payload received by tor that second + :var int delivered_written: user payload sent by tor that second + :var int overhead_read: padding so read cells will have a fixed length + :var int overhead_written: padding so written cells will have a fixed length :var datetime time: time when the measurement was recorded """

1 0

[torspec/master] Attempt to clarify new CIRC_BW fields
by nickm＠torproject.org 27 May '18

27 May '18

commit 06cbab3eae78356c8c51d61c37bfdfe7518dbfbc Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 15 11:32:34 2018 -0700 Attempt to clarify new CIRC_BW fields I didn't really follow the last description so trying one of my own... https://trac.torproject.org/projects/tor/ticket/26110 Note that this description likely is *not* accurate. I didn't dig through tor's source to puzzle out what these fields are. Rather, this is a more grokable description of what I *think* the fields are. On the above ticket the Network team and I will work together on a description that's both easily understood and accurate. --- control-spec.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 72ceb15..d78b7ec 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2945,15 +2945,13 @@ BytesRead and BytesWritten are the number of bytes read and written on this circuit since the last CIRC_BW event. - DeliveredBytesRead and DeliveredBytesWritten are the total length of - all valid relay cell payloads read and written on this circuit since - the last CIRC_BW event. These fields are provided only in Tor - 3.4.0-alpha and later. + Circuit data falls into two categories: delivered payloads and overhead. + DeliveredBytesRead and DeliveredBytesWritten are the total payloads + transmitted since the last CIRC_BW event, whereas OverheadBytesRead and + OverheadBytesWritten are the metadata size used for routing. - OverheadBytesRead and OverheadBytesWritten are the total length of - the unused overhead portion of valid relay cells read and written on - this circuit since the last CIRC_BW event. These fields are provided - only in Tor 0.3.4.0-alpha and later. + The sum of DeliveredBytesRead and OverheadBytesRead SHOULD match BytesRead, + and same for their written counterparts. The Time field is provided only in versions 0.3.2.1-alpha and later. It records when Tor created the bandwidth event. @@ -2964,6 +2962,9 @@ [First added in 0.2.5.2-alpha] + [DELIVERED_READ, OVERHEAD_READ, DELIVERED_WRITTEN, and OVERHEAD_WRITTEN was + added in Tor 0.3.4.0-alpha] + 4.1.23. Per-circuit cell stats The syntax is:

1 0

[torspec/master] fixup! Attempt to clarify new CIRC_BW fields
by nickm＠torproject.org 27 May '18

27 May '18

commit db81ae54b5f174972f47a3a6575db31ae6b28c0c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 16 04:53:29 2018 +0000 fixup! Attempt to clarify new CIRC_BW fields Correct a couple statements in the clarification, and attempt to clarify further. --- control-spec.txt | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index d78b7ec..e448918 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2943,15 +2943,23 @@ Time = ISOTime2Frac BytesRead and BytesWritten are the number of bytes read and written - on this circuit since the last CIRC_BW event. + on this circuit since the last CIRC_BW event. These bytes have not + necessarily been validated by Tor, and can include invalid cells, + dropped cells, and ignored cells (such as padding cells). - Circuit data falls into two categories: delivered payloads and overhead. + Circuit data that has been validated and processed by Tor is further + broken down into two categories: delivered payloads and overhead. DeliveredBytesRead and DeliveredBytesWritten are the total payloads transmitted since the last CIRC_BW event, whereas OverheadBytesRead and - OverheadBytesWritten are the metadata size used for routing. + OverheadBytesWritten are the extra unused bytes at the end of each + cell in order for it to be the fixed CELL_LEN bytes long. - The sum of DeliveredBytesRead and OverheadBytesRead SHOULD match BytesRead, - and same for their written counterparts. + The sum of DeliveredBytesRead and OverheadBytesRead MUST be less than + or equal to BytesRead, and the same is true for their written + counterparts. This sum represents the total bytes on the circuit that + have been validated by Tor. Subtracting this sum from the BytesRead + (or BytesWritten) value gives the byte count that Tor has decided + to reject due to protocol errors, or has otherwise decided to ignore. The Time field is provided only in versions 0.3.2.1-alpha and later. It records when Tor created the bandwidth event. @@ -2962,8 +2970,8 @@ [First added in 0.2.5.2-alpha] - [DELIVERED_READ, OVERHEAD_READ, DELIVERED_WRITTEN, and OVERHEAD_WRITTEN was - added in Tor 0.3.4.0-alpha] + [DELIVERED_READ, OVERHEAD_READ, DELIVERED_WRITTEN, and OVERHEAD_WRITTEN + were added in Tor 0.3.4.0-alpha] 4.1.23. Per-circuit cell stats

1 0

[torspec/master] fixup! Attempt to clarify new CIRC_BW fields
by nickm＠torproject.org 27 May '18

27 May '18

commit 5a9cd80a98fa7f8379231862e0d1714a0779a960 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 16 05:58:42 2018 +0000 fixup! Attempt to clarify new CIRC_BW fields Also mention that the READ and WRITE fields do not include circuit headers, and the delivered and overhead fields do not include relay cell headers. --- control-spec.txt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index e448918..30160f4 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2945,21 +2945,24 @@ BytesRead and BytesWritten are the number of bytes read and written on this circuit since the last CIRC_BW event. These bytes have not necessarily been validated by Tor, and can include invalid cells, - dropped cells, and ignored cells (such as padding cells). + dropped cells, and ignored cells (such as padding cells). These + values include the relay headers, but not circuit headers. Circuit data that has been validated and processed by Tor is further broken down into two categories: delivered payloads and overhead. - DeliveredBytesRead and DeliveredBytesWritten are the total payloads - transmitted since the last CIRC_BW event, whereas OverheadBytesRead and + DeliveredBytesRead and DeliveredBytesWritten are the total relay cell + payloads transmitted since the last CIRC_BW event, not counting relay + cell headers or circuit headers. OverheadBytesRead and OverheadBytesWritten are the extra unused bytes at the end of each cell in order for it to be the fixed CELL_LEN bytes long. The sum of DeliveredBytesRead and OverheadBytesRead MUST be less than - or equal to BytesRead, and the same is true for their written - counterparts. This sum represents the total bytes on the circuit that - have been validated by Tor. Subtracting this sum from the BytesRead - (or BytesWritten) value gives the byte count that Tor has decided - to reject due to protocol errors, or has otherwise decided to ignore. + BytesRead, and the same is true for their written counterparts. This + sum represents the total relay cell bytes on the circuit that + have been validated by Tor, not counting relay headers and cell headers. + Subtracting this sum (plus relay cell headers) from the BytesRead + (or BytesWritten) value gives the byte count that Tor has decided to + reject due to protocol errors, or has otherwise decided to ignore. The Time field is provided only in versions 0.3.2.1-alpha and later. It records when Tor created the bandwidth event.

1 0

[torspec/master] Merge remote-tracking branch 'mikeperry/ticket26110'
by nickm＠torproject.org 27 May '18

27 May '18

commit 000ce239756182c6e38543c07a45c81001def0c7 Merge: e541f2a 5a9cd80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 27 12:10:22 2018 -0400 Merge remote-tracking branch 'mikeperry/ticket26110' control-spec.txt | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
by nickm＠torproject.org 27 May '18

27 May '18

commit fa1890e97f19a444f8103c1207d7d18c02887b1f Merge: 0ef432d45 0941c8bfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 27 10:03:11 2018 -0400 Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3 changes/bug25691_again | 6 +++++ src/or/circuitbuild.c | 67 ++++++++++++++++++++++++----------------------- src/or/circuituse.c | 4 +-- src/or/control.c | 9 ++++--- src/or/entrynodes.c | 7 ++--- src/or/hs_common.c | 15 ++++++++--- src/or/nodelist.c | 39 ++++++++++++++++++++++++--- src/or/nodelist.h | 4 ++- src/or/rendservice.c | 2 +- src/or/routerlist.c | 6 ++--- src/test/test_hs.c | 1 + src/test/test_hs_common.c | 3 ++- 12 files changed, 108 insertions(+), 55 deletions(-)

1 0

[tor/release-0.3.3] Use node_has_preferred_descriptor() in another case
by nickm＠torproject.org 27 May '18

27 May '18

commit 388d217c40fea4dfd9c2782ae6036126258fc292 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 11:40:14 2018 -0400 Use node_has_preferred_descriptor() in another case In router_add_running_nodes_to_smartlist(), we had an inline implementation of the logic from node_has_descriptor(), which should be changed to node_has_preferred_descriptor(). --- src/or/routerlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index bc3abb236..2ab5017b7 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2335,7 +2335,7 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, int need_uptime, SMARTLIST_FOREACH_BEGIN(nodelist_get_list(), const node_t *, node) { if (!node->is_running || !node->is_valid) continue; - if (need_desc && !(node->ri || (node->rs && node->md))) + if (need_desc && !node_has_preferred_descriptor(node, direct_conn)) continue; if (node->ri && node->ri->purpose != ROUTER_PURPOSE_GENERAL) continue;

1 0

[tor/master] Merge branch 'maint-0.3.3'
by nickm＠torproject.org 27 May '18

27 May '18

commit aff49cc52dfabbd235505e12d507c6faf3262307 Merge: f42739e74 fa1890e97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 27 10:04:42 2018 -0400 Merge branch 'maint-0.3.3'

1 0

[tor/release-0.3.3] Use router_crn_flags in more places, to pass direct-connect flag
by nickm＠torproject.org 27 May '18

27 May '18

commit 7915efd1b83e45c53eb06cfb384eed024df440c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 11:41:45 2018 -0400 Use router_crn_flags in more places, to pass direct-connect flag In order to fix 25691 and 25692, we need to pass the "direct_conn" flag to more places -- particularly when choosing single-hop tunnels. The right way to do this involves having a couple more functions accept router_crn_flags_t, rather than a big list of boolean arguments. This commit also makes sure that choose_good_exit_server_general() honors the direct_conn flag, to fix 25691 and 25692. --- src/or/circuitbuild.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 019b9c51f..96cc8369d 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1827,7 +1827,7 @@ ap_stream_wants_exit_attention(connection_t *conn) * Return NULL if we can't find any suitable routers. */ static const node_t * -choose_good_exit_server_general(int need_uptime, int need_capacity) +choose_good_exit_server_general(router_crn_flags_t flags) { int *n_supported; int n_pending_connections = 0; @@ -1837,6 +1837,9 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) const or_options_t *options = get_options(); const smartlist_t *the_nodes; const node_t *selected_node=NULL; + const int need_uptime = (flags & CRN_NEED_UPTIME) != 0; + const int need_capacity = (flags & CRN_NEED_CAPACITY) != 0; + const int direct_conn = (flags & CRN_DIRECT_CONN) != 0; connections = get_connection_array(); @@ -1869,7 +1872,7 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) */ continue; } - if (!node_has_preferred_descriptor(node, 0)) { + if (!node_has_preferred_descriptor(node, direct_conn)) { n_supported[i] = -1; continue; } @@ -1982,7 +1985,8 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) need_capacity?", fast":"", need_uptime?", stable":""); tor_free(n_supported); - return choose_good_exit_server_general(0, 0); + flags &= ~(CRN_NEED_UPTIME|CRN_NEED_CAPACITY); + return choose_good_exit_server_general(flags); } log_notice(LD_CIRC, "All routers are down or won't exit%s -- " "choosing a doomed exit at random.", @@ -2229,17 +2233,11 @@ pick_restricted_middle_node(router_crn_flags_t flags, * toward the preferences in 'options'. */ static const node_t * -choose_good_exit_server(origin_circuit_t *circ, int need_uptime, - int need_capacity, int is_internal, int need_hs_v3) +choose_good_exit_server(origin_circuit_t *circ, + router_crn_flags_t flags, int is_internal) { const or_options_t *options = get_options(); - router_crn_flags_t flags = CRN_NEED_DESC; - if (need_uptime) - flags |= CRN_NEED_UPTIME; - if (need_capacity) - flags |= CRN_NEED_CAPACITY; - if (need_hs_v3) - flags |= CRN_RENDEZVOUS_V3; + flags |= CRN_NEED_DESC; switch (TO_CIRCUIT(circ)->purpose) { case CIRCUIT_PURPOSE_C_HSDIR_GET: @@ -2253,7 +2251,7 @@ choose_good_exit_server(origin_circuit_t *circ, int need_uptime, if (is_internal) /* pick it like a middle hop */ return router_choose_random_node(NULL, options->ExcludeNodes, flags); else - return choose_good_exit_server_general(need_uptime,need_capacity); + return choose_good_exit_server_general(flags); case CIRCUIT_PURPOSE_C_ESTABLISH_REND: { /* Pick a new RP */ @@ -2378,15 +2376,22 @@ onion_pick_cpath_exit(origin_circuit_t *circ, extend_info_t *exit_ei, extend_info_describe(exit_ei)); exit_ei = extend_info_dup(exit_ei); } else { /* we have to decide one */ + router_crn_flags_t flags = CRN_NEED_DESC; + if (state->need_uptime) + flags |= CRN_NEED_UPTIME; + if (state->need_capacity) + flags |= CRN_NEED_CAPACITY; + if (is_hs_v3_rp_circuit) + flags |= CRN_RENDEZVOUS_V3; + if (state->onehop_tunnel) + flags |= CRN_DIRECT_CONN; const node_t *node = - choose_good_exit_server(circ, state->need_uptime, - state->need_capacity, state->is_internal, - is_hs_v3_rp_circuit); + choose_good_exit_server(circ, flags, state->is_internal); if (!node) { log_warn(LD_CIRC,"Failed to choose an exit server"); return -1; } - exit_ei = extend_info_from_node(node, 0); + exit_ei = extend_info_from_node(node, state->onehop_tunnel); if (BUG(exit_ei == NULL)) return -1; }

1 0

[tor/release-0.3.3] Check for "the right descriptor", not just "any descriptor".
by nickm＠torproject.org 27 May '18

27 May '18

commit 948dd2c79ea9ca1fd06c13f275515a1745c46986 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 16 10:38:55 2018 -0400 Check for "the right descriptor", not just "any descriptor". This patch adds a new node_has_preferred_descriptor() function, and replaces most users of node_has_descriptor() with it. That's an important change, since as of d1874b433953f64 (our fix for #25213), we are willing to say that a node has _some_ descriptor, but not the _right_ descriptor for a particular use case. Part of a fix for 25691 and 25692. --- src/or/circuitbuild.c | 28 ++++++++++++---------------- src/or/circuituse.c | 4 ++-- src/or/entrynodes.c | 7 ++++--- src/or/hs_common.c | 15 +++++++++++---- src/or/nodelist.c | 30 +++++++++++++++++++++++++++++- src/or/nodelist.h | 2 ++ src/or/rendservice.c | 2 +- 7 files changed, 61 insertions(+), 27 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5f1f8122f..019b9c51f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -417,7 +417,7 @@ onion_populate_cpath(origin_circuit_t *circ) circ->cpath->extend_info->identity_digest); /* If we don't know the node and its descriptor, we must be bootstrapping. */ - if (!node || !node_has_descriptor(node)) { + if (!node || !node_has_preferred_descriptor(node, 1)) { return 0; } } @@ -1869,7 +1869,7 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) */ continue; } - if (!node_has_descriptor(node)) { + if (!node_has_preferred_descriptor(node, 0)) { n_supported[i] = -1; continue; } @@ -2443,6 +2443,10 @@ circuit_extend_to_new_exit(origin_circuit_t *circ, extend_info_t *exit_ei) /** Return the number of routers in routers that are currently up * and available for building circuits through. + * + * (Note that this function may overcount or undercount, if we have + * descriptors that are not the type we would prefer to use for some + * particular router. See bug #25885.) */ MOCK_IMPL(STATIC int, count_acceptable_nodes, (smartlist_t *nodes)) @@ -2847,9 +2851,10 @@ extend_info_new(const char *nickname, * of the node (i.e. its IPv4 address) unless * for_direct_connect is true, in which case the preferred * address is used instead. May return NULL if there is not enough - * info about node to extend to it--for example, if there is no - * routerinfo_t or microdesc_t, or if for_direct_connect is true and none of - * the node's addresses are allowed by tor's firewall and IP version config. + * info about node to extend to it--for example, if the preferred + * routerinfo_t or microdesc_t is missing, or if for_direct_connect is + * true and none of the node's addresses is allowed by tor's firewall + * and IP version config. **/ extend_info_t * extend_info_from_node(const node_t *node, int for_direct_connect) @@ -2857,17 +2862,8 @@ extend_info_from_node(const node_t *node, int for_direct_connect) tor_addr_port_t ap; int valid_addr = 0; - const int is_bridge = node_is_a_configured_bridge(node); - const int we_use_mds = we_use_microdescriptors_for_circuits(get_options()); - - if ((is_bridge && for_direct_connect) || !we_use_mds) { - /* We need an ri in this case. */ - if (!node->ri) - return NULL; - } else { - /* Otherwise we need an md. */ - if (node->rs == NULL || node->md == NULL) - return NULL; + if (!node_has_preferred_descriptor(node, for_direct_connect)) { + return NULL; } /* Choose a preferred address first, but fall back to an allowed address. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 3125fff65..5d8af4c6c 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2384,7 +2384,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, const node_t *r; int opt = conn->chosen_exit_optional; r = node_get_by_nickname(conn->chosen_exit_name, 0); - if (r && node_has_descriptor(r)) { + if (r && node_has_preferred_descriptor(r, conn->want_onehop ? 1 : 0)) { /* We might want to connect to an IPv6 bridge for loading descriptors so we use the preferred address rather than the primary. */ @@ -2394,7 +2394,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, "Discarding this circuit.", conn->chosen_exit_name); return -1; } - } else { /* ! (r && node_has_descriptor(r)) */ + } else { /* ! (r && node_has_preferred_descriptor(...)) */ log_debug(LD_DIR, "considering %d, %s", want_onehop, conn->chosen_exit_name); if (want_onehop && conn->chosen_exit_name[0] == '$') { diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 2b6ff38c9..54638810f 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -185,14 +185,14 @@ should_apply_guardfraction(const networkstatus_t *ns) return options->UseGuardFraction; } -/** Return true iff we know a descriptor for guard */ +/** Return true iff we know a preferred descriptor for guard */ static int guard_has_descriptor(const entry_guard_t *guard) { const node_t *node = node_get_by_id(guard->identity); if (!node) return 0; - return node_has_descriptor(node); + return node_has_preferred_descriptor(node, 1); } /** @@ -2269,7 +2269,8 @@ entry_guard_pick_for_circuit(guard_selection_t *gs, // XXXX #20827 check Ed ID. if (! node) goto fail; - if (BUG(usage != GUARD_USAGE_DIRGUARD && !node_has_descriptor(node))) + if (BUG(usage != GUARD_USAGE_DIRGUARD && + !node_has_preferred_descriptor(node, 1))) goto fail; *chosen_node_out = node; diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 6d97c8775..10b56c0ba 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -1280,8 +1280,10 @@ node_has_hsdir_index(const node_t *node) tor_assert(node_supports_v3_hsdir(node)); /* A node can't have an HSDir index without a descriptor since we need desc - * to get its ed25519 key */ - if (!node_has_descriptor(node)) { + * to get its ed25519 key. for_direct_connect should be zero, since we + * always use the consensus-indexed node's keys to build the hash ring, even + * if some of the consensus-indexed nodes are also bridges. */ + if (!node_has_preferred_descriptor(node, 0)) { return 0; } @@ -1612,12 +1614,17 @@ hs_pick_hsdir(smartlist_t *responsible_dirs, const char *req_key_str) hs_clean_last_hid_serv_requests(now); /* Only select those hidden service directories to which we did not send a - * request recently and for which we have a router descriptor here. */ + * request recently and for which we have a router descriptor here. + * + * Use for_direct_connect==0 even if we will be connecting to the node + * directly, since we always use the key information in the + * consensus-indexed node descriptors for building the index. + **/ SMARTLIST_FOREACH_BEGIN(responsible_dirs, routerstatus_t *, dir) { time_t last = hs_lookup_last_hid_serv_request(dir, req_key_str, 0, 0); const node_t *node = node_get_by_id(dir->identity_digest); if (last + hs_hsdir_requery_period(options) >= now || - !node || !node_has_descriptor(node)) { + !node || !node_has_preferred_descriptor(node, 0)) { SMARTLIST_DEL_CURRENT(responsible_dirs, dir); continue; } diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 3a26aee61..2962d3cb4 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -43,6 +43,7 @@ #include "or.h" #include "address.h" #include "address_set.h" +#include "bridges.h" #include "config.h" #include "control.h" #include "dirserv.h" @@ -1139,6 +1140,32 @@ node_has_descriptor(const node_t *node) (node->rs && node->md)); } +/** Return true iff node has the kind of descriptor we would prefer to + * use for it, given our configuration and how we intend to use the node. + * + * If for_direct_connect is true, we intend to connect to the node + * directly, as the first hop of a circuit; otherwise, we intend to connect to + * it indirectly, or use it as if we were connecting to it indirectly. */ +int +node_has_preferred_descriptor(const node_t *node, + int for_direct_connect) +{ + const int is_bridge = node_is_a_configured_bridge(node); + const int we_use_mds = we_use_microdescriptors_for_circuits(get_options()); + + if ((is_bridge && for_direct_connect) || !we_use_mds) { + /* We need an ri in this case. */ + if (!node->ri) + return 0; + } else { + /* Otherwise we need an rs and an md. */ + if (node->rs == NULL || node->md == NULL) + return 0; + } + + return 1; +} + /** Return the router_purpose of node. */ int node_get_purpose(const node_t *node) @@ -2221,7 +2248,8 @@ compute_frac_paths_available(const networkstatus_t *consensus, nu); SMARTLIST_FOREACH_BEGIN(myexits_unflagged, const node_t *, node) { - if (node_has_descriptor(node) && node_exit_policy_rejects_all(node)) { + if (node_has_preferred_descriptor(node, 0) && + node_exit_policy_rejects_all(node)) { SMARTLIST_DEL_CURRENT(myexits_unflagged, node); /* this node is not actually an exit */ np--; diff --git a/src/or/nodelist.h b/src/or/nodelist.h index 043d7b341..5e7254f60 100644 --- a/src/or/nodelist.h +++ b/src/or/nodelist.h @@ -47,6 +47,8 @@ void node_get_verbose_nickname_by_id(const char *id_digest, char *verbose_name_out); int node_is_dir(const node_t *node); int node_has_descriptor(const node_t *node); +int node_has_preferred_descriptor(const node_t *node, + int for_direct_connect); int node_get_purpose(const node_t *node); #define node_is_bridge(node) \ (node_get_purpose((node)) == ROUTER_PURPOSE_BRIDGE) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index cc2242977..1a93c3643 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3596,7 +3596,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc, /* Don't upload descriptor if we succeeded in doing so last time. */ continue; node = node_get_by_id(hs_dir->identity_digest); - if (!node || !node_has_descriptor(node)) { + if (!node || !node_has_preferred_descriptor(node,0)) { log_info(LD_REND, "Not launching upload for for v2 descriptor to " "hidden service directory %s; we don't have its " "router descriptor. Queuing for later upload.",

1 0