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

[tor/master] Implement proposal-214 rules for CircID checking.
by nickm＠torproject.org 15 Feb '13

15 Feb '13

commit 8e8c0674c4729a6aa39ded658e800baa654fe289 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 6 21:33:53 2012 -0500 Implement proposal-214 rules for CircID checking. --- src/or/channel.c | 14 ++++++++++++-- src/or/channel.h | 3 ++- src/or/channeltls.c | 9 ++++++--- src/or/connection_or.c | 3 ++- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index cbf7f99..9b353a1 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -4043,9 +4043,10 @@ channel_num_circuits(channel_t *chan) * This is called when setting up a channel and replaces the old * connection_or_set_circid_type() */ - void -channel_set_circid_type(channel_t *chan, crypto_pk_t *identity_rcvd) +channel_set_circid_type(channel_t *chan, + crypto_pk_t *identity_rcvd, + int consider_identity) { int started_here; crypto_pk_t *our_identity; @@ -4053,6 +4054,15 @@ channel_set_circid_type(channel_t *chan, crypto_pk_t *identity_rcvd) tor_assert(chan); started_here = channel_is_outgoing(chan); + + if (! consider_identity) { + if (started_here) + chan->circ_id_type = CIRC_ID_TYPE_HIGHER; + else + chan->circ_id_type = CIRC_ID_TYPE_LOWER; + return; + } + our_identity = started_here ? get_tlsclient_identity_key() : get_server_identity_key(); diff --git a/src/or/channel.h b/src/or/channel.h index 3cfc8b1..a21271c 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -449,7 +449,8 @@ int channel_matches_extend_info(channel_t *chan, extend_info_t *extend_info); int channel_matches_target_addr_for_extend(channel_t *chan, const tor_addr_t *target); unsigned int channel_num_circuits(channel_t *chan); -void channel_set_circid_type(channel_t *chan, crypto_pk_t *identity_rcvd); +void channel_set_circid_type(channel_t *chan, crypto_pk_t *identity_rcvd, + int consider_identity); void channel_timestamp_client(channel_t *chan); const char * channel_listener_describe_transport(channel_listener_t *chan_l); diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 4f87eb5..ed56e1a 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1384,7 +1384,8 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) tor_assert(tor_digest_is_zero( (const char*)(chan->conn->handshake_state-> authenticated_peer_id))); - channel_set_circid_type(TLS_CHAN_TO_BASE(chan), NULL); + channel_set_circid_type(TLS_CHAN_TO_BASE(chan), NULL, + chan->conn->link_proto < MIN_LINK_PROTO_FOR_WIDE_CIRC_IDS); connection_or_init_conn_from_address(chan->conn, &(chan->conn->base_.addr), @@ -1638,7 +1639,8 @@ channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) ERR("Internal error: Couldn't get RSA key from ID cert."); memcpy(chan->conn->handshake_state->authenticated_peer_id, id_digests->d[DIGEST_SHA1], DIGEST_LEN); - channel_set_circid_type(TLS_CHAN_TO_BASE(chan), identity_rcvd); + channel_set_circid_type(TLS_CHAN_TO_BASE(chan), identity_rcvd, + chan->conn->link_proto < MIN_LINK_PROTO_FOR_WIDE_CIRC_IDS); crypto_pk_free(identity_rcvd); } @@ -1922,7 +1924,8 @@ channel_tls_process_authenticate_cell(var_cell_t *cell, channel_tls_t *chan) memcpy(chan->conn->handshake_state->authenticated_peer_id, id_digests->d[DIGEST_SHA1], DIGEST_LEN); - channel_set_circid_type(TLS_CHAN_TO_BASE(chan), identity_rcvd); + channel_set_circid_type(TLS_CHAN_TO_BASE(chan), identity_rcvd, + chan->conn->link_proto < MIN_LINK_PROTO_FOR_WIDE_CIRC_IDS); crypto_pk_free(identity_rcvd); connection_or_init_conn_from_address(chan->conn, diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 0775eb5..63bdd9a 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1554,7 +1554,8 @@ connection_or_check_valid_tls_handshake(or_connection_t *conn, } tor_assert(conn->chan); - channel_set_circid_type(TLS_CHAN_TO_BASE(conn->chan), identity_rcvd); + channel_set_circid_type(TLS_CHAN_TO_BASE(conn->chan), identity_rcvd, 1); + crypto_pk_free(identity_rcvd); if (started_here)

1 0

[tor/master] Merge remote-tracking branch 'public/wide_circ_ids'
by nickm＠torproject.org 15 Feb '13

15 Feb '13

commit d6634001c9063323643e3ddfe8905c250a6d60d7 Merge: 5fcc5df 076654c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 15 16:23:43 2013 -0500 Merge remote-tracking branch 'public/wide_circ_ids' Conflicts: src/or/channel.h src/or/connection_or.c src/or/cpuworker.c src/or/buffers.c | 42 ++++++++++++------- src/or/channel.c | 14 +++++- src/or/channel.h | 5 ++- src/or/channeltls.c | 29 ++++++++++---- src/or/circuitbuild.c | 12 +++--- src/or/circuitlist.c | 2 +- src/or/command.c | 5 ++- src/or/connection.c | 8 ++-- src/or/connection_or.c | 105 +++++++++++++++++++++++++++++++---------------- src/or/connection_or.h | 14 +++++-- src/or/cpuworker.c | 6 +- src/or/or.h | 33 ++++++++++++--- src/or/relay.c | 11 +++-- src/or/relay.h | 3 +- src/or/router.c | 3 +- 15 files changed, 197 insertions(+), 95 deletions(-) diff --cc src/or/channel.h index ec79888,a21271c..0933ec8 --- a/src/or/channel.h +++ b/src/or/channel.h @@@ -142,7 -142,9 +142,9 @@@ struct channel_s * When we send CREATE cells along this connection, which half of the * space should we use? */ - circ_id_type_t circ_id_type:2; + ENUM_BF(circ_id_type_t) circ_id_type:2; + /** DOCDOC*/ + unsigned wide_circ_ids:1; /* * Which circ_id do we try to use next on this connection? This is * always in the range 0..1<<15-1. diff --cc src/or/command.c index 09313b4,4007cd6..dfe4f65 --- a/src/or/command.c +++ b/src/or/command.c @@@ -221,17 -218,12 +221,20 @@@ command_process_create_cell(cell_t *cel return; } + if (cell->circ_id == 0) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Received a create cell (type %d) from %s with zero circID; " + " ignoring.", (int)cell->command, + channel_get_actual_remote_descr(chan)); + return; + } + /* If the high bit of the circuit ID is not as expected, close the * circ. */ - id_is_high = cell->circ_id & (1<<15); + if (chan->wide_circ_ids) + id_is_high = cell->circ_id & (1u<<31); + else + id_is_high = cell->circ_id & (1u<<15); if ((id_is_high && chan->circ_id_type == CIRC_ID_TYPE_HIGHER) || (!id_is_high && diff --cc src/or/connection_or.c index 5ec32d6,4da4367..c4415c5 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@@ -1764,9 -1785,9 +1791,9 @@@ or_handshake_state_record_cell(or_conne d = *dptr; /* Re-packing like this is a little inefficient, but we don't have to do this very often at all. */ - cell_pack(&packed, cell); - crypto_digest_add_bytes(d, packed.body, sizeof(packed.body)); + cell_pack(&packed, cell, conn->wide_circ_ids); + crypto_digest_add_bytes(d, packed.body, cell_network_size); - memset(&packed, 0, sizeof(packed)); + memwipe(&packed, 0, sizeof(packed)); } /** Remember that a variable-length cell has been transmitted (if @@@ -1797,11 -1820,11 +1826,11 @@@ or_handshake_state_record_var_cell(or_c d = *dptr; - var_cell_pack_header(cell, buf); - crypto_digest_add_bytes(d, buf, sizeof(buf)); + n = var_cell_pack_header(cell, buf, conn->wide_circ_ids); + crypto_digest_add_bytes(d, buf, n); crypto_digest_add_bytes(d, (const char *)cell->payload, cell->payload_len); - memset(buf, 0, sizeof(buf)); + memwipe(buf, 0, sizeof(buf)); } /** Set conn's state to OR_CONN_STATE_OPEN, and tell other subsystems diff --cc src/or/cpuworker.c index 444f17c,a25a8a7..af5f91a --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@@ -31,7 -31,10 +31,7 @@@ #define MIN_CPUWORKERS 1 /** The tag specifies which circuit this onionskin was from. */ - #define TAG_LEN 10 + #define TAG_LEN 12 -/** How many bytes are sent from the cpuworker back to tor? */ -#define LEN_ONION_RESPONSE \ - (1+TAG_LEN+ONIONSKIN_REPLY_LEN+CPATH_KEY_MATERIAL_LEN) /** How many cpuworkers we have running right now. */ static int num_cpuworkers=0; @@@ -78,69 -81,12 +78,69 @@@ tag_pack(uint8_t *tag, uint64_t chan_id /** Unpack tag into addr, port, and circ_id. */ static void -tag_unpack(const char *tag, uint64_t *chan_id, circid_t *circ_id) +tag_unpack(const uint8_t *tag, uint64_t *chan_id, circid_t *circ_id) { *chan_id = get_uint64(tag); - *circ_id = get_uint16(tag+8); + *circ_id = get_uint32(tag+8); } +/** Magic numbers to make sure our cpuworker_requests don't grow any + * mis-framing bugs. */ +#define CPUWORKER_REQUEST_MAGIC 0xda4afeed +#define CPUWORKER_REPLY_MAGIC 0x5eedf00d + +/** A request sent to a cpuworker. */ +typedef struct cpuworker_request_t { + /** Magic number; must be CPUWORKER_REQUEST_MAGIC. */ + uint32_t magic; + /** Opaque tag to identify the job */ + uint8_t tag[TAG_LEN]; + /** Task code. Must be one of CPUWORKER_TASK_* */ + uint8_t task; + + /** Flag: Are we timing this request? */ + unsigned timed : 1; + /** If we're timing this request, when was it sent to the cpuworker? */ + struct timeval started_at; + + /** A create cell for the cpuworker to process. */ + create_cell_t create_cell; + + /* Turn the above into a tagged union if needed. */ +} cpuworker_request_t; + +/** A reply sent by a cpuworker. */ +typedef struct cpuworker_reply_t { + /** Magic number; must be CPUWORKER_REPLY_MAGIC. */ + uint32_t magic; + /** Opaque tag to identify the job; matches the request's tag.*/ + uint8_t tag[TAG_LEN]; + /** True iff we got a successful request. */ + uint8_t success; + + /** Are we timing this request? */ + unsigned int timed : 1; + /** What handshake type was the request? (Used for timing) */ + uint16_t handshake_type; + /** When did we send the request to the cpuworker? */ + struct timeval started_at; + /** Once the cpuworker received the request, how many microseconds did it + * take? (This shouldn't overflow; 4 billion micoseconds is over an hour, + * and we'll never have an onion handshake that takes so long.) */ + uint32_t n_usec; + + /** Output of processing a create cell + * + * @{ + */ + /** The created cell to send back. */ + created_cell_t created_cell; + /** The keys to use on this circuit. */ + uint8_t keys[CPATH_KEY_MATERIAL_LEN]; + /** Input to use for authenticating introduce1 cells. */ + uint8_t rend_auth_material[DIGEST_LEN]; +} cpuworker_reply_t; + /** Called when the onion key has changed and we need to spawn new * cpuworkers. Close all currently idle cpuworkers, and mark the last * rotation time as now.

1 0

[tor/master] make check-spaces
by nickm＠torproject.org 15 Feb '13

15 Feb '13

commit 5fcc5dfa779fcdc84cb7249749b7fbb782f15a10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 15 16:02:57 2013 -0500 make check-spaces --- src/or/config.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index a11c44b..f888426 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1895,7 +1895,8 @@ list_torrc_options(void) static uint32_t last_resolved_addr = 0; /** Accessor for last_resolved_addr from outside this file. */ -uint32_t get_last_resolved_addr(void) +uint32_t +get_last_resolved_addr(void) { return last_resolved_addr; }

1 0

[tor/master] use microdescriptors if *any* of our bridges can handle them
by nickm＠torproject.org 15 Feb '13

15 Feb '13

commit a8297cdbd3324ac707165ae9922ecf478c4608a1 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jan 25 20:18:51 2012 -0500 use microdescriptors if *any* of our bridges can handle them Now as we move into a future where most bridges can handle microdescs we will generally find ourselves using them, rather than holding back just because one of our bridges doesn't use them. --- changes/feature4994 | 7 +++++ src/or/circuitbuild.c | 3 +- src/or/directory.c | 12 +++++---- src/or/entrynodes.c | 59 ++++++++++++++++++++++++++++++++---------------- src/or/entrynodes.h | 5 ++- src/or/microdesc.c | 4 +- 6 files changed, 60 insertions(+), 30 deletions(-) diff --git a/changes/feature4994 b/changes/feature4994 new file mode 100644 index 0000000..4fa0e03 --- /dev/null +++ b/changes/feature4994 @@ -0,0 +1,7 @@ + o Minor features: + - Teach bridge-using clients to avoid 0.2.2 bridges when making + microdescriptor-related dir requests, and only fall back to normal + descriptors if none of their bridges can handle microdescriptors + (as opposed to the fix in ticket 4013, which caused them to fall + back to normal descriptors if *any* of their bridges preferred + them). Resolves ticket 4994. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5a5a3af..8c86aac 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -25,6 +25,7 @@ #include "directory.h" #include "entrynodes.h" #include "main.h" +#include "microdesc.h" #include "networkstatus.h" #include "nodelist.h" #include "onion.h" @@ -3372,7 +3373,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) (purpose != CIRCUIT_PURPOSE_TESTING || options->BridgeRelay)) { /* This request is for an entry server to use for a regular circuit, * and we use entry guard nodes. Just return one of the guard nodes. */ - return choose_random_entry(state); + return choose_random_entry(state, 0); } excluded = smartlist_new(); diff --git a/src/or/directory.c b/src/or/directory.c index c101418..c1bbe6b 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -472,12 +472,14 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, if (options->UseBridges && type != BRIDGE_DIRINFO) { /* We want to ask a running bridge for which we have a descriptor. * - * Be careful here: we should only ask questions that we know our - * bridges can answer. So far we're solving that by backing off to - * the behavior supported by our oldest bridge; see for example - * any_bridges_dont_support_microdescriptors(). + * When we ask choose_random_entry() for a bridge, we specify that + * we're going to be using it for a dir fetch: if any of our bridges + * can handle microdescriptor questions, we'll get one of the ones + * that can. */ - const node_t *node = choose_random_entry(NULL); + /* XXX024 Not all bridges handle conditional consensus downloading, + * so, for now, never assume the server supports that. -PP */ + const node_t *node = choose_random_entry(NULL, 1); if (node && node->ri) { /* every bridge has a routerinfo. */ tor_addr_t addr; diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 4ca56cb..d029d85 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -23,6 +23,7 @@ #include "directory.h" #include "entrynodes.h" #include "main.h" +#include "microdesc.h" #include "nodelist.h" #include "policies.h" #include "router.h" @@ -63,7 +64,8 @@ static int entry_guards_dirty = 0; static void bridge_free(bridge_info_t *bridge); static const node_t *choose_random_entry_impl(cpath_build_state_t *state, int for_directory, - dirinfo_type_t dirtype); + dirinfo_type_t dirtype, + int prefer_microdescs); /** Return the list of entry guards, creating it if necessary. */ const smartlist_t * @@ -829,15 +831,33 @@ entry_list_is_constrained(const or_options_t *options) return 0; } +/** Return true iff this node can answer directory questions about + * microdescriptors. */ +static int +node_understands_microdescriptors(const node_t *node) +{ + tor_assert(node); + if (node->rs && node->rs->version_supports_microdesc_cache) + return 1; + if (node->ri && tor_version_supports_microdescriptors(node->ri->platform)) + return 1; + return 0; +} + /** Pick a live (up and listed) entry guard from entry_guards. If * state is non-NULL, this is for a specific circuit -- * make sure not to pick this circuit's exit or any node in the * exit's family. If state is NULL, we're looking for a random - * guard (likely a bridge). */ + * guard (likely a bridge). + * + * If the prefer_microdescs flag is set, we are looking for a bridge to + * use for directory fetching and pick a bridge that supports microdescriptors + * if we know any that do so. + */ const node_t * -choose_random_entry(cpath_build_state_t *state) +choose_random_entry(cpath_build_state_t *state, int prefer_microdescs) { - return choose_random_entry_impl(state, 0, 0); + return choose_random_entry_impl(state, 0, 0, prefer_microdescs); } /** Pick a live (up and listed) directory guard from entry_guards for @@ -845,13 +865,13 @@ choose_random_entry(cpath_build_state_t *state) const node_t * choose_random_dirguard(dirinfo_type_t type) { - return choose_random_entry_impl(NULL, 1, type); + return choose_random_entry_impl(NULL, 1, type, 0); } /** 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) + dirinfo_type_t dirinfo_type, int prefer_microdescs) { const or_options_t *options = get_options(); smartlist_t *live_entry_guards = smartlist_new(); @@ -903,6 +923,10 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, continue; /* don't pick the same node for entry and exit */ if (consider_exit_family && smartlist_contains(exit_family, node)) continue; /* avoid relays that are family members of our exit */ + if (prefer_microdescs && + we_use_microdescriptors_for_circuits(options) && + !node_understands_microdescriptors(node)) + continue; /* this node won't be able to answer our dir questions */ #if 0 /* since EntryNodes is always strict now, this clause is moot */ if (options->EntryNodes && !routerset_contains_node(options->EntryNodes, node)) { @@ -1982,7 +2006,7 @@ int any_bridge_descriptors_known(void) { tor_assert(get_options()->UseBridges); - return choose_random_entry(NULL)!=NULL ? 1 : 0; + return choose_random_entry(NULL, 0)!=NULL ? 1 : 0; } /** Return 1 if there are any directory conns fetching bridge descriptors @@ -2064,29 +2088,24 @@ entries_retry_all(const or_options_t *options) entries_retry_helper(options, 1); } -/** Return true if we've ever had a bridge running a Tor version that can't - * provide microdescriptors to us. In that case fall back to asking for - * full descriptors. Eventually all bridges will support microdescriptors - * and we can take this check out; see bug 4013. */ +/** Return true if at least one of our bridges runs a Tor version that can + * provide microdescriptors to us. If not, we'll fall back to asking for + * full descriptors. */ int -any_bridges_dont_support_microdescriptors(void) +any_bridge_supports_microdescriptors(void) { const node_t *node; - static int ever_answered_yes = 0; if (!get_options()->UseBridges || !entry_guards) return 0; - if (ever_answered_yes) - return 1; /* if we ever answer 'yes', always answer 'yes' */ SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, e) { node = node_get_by_id(e->identity); - if (node && node->ri && + if (node && node->is_running && node_is_bridge(node) && node_is_a_configured_bridge(node) && - !tor_version_supports_microdescriptors(node->ri->platform)) { + node_understands_microdescriptors(node)) { /* This is one of our current bridges, and we know enough about - * it to know that it won't be able to answer our microdescriptor + * it to know that it will be able to answer our microdescriptor * questions. */ - ever_answered_yes = 1; - return 1; + return 1; } } SMARTLIST_FOREACH_END(e); return 0; diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index e6c973c..8ed429c 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -78,7 +78,8 @@ int entry_guard_register_connect_status(const char *digest, int succeeded, int mark_relay_status, time_t now); void entry_nodes_should_be_added(void); int entry_list_is_constrained(const or_options_t *options); -const node_t *choose_random_entry(cpath_build_state_t *state); +const node_t *choose_random_entry(cpath_build_state_t *state, + int prefer_microdescs); const node_t *choose_random_dirguard(dirinfo_type_t t); int entry_guards_parse_state(or_state_t *state, int set, char **msg); void entry_guards_update_state(or_state_t *state); @@ -104,7 +105,7 @@ int any_pending_bridge_descriptor_fetches(void); int entries_known_but_down(const or_options_t *options); void entries_retry_all(const or_options_t *options); -int any_bridges_dont_support_microdescriptors(void); +int any_bridge_supports_microdescriptors(void); void entry_guards_free_all(void); diff --git a/src/or/microdesc.c b/src/or/microdesc.c index e99b3eb..ac48930 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -730,9 +730,9 @@ we_use_microdescriptors_for_circuits(const or_options_t *options) int ret = options->UseMicrodescriptors; if (ret == -1) { /* UseMicrodescriptors is "auto"; we need to decide: */ - /* If we are configured to use bridges and one of our bridges doesn't + /* If we are configured to use bridges and none of our bridges * know what a microdescriptor is, the answer is no. */ - if (options->UseBridges && any_bridges_dont_support_microdescriptors()) + if (options->UseBridges && !any_bridge_supports_microdescriptors()) return 0; /* Otherwise, we decide that we'll use microdescriptors iff we are * not a server, and we're not autofetching everything. */

1 0

[tor/master] generalize choose_random_entry()'s dirinfo parameter
by nickm＠torproject.org 15 Feb '13

15 Feb '13

commit bce5019eff37fc741747ef76c5d0a387569f9265 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Jan 25 20:49:32 2012 -0500 generalize choose_random_entry()'s dirinfo parameter Now we can specify to skip bridges that wouldn't be able to answer the type of dir fetch we're launching. It's still the responsibility of the rest of the code to prevent us from launching a given dir fetch if we have no bridges that could handle it. --- src/or/circuitbuild.c | 2 +- src/or/directory.c | 9 ++++----- src/or/entrynodes.c | 38 ++++++++++++++++++++++---------------- src/or/entrynodes.h | 2 +- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 8c86aac..cea1cbd 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3373,7 +3373,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) (purpose != CIRCUIT_PURPOSE_TESTING || options->BridgeRelay)) { /* This request is for an entry server to use for a regular circuit, * and we use entry guard nodes. Just return one of the guard nodes. */ - return choose_random_entry(state, 0); + return choose_random_entry(state, NO_DIRINFO); } excluded = smartlist_new(); diff --git a/src/or/directory.c b/src/or/directory.c index c1bbe6b..a1ac2ad 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -472,14 +472,13 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, if (options->UseBridges && type != BRIDGE_DIRINFO) { /* We want to ask a running bridge for which we have a descriptor. * - * When we ask choose_random_entry() for a bridge, we specify that - * we're going to be using it for a dir fetch: if any of our bridges - * can handle microdescriptor questions, we'll get one of the ones - * that can. + * When we ask choose_random_entry() for a bridge, we specify what + * sort of dir fetch we'll be doing, so it won't return a bridge + * that can't answer our question. */ /* XXX024 Not all bridges handle conditional consensus downloading, * so, for now, never assume the server supports that. -PP */ - const node_t *node = choose_random_entry(NULL, 1); + const node_t *node = choose_random_entry(NULL, type); if (node && node->ri) { /* every bridge has a routerinfo. */ tor_addr_t addr; diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index d029d85..dab081d 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -64,8 +64,7 @@ static int entry_guards_dirty = 0; static void bridge_free(bridge_info_t *bridge); static const node_t *choose_random_entry_impl(cpath_build_state_t *state, int for_directory, - dirinfo_type_t dirtype, - int prefer_microdescs); + dirinfo_type_t dirtype); /** Return the list of entry guards, creating it if necessary. */ const smartlist_t * @@ -844,20 +843,28 @@ node_understands_microdescriptors(const node_t *node) return 0; } +/** Return true iff node is able to answer directory questions + * of type dirinfo. */ +static int +node_can_handle_dirinfo(const node_t *node, dirinfo_type_t dirinfo) +{ + if ((dirinfo & MICRODESC_DIRINFO) && + !node_understands_microdescriptors(node)) + return 0; + return 1; +} + /** Pick a live (up and listed) entry guard from entry_guards. If * state is non-NULL, this is for a specific circuit -- * make sure not to pick this circuit's exit or any node in the * exit's family. If state is NULL, we're looking for a random - * guard (likely a bridge). - * - * If the prefer_microdescs flag is set, we are looking for a bridge to - * use for directory fetching and pick a bridge that supports microdescriptors - * if we know any that do so. - */ + * guard (likely a bridge). If dirinfo is not NO_DIRINFO, then + * only select from nodes that know how to answer directory questions + * of that type. */ const node_t * -choose_random_entry(cpath_build_state_t *state, int prefer_microdescs) +choose_random_entry(cpath_build_state_t *state, dirinfo_type_t dirinfo) { - return choose_random_entry_impl(state, 0, 0, prefer_microdescs); + return choose_random_entry_impl(state, 0, dirinfo); } /** Pick a live (up and listed) directory guard from entry_guards for @@ -865,13 +872,13 @@ choose_random_entry(cpath_build_state_t *state, int prefer_microdescs) const node_t * choose_random_dirguard(dirinfo_type_t type) { - return choose_random_entry_impl(NULL, 1, type, 0); + return choose_random_entry_impl(NULL, 1, type); } /** 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 prefer_microdescs) + dirinfo_type_t dirinfo_type) { const or_options_t *options = get_options(); smartlist_t *live_entry_guards = smartlist_new(); @@ -923,9 +930,8 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, continue; /* don't pick the same node for entry and exit */ if (consider_exit_family && smartlist_contains(exit_family, node)) continue; /* avoid relays that are family members of our exit */ - if (prefer_microdescs && - we_use_microdescriptors_for_circuits(options) && - !node_understands_microdescriptors(node)) + if (dirinfo_type != NO_DIRINFO && + !node_can_handle_dirinfo(node, dirinfo_type)) continue; /* this node won't be able to answer our dir questions */ #if 0 /* since EntryNodes is always strict now, this clause is moot */ if (options->EntryNodes && @@ -2006,7 +2012,7 @@ int any_bridge_descriptors_known(void) { tor_assert(get_options()->UseBridges); - return choose_random_entry(NULL, 0)!=NULL ? 1 : 0; + return choose_random_entry(NULL, NO_DIRINFO)!=NULL ? 1 : 0; } /** Return 1 if there are any directory conns fetching bridge descriptors diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 8ed429c..235ef4b 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -79,7 +79,7 @@ int entry_guard_register_connect_status(const char *digest, int succeeded, void entry_nodes_should_be_added(void); int entry_list_is_constrained(const or_options_t *options); const node_t *choose_random_entry(cpath_build_state_t *state, - int prefer_microdescs); + dirinfo_type_t dirinfo); const node_t *choose_random_dirguard(dirinfo_type_t t); int entry_guards_parse_state(or_state_t *state, int set, char **msg); void entry_guards_update_state(or_state_t *state);

1 0

[tor/master] Restore the entry/dirguard distinction.
by nickm＠torproject.org 15 Feb '13

15 Feb '13

commit d7089ff228227259137b5a8bc32d0764a0ad4155 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 12 16:23:12 2013 -0500 Restore the entry/dirguard distinction. We shouldn't be calling choose_random_entry() for directory conncetions; that's what choose_random_dirguard() is for. --- src/or/circuitbuild.c | 2 +- src/or/directory.c | 2 +- src/or/entrynodes.c | 20 +++++++++++--------- src/or/entrynodes.h | 3 +-- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cea1cbd..753eaf8 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3373,7 +3373,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) (purpose != CIRCUIT_PURPOSE_TESTING || options->BridgeRelay)) { /* This request is for an entry server to use for a regular circuit, * and we use entry guard nodes. Just return one of the guard nodes. */ - return choose_random_entry(state, NO_DIRINFO); + return choose_random_entry(state); } excluded = smartlist_new(); diff --git a/src/or/directory.c b/src/or/directory.c index a1ac2ad..6b61fc6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -478,7 +478,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, */ /* XXX024 Not all bridges handle conditional consensus downloading, * so, for now, never assume the server supports that. -PP */ - const node_t *node = choose_random_entry(NULL, type); + const node_t *node = choose_random_dirguard(type); if (node && node->ri) { /* every bridge has a routerinfo. */ tor_addr_t addr; diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index dab081d..51c3a56 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -848,6 +848,14 @@ node_understands_microdescriptors(const node_t *node) static int node_can_handle_dirinfo(const node_t *node, dirinfo_type_t dirinfo) { + /* Checking dirinfo for any type other than microdescriptors isn't required + yet, since we only choose directory guards that can support microdescs, + routerinfos, and networkstatuses, AND we don't use directory guards if + we're configured to do direct downloads of anything else. The only case + where we might have a guard that doesn't know about a type of directory + information is when we're retrieving directory information from a + bridge. */ + if ((dirinfo & MICRODESC_DIRINFO) && !node_understands_microdescriptors(node)) return 0; @@ -862,9 +870,9 @@ node_can_handle_dirinfo(const node_t *node, dirinfo_type_t dirinfo) * only select from nodes that know how to answer directory questions * of that type. */ const node_t * -choose_random_entry(cpath_build_state_t *state, dirinfo_type_t dirinfo) +choose_random_entry(cpath_build_state_t *state) { - return choose_random_entry_impl(state, 0, dirinfo); + return choose_random_entry_impl(state, 0, 0); } /** Pick a live (up and listed) directory guard from entry_guards for @@ -893,12 +901,6 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, const int num_needed = for_directory ? options->NumDirectoryGuards : options->NumEntryGuards; - /* Checking dirinfo_type isn't required yet, since we only choose directory - guards that can support microdescs, routerinfos, and networkstatuses, AND - we don't use directory guards if we're configured to do direct downloads - of anything else. */ - (void) dirinfo_type; - if (chosen_exit) { nodelist_add_node_and_family(exit_family, chosen_exit); consider_exit_family = 1; @@ -2012,7 +2014,7 @@ int any_bridge_descriptors_known(void) { tor_assert(get_options()->UseBridges); - return choose_random_entry(NULL, NO_DIRINFO)!=NULL ? 1 : 0; + return choose_random_entry(NULL) != NULL; } /** Return 1 if there are any directory conns fetching bridge descriptors diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 235ef4b..e774a61 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -78,8 +78,7 @@ int entry_guard_register_connect_status(const char *digest, int succeeded, int mark_relay_status, time_t now); void entry_nodes_should_be_added(void); int entry_list_is_constrained(const or_options_t *options); -const node_t *choose_random_entry(cpath_build_state_t *state, - dirinfo_type_t dirinfo); +const node_t *choose_random_entry(cpath_build_state_t *state); const node_t *choose_random_dirguard(dirinfo_type_t t); int entry_guards_parse_state(or_state_t *state, int set, char **msg); void entry_guards_update_state(or_state_t *state);

1 0

[tor/master] Merge remote-tracking branch 'public/feature4994-rebased'
by nickm＠torproject.org 15 Feb '13

15 Feb '13

commit 0fa362cafa49bf8e7914a1bad0a76a64baef3a84 Merge: 6c8b6e9 d7089ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 15 15:58:54 2013 -0500 Merge remote-tracking branch 'public/feature4994-rebased' changes/feature4994 | 7 +++++ src/or/circuitbuild.c | 1 + src/or/directory.c | 11 ++++--- src/or/entrynodes.c | 69 ++++++++++++++++++++++++++++++++++--------------- src/or/entrynodes.h | 2 +- src/or/microdesc.c | 4 +- 6 files changed, 65 insertions(+), 29 deletions(-)

1 0

[tor/master] Fix unreachable use-before-assign in test_util_join_win_cmdline
by nickm＠torproject.org 15 Feb '13

15 Feb '13

commit 6c8b6e9e78429297e8d73a502d10dacf47efeea3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 15 15:57:15 2013 -0500 Fix unreachable use-before-assign in test_util_join_win_cmdline Apparently there is a compiler that believes this is something to warn about. --- src/test/test_util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index b17e414..c2cb444 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2713,7 +2713,7 @@ test_util_join_win_cmdline(void *ptr) }; int i; - char *joined_argv; + char *joined_argv = NULL; (void)ptr;

1 0

[tor/master] Merge remote-tracking branch 'public/integers_donna'
by nickm＠torproject.org 15 Feb '13

15 Feb '13

commit b90f9ebbb2e985ddc9b644404b862376d72e16d3 Merge: 5d400b5 4beee0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 15 15:55:36 2013 -0500 Merge remote-tracking branch 'public/integers_donna' changes/integers_donna | 3 +++ src/ext/curve25519_donna/curve25519-donna-c64.c | 4 +++- src/ext/curve25519_donna/curve25519-donna.c | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[tor/master] Use torint.h in curve25519-donna*.c
by nickm＠torproject.org 15 Feb '13

15 Feb '13

commit 4beee0f69ba65690755e486648d901f716cfd0ee Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Feb 14 15:34:38 2013 -0500 Use torint.h in curve25519-donna*.c This will get it building on systems that lack stdint.h --- changes/integers_donna | 3 +++ src/ext/curve25519_donna/curve25519-donna-c64.c | 4 +++- src/ext/curve25519_donna/curve25519-donna.c | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/changes/integers_donna b/changes/integers_donna new file mode 100644 index 0000000..e9c69e8 --- /dev/null +++ b/changes/integers_donna @@ -0,0 +1,3 @@ + o Minor bugfixes (portability) + - Tweak the curve25519-donna*.c implementations to tolerate systems + that lack stdint.h. Fixes bug 3894; bugfix on 0.2.4.8-alpha. diff --git a/src/ext/curve25519_donna/curve25519-donna-c64.c b/src/ext/curve25519_donna/curve25519-donna-c64.c index 9ebd8a1..b68ff36 100644 --- a/src/ext/curve25519_donna/curve25519-donna-c64.c +++ b/src/ext/curve25519_donna/curve25519-donna-c64.c @@ -22,8 +22,10 @@ * from the sample implementation. */ +#include "orconfig.h" + #include <string.h> -#include <stdint.h> +#include "torint.h" typedef uint8_t u8; typedef uint64_t limb; diff --git a/src/ext/curve25519_donna/curve25519-donna.c b/src/ext/curve25519_donna/curve25519-donna.c index 80e4594..5c6821c 100644 --- a/src/ext/curve25519_donna/curve25519-donna.c +++ b/src/ext/curve25519_donna/curve25519-donna.c @@ -46,8 +46,10 @@ * from the sample implementation. */ +#include "orconfig.h" + #include <string.h> -#include <stdint.h> +#include "torint.h" typedef uint8_t u8; typedef int32_t s32;

1 0