September 2016 - tor-commits - lists.torproject.org

[tor/master] Emit and parse protocol lists in router descriptors
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 4df12239f60a79c9543c21e665d2569f064b98ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 14:10:20 2016 -0400 Emit and parse protocol lists in router descriptors --- src/or/or.h | 3 +++ src/or/router.c | 13 ++++++++++++- src/or/routerlist.c | 1 + src/or/routerparse.c | 6 ++++++ src/test/test_dir.c | 2 -- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 34089ad..39b124f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2073,6 +2073,9 @@ typedef struct { char *platform; /**< What software/operating system is this OR using? */ + char *protocol_list; /**< Encoded list of subprotocol versions supported + * by this OR */ + /* link info */ uint32_t bandwidthrate; /**< How many bytes does this OR add to its token * bucket per second? */ diff --git a/src/or/router.c b/src/or/router.c index b664a88..7f227b5 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -23,6 +23,7 @@ #include "networkstatus.h" #include "nodelist.h" #include "policies.h" +#include "protover.h" #include "relay.h" #include "rephist.h" #include "router.h" @@ -2124,6 +2125,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) get_platform_str(platform, sizeof(platform)); ri->platform = tor_strdup(platform); + ri->protocol_list = tor_strdup(get_supported_protocols()); + /* compute ri->bandwidthrate as the min of various options */ ri->bandwidthrate = get_effective_bwrate(options); @@ -2616,6 +2619,7 @@ router_dump_router_to_string(routerinfo_t *router, char *ed_cert_line = NULL; char *rsa_tap_cc_line = NULL; char *ntor_cc_line = NULL; + char *proto_line = NULL; /* Make sure the identity key matches the one in the routerinfo. */ if (!crypto_pk_eq_keys(ident_key, router->identity_pkey)) { @@ -2780,6 +2784,12 @@ router_dump_router_to_string(routerinfo_t *router, } } + if (router->protocol_list) { + tor_asprintf(&proto_line, "proto %s\n", router->protocol_list); + } else { + proto_line = tor_strdup(""); + } + address = tor_dup_ip(router->addr); chunks = smartlist_new(); @@ -2789,7 +2799,7 @@ router_dump_router_to_string(routerinfo_t *router, "%s" "%s" "platform %s\n" - "protocols Link 1 2 Circuit 1\n" + "%s" "published %s\n" "fingerprint %s\n" "uptime %ld\n" @@ -2806,6 +2816,7 @@ router_dump_router_to_string(routerinfo_t *router, ed_cert_line ? ed_cert_line : "", extra_or_address ? extra_or_address : "", router->platform, + proto_line, published, fingerprint, stats_n_seconds_working, diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 74b8d1b..56e2385 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3102,6 +3102,7 @@ routerinfo_free(routerinfo_t *router) tor_free(router->cache_info.signed_descriptor_body); tor_free(router->nickname); tor_free(router->platform); + tor_free(router->protocol_list); tor_free(router->contact_info); if (router->onion_pkey) crypto_pk_free(router->onion_pkey); diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 03f8f4e..abad6a8 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -58,6 +58,7 @@ typedef enum { K_RUNNING_ROUTERS, K_ROUTER_STATUS, K_PLATFORM, + K_PROTO, K_OPT, K_BANDWIDTH, K_CONTACT, @@ -306,6 +307,7 @@ static token_rule_t routerdesc_token_table[] = { T01("fingerprint", K_FINGERPRINT, CONCAT_ARGS, NO_OBJ ), T01("hibernating", K_HIBERNATING, GE(1), NO_OBJ ), T01("platform", K_PLATFORM, CONCAT_ARGS, NO_OBJ ), + T01("proto", K_PROTO, CONCAT_ARGS, NO_OBJ ), T01("contact", K_CONTACT, CONCAT_ARGS, NO_OBJ ), T01("read-history", K_READ_HISTORY, ARGS, NO_OBJ ), T01("write-history", K_WRITE_HISTORY, ARGS, NO_OBJ ), @@ -2092,6 +2094,10 @@ router_parse_entry_from_string(const char *s, const char *end, router->platform = tor_strdup(tok->args[0]); } + if ((tok = find_opt_by_keyword(tokens, K_PROTO))) { + router->protocol_list = tor_strdup(tok->args[0]); + } + if ((tok = find_opt_by_keyword(tokens, K_CONTACT))) { router->contact_info = tor_strdup(tok->args[0]); } diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 5d9ae3c..617f6ff 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -231,7 +231,6 @@ test_dir_formats(void *arg) "platform Tor "VERSION" on ", sizeof(buf2)); strlcat(buf2, get_uname(), sizeof(buf2)); strlcat(buf2, "\n" - "protocols Link 1 2 Circuit 1\n" "published 1970-01-01 00:00:00\n" "fingerprint ", sizeof(buf2)); tt_assert(!crypto_pk_get_fingerprint(pk2, fingerprint, 1)); @@ -300,7 +299,6 @@ test_dir_formats(void *arg) strlcat(buf2, "platform Tor "VERSION" on ", sizeof(buf2)); strlcat(buf2, get_uname(), sizeof(buf2)); strlcat(buf2, "\n" - "protocols Link 1 2 Circuit 1\n" "published 1970-01-01 00:00:05\n" "fingerprint ", sizeof(buf2)); tt_assert(!crypto_pk_get_fingerprint(pk1, fingerprint, 1));

1 0

[tor/master] Add necessary code to parse and handle required/recommended protocols
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit cca1e0acffc7fc2814ed923cc86346175561c9a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 17:31:49 2016 -0400 Add necessary code to parse and handle required/recommended protocols --- src/or/networkstatus.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/networkstatus.h | 3 +++ src/or/or.h | 10 +++++++++ src/or/routerparse.c | 30 +++++++++++++++++++++++++++ 4 files changed, 99 insertions(+) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 72af505..2eb3cd8 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -28,6 +28,7 @@ #include "microdesc.h" #include "networkstatus.h" #include "nodelist.h" +#include "protover.h" #include "relay.h" #include "router.h" #include "routerlist.h" @@ -275,6 +276,11 @@ networkstatus_vote_free(networkstatus_t *ns) tor_free(ns->client_versions); tor_free(ns->server_versions); + tor_free(ns->recommended_client_protocols); + tor_free(ns->recommended_relay_protocols); + tor_free(ns->required_client_protocols); + tor_free(ns->required_relay_protocols); + if (ns->known_flags) { SMARTLIST_FOREACH(ns->known_flags, char *, c, tor_free(c)); smartlist_free(ns->known_flags); @@ -2364,6 +2370,56 @@ getinfo_helper_networkstatus(control_connection_t *conn, return 0; } +/** Check whether the networkstatus ns lists any protocol + * versions as "required" or "recommended" that we do not support. If + * so, set *warning_out to a newly allocated string describing + * the problem. + * + * Return 1 if we should exit, 0 if we should not. */ +int +networkstatus_check_required_protocols(const networkstatus_t *ns, + int client_mode, + char **warning_out) +{ + const char *func = client_mode ? "client" : "relay"; + const char *required, *recommended; + char *missing = NULL; + + tor_assert(warning_out); + + if (client_mode) { + required = ns->required_client_protocols; + recommended = ns->recommended_client_protocols; + } else { + required = ns->required_relay_protocols; + recommended = ns->recommended_relay_protocols; + } + + if (!protover_all_supported(required, &missing)) { + tor_asprintf(warning_out, "At least one protocol listed as required in " + "the consensus is not supported by this version of Tor. " + "You should upgrade. This version of Tor will not work as a " + "%s on the Tor network. The missing protocols are: %s", + func, missing); + tor_free(missing); + return 1; + } + + if (! protover_all_supported(recommended, &missing)) { + tor_asprintf(warning_out, "At least one protocol listed as recommended in " + "the consensus is not supported by this version of Tor. " + "You should upgrade. This version of Tor will eventually " + "stop working as a %s on the Tor network. The missing " + "protocols are: %s", + func, missing); + tor_free(missing); + } + + tor_assert_nonfatal(missing == NULL); + + return 0; +} + /** Free all storage held locally in this module. */ void networkstatus_free_all(void) diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 71f36b6..da175ec 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -122,6 +122,9 @@ void document_signature_free(document_signature_t *sig); document_signature_t *document_signature_dup(const document_signature_t *sig); void networkstatus_free_all(void); int networkstatus_get_weight_scale_param(networkstatus_t *ns); +int networkstatus_check_required_protocols(const networkstatus_t *ns, + int client_mode, + char **warning_out); #ifdef NETWORKSTATUS_PRIVATE STATIC void vote_routerstatus_free(vote_routerstatus_t *rs); diff --git a/src/or/or.h b/src/or/or.h index 39b124f..e9d41ee 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2525,6 +2525,16 @@ typedef struct networkstatus_t { * voter has no opinion. */ char *client_versions; char *server_versions; + + /** Lists of subprotocol versions which are _recommended_ for relays and + * clients, or which are _require_ for relays and clients. Tor shouldn't + * make any more network connections if a required protocol is missing. + */ + char *recommended_relay_protocols; + char *recommended_client_protocols; + char *required_relay_protocols; + char *required_client_protocols; + /** List of flags that this vote/consensus applies to routers. If a flag is * not listed here, the voter has no opinion on what its value should be. */ smartlist_t *known_flags; diff --git a/src/or/routerparse.c b/src/or/routerparse.c index abad6a8..46209ab 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -75,6 +75,10 @@ typedef enum { K_DIR_OPTIONS, K_CLIENT_VERSIONS, K_SERVER_VERSIONS, + K_RECOMMENDED_CLIENT_PROTOCOLS, + K_RECOMMENDED_RELAY_PROTOCOLS, + K_REQUIRED_CLIENT_PROTOCOLS, + K_REQUIRED_RELAY_PROTOCOLS, K_OR_ADDRESS, K_ID, K_P, @@ -461,6 +465,14 @@ static token_rule_t networkstatus_token_table[] = { T01("shared-rand-previous-value", K_PREVIOUS_SRV,EQ(2), NO_OBJ ), T01("shared-rand-current-value", K_CURRENT_SRV, EQ(2), NO_OBJ ), T0N("package", K_PACKAGE, CONCAT_ARGS, NO_OBJ ), + T01("recommended-client-protocols", K_RECOMMENDED_CLIENT_PROTOCOLS, + CONCAT_ARGS, NO_OBJ ), + T01("recommended-relay-protocols", K_RECOMMENDED_RELAY_PROTOCOLS, + CONCAT_ARGS, NO_OBJ ), + T01("required-client-protocols", K_REQUIRED_CLIENT_PROTOCOLS, + CONCAT_ARGS, NO_OBJ ), + T01("required-relay-protocols", K_REQUIRED_RELAY_PROTOCOLS, + CONCAT_ARGS, NO_OBJ ), CERTIFICATE_MEMBERS @@ -502,6 +514,15 @@ static token_rule_t networkstatus_consensus_token_table[] = { T01("shared-rand-previous-value", K_PREVIOUS_SRV, EQ(2), NO_OBJ ), T01("shared-rand-current-value", K_CURRENT_SRV, EQ(2), NO_OBJ ), + T01("recommended-client-protocols", K_RECOMMENDED_CLIENT_PROTOCOLS, + CONCAT_ARGS, NO_OBJ ), + T01("recommended-relay-protocols", K_RECOMMENDED_RELAY_PROTOCOLS, + CONCAT_ARGS, NO_OBJ ), + T01("required-client-protocols", K_REQUIRED_CLIENT_PROTOCOLS, + CONCAT_ARGS, NO_OBJ ), + T01("required-relay-protocols", K_REQUIRED_RELAY_PROTOCOLS, + CONCAT_ARGS, NO_OBJ ), + END_OF_TABLE }; @@ -3651,6 +3672,15 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, } } + if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_CLIENT_PROTOCOLS))) + ns->recommended_client_protocols = tor_strdup(tok->args[0]); + if ((tok = find_opt_by_keyword(tokens, K_RECOMMENDED_RELAY_PROTOCOLS))) + ns->recommended_relay_protocols = tor_strdup(tok->args[0]); + if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_CLIENT_PROTOCOLS))) + ns->required_client_protocols = tor_strdup(tok->args[0]); + if ((tok = find_opt_by_keyword(tokens, K_REQUIRED_RELAY_PROTOCOLS))) + ns->required_relay_protocols = tor_strdup(tok->args[0]); + tok = find_by_keyword(tokens, K_VALID_AFTER); if (parse_iso_time(tok->args[0], &ns->valid_after)) goto err;

1 0

[tor/master] Basic backend for the protocol-versions voting algorithm.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit c1be8f9d574dace9941c532ce5d612c315bc74c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 18:04:02 2016 -0400 Basic backend for the protocol-versions voting algorithm. [This is a brute-force method that potentially uses way too much RAM. Need to rethink this a little. Right now you can DOS an authority by saying "Foo=1-4294967295".] --- src/or/protover.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++ src/or/protover.h | 3 + src/test/test_protover.c | 31 +++++++ 3 files changed, 251 insertions(+) diff --git a/src/or/protover.c b/src/or/protover.c index b78978e..3a2d401 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -309,6 +309,223 @@ encode_protocol_list(const smartlist_t *sl) return result; } +/** Voting helper: Given a list of proto_entry_t, return a newly allocated + * smartlist of newly allocated strings, one for each included protocol + * version. (So 'Foo=3,5-7' expands to a list of 'Foo=3', 'Foo=5', 'Foo=6', + * 'Foo=7'.) + * + * Do not list any protocol version more than once. */ +static smartlist_t * +expand_protocol_list(const smartlist_t *protos) +{ + // XXXX This can make really huge lists from small inputs; that's a DoS + // problem. + + smartlist_t *expanded = smartlist_new(); + if (!protos) + return expanded; + + SMARTLIST_FOREACH_BEGIN(protos, const proto_entry_t *, ent) { + const char *name = ent->name; + SMARTLIST_FOREACH_BEGIN(ent->ranges, const proto_range_t *, range) { + uint32_t u; + for (u = range->low; u <= range->high; ++u) { + smartlist_add_asprintf(expanded, "%s=%lu", name, (unsigned long)u); + } + } SMARTLIST_FOREACH_END(range); + } SMARTLIST_FOREACH_END(ent); + + smartlist_sort_strings(expanded); + smartlist_uniq_strings(expanded); // This makes voting work. do not remove + return expanded; +} + +/** Voting helper: compare two singleton proto_entry_t items by version + * alone. (A singleton item is one with a single range entry where + * low==high.) */ +static int +cmp_single_ent_by_version(const void **a_, const void **b_) +{ + const proto_entry_t *ent_a = *a_; + const proto_entry_t *ent_b = *b_; + + tor_assert(smartlist_len(ent_a->ranges) == 1); + tor_assert(smartlist_len(ent_b->ranges) == 1); + + const proto_range_t *a = smartlist_get(ent_a->ranges, 0); + const proto_range_t *b = smartlist_get(ent_b->ranges, 0); + + tor_assert(a->low == a->high); + tor_assert(b->low == b->high); + + if (a->low < b->low) { + return -1; + } else if (a->low == b->low) { + return 0; + } else { + return 1; + } +} + +/** Voting helper: Given a list of singleton protocol strings (of the form + * Foo=7), return a canonical listing of all the protocol versions listed, + * with as few ranges as possible, with protocol versions sorted lexically and + * versions sorted in numerically increasing order, using as few range entries + * as possible. + **/ +static char * +contract_protocol_list(const smartlist_t *proto_strings) +{ + // map from name to list of single-version entries + strmap_t *entry_lists_by_name = strmap_new(); + // list of protocol names + smartlist_t *all_names = smartlist_new(); + // list of strings for the output we're building + smartlist_t *chunks = smartlist_new(); + + // Parse each item and stick it entry_lists_by_name. Build + // 'all_names' at the same time. + SMARTLIST_FOREACH_BEGIN(proto_strings, const char *, s) { + proto_entry_t *ent = parse_single_entry(s, s+strlen(s)); + if (BUG(!ent)) + continue; + smartlist_t *lst = strmap_get(entry_lists_by_name, ent->name); + if (!lst) { + smartlist_add(all_names, ent->name); + lst = smartlist_new(); + strmap_set(entry_lists_by_name, ent->name, lst); + } + smartlist_add(lst, ent); + } SMARTLIST_FOREACH_END(s); + + // We want to output the protocols sorted by their name. + smartlist_sort_strings(all_names); + + SMARTLIST_FOREACH_BEGIN(all_names, const char *, name) { + const int first_entry = (name_sl_idx == 0); + smartlist_t *lst = strmap_get(entry_lists_by_name, name); + tor_assert(lst); + // Sort every entry with this name by version. They are + // singletons, so there can't be overlap. + smartlist_sort(lst, cmp_single_ent_by_version); + + if (! first_entry) + smartlist_add(chunks, tor_strdup(" ")); + + /* We're going to construct this entry from the ranges. */ + proto_entry_t *entry = tor_malloc_zero(sizeof(proto_entry_t)); + entry->ranges = smartlist_new(); + entry->name = tor_strdup(name); + + // Now, find all the ranges of versions start..end where + // all of start, start+1, start+2, ..end are included. + int start_of_cur_series = 0; + while (start_of_cur_series < smartlist_len(lst)) { + const proto_entry_t *ent = smartlist_get(lst, start_of_cur_series); + const proto_range_t *range = smartlist_get(ent->ranges, 0); + const uint32_t ver_low = range->low; + uint32_t ver_high = ver_low; + + int idx; + for (idx = start_of_cur_series+1; idx < smartlist_len(lst); ++idx) { + ent = smartlist_get(lst, idx); + range = smartlist_get(ent->ranges, 0); + if (range->low != ver_high + 1) + break; + ver_high += 1; + } + + // Now idx is either off the end of the list, or the first sequence + // break in the list. + start_of_cur_series = idx; + + proto_range_t *new_range = tor_malloc_zero(sizeof(proto_range_t)); + new_range->low = ver_low; + new_range->high = ver_high; + smartlist_add(entry->ranges, new_range); + } + proto_entry_encode_into(chunks, entry); + proto_entry_free(entry); + + } SMARTLIST_FOREACH_END(name); + + // Build the result... + char *result = smartlist_join_strings(chunks, "", 0, NULL); + + // And free all the stuff we allocated. + SMARTLIST_FOREACH_BEGIN(all_names, const char *, name) { + smartlist_t *lst = strmap_get(entry_lists_by_name, name); + tor_assert(lst); + SMARTLIST_FOREACH(lst, proto_entry_t *, e, proto_entry_free(e)); + smartlist_free(lst); + } SMARTLIST_FOREACH_END(name); + + strmap_free(entry_lists_by_name, NULL); + smartlist_free(all_names); + SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp)); + smartlist_free(chunks); + + return result; +} + +/** + * Protocol voting implementation. + * + * Given a list of strings describing protocol versions, return a newly + * allocated string encoding all of the protocols that are listed by at + * least threshold of the inputs. + * + * The string is minimal and sorted according to the rules of + * contract_protocol_list above. + */ +char * +compute_protover_vote(const smartlist_t *list_of_proto_strings, + int threshold) +{ + // XXXX This algorithm can be made to use too much RAM. Fix that. + + smartlist_t *all_entries = smartlist_new(); + + // First, parse the inputs and break them into singleton entries. + SMARTLIST_FOREACH_BEGIN(list_of_proto_strings, const char *, vote) { + smartlist_t *unexpanded = parse_protocol_list(vote); + smartlist_t *this_vote = expand_protocol_list(unexpanded); + smartlist_add_all(all_entries, this_vote); + smartlist_free(this_vote); + SMARTLIST_FOREACH(unexpanded, proto_entry_t *, e, proto_entry_free(e)); + smartlist_free(unexpanded); + } SMARTLIST_FOREACH_END(vote); + + // Now sort the singleton entries + smartlist_sort_strings(all_entries); + + // Now find all the strings that appear at least 'threshold' times. + smartlist_t *include_entries = smartlist_new(); + const char *cur_entry = smartlist_get(all_entries, 0); + int n_times = 0; + SMARTLIST_FOREACH_BEGIN(all_entries, const char *, ent) { + if (!strcmp(ent, cur_entry)) { + n_times++; + } else { + if (n_times >= threshold) + smartlist_add(include_entries, (void*)cur_entry); + cur_entry = ent; + n_times = 1 ; + } + } SMARTLIST_FOREACH_END(ent); + + if (n_times >= threshold) + smartlist_add(include_entries, (void*)cur_entry); + + // Finally, compress that list. + char *result = contract_protocol_list(include_entries); + smartlist_free(include_entries); + SMARTLIST_FOREACH(all_entries, char *, cp, tor_free(cp)); + smartlist_free(all_entries); + + return result; +} + /** Return true if every protocol version described in the string s is * one that we support, and false otherwise. If missing_out is * provided, set it to the list of protocols we do not support. diff --git a/src/or/protover.h b/src/or/protover.h index d12a067..f809a8d 100644 --- a/src/or/protover.h +++ b/src/or/protover.h @@ -27,6 +27,9 @@ int protover_all_supported(const char *s, char **missing); int protover_is_supported_here(protocol_type_t pr, uint32_t ver); const char *get_supported_protocols(void); +char * compute_protover_vote(const smartlist_t *list_of_proto_strings, + int threshold); + void protover_free_all(void); #ifdef PROTOVER_PRIVATE diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 606ca57..2c72282 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -80,12 +80,43 @@ test_protover_parse(void *arg) tor_free(re_encoded); } +static void +test_protover_vote(void *arg) +{ + (void) arg; + + smartlist_t *lst = smartlist_new(); + char *result = compute_protover_vote(lst, 1); + + tt_str_op(result, OP_EQ, ""); + tor_free(result); + + smartlist_add(lst, (void*) "Foo=1-10,500 Bar=1,3-7,8"); + result = compute_protover_vote(lst, 1); + tt_str_op(result, OP_EQ, "Bar=1,3-8 Foo=1-10,500"); + tor_free(result); + + smartlist_add(lst, (void*) "Quux=123-456,78 Bar=2-6,8 Foo=9"); + result = compute_protover_vote(lst, 1); + tt_str_op(result, OP_EQ, "Bar=1-8 Foo=1-10,500 Quux=78,123-456"); + tor_free(result); + + result = compute_protover_vote(lst, 2); + tt_str_op(result, OP_EQ, "Bar=3-6,8 Foo=9"); + tor_free(result); + + done: + tor_free(result); + smartlist_free(lst); +} + #define PV_TEST(name, flags) \ { #name, test_protover_ ##name, (flags), NULL, NULL } struct testcase_t protover_tests[] = { PV_TEST(parse, 0), + PV_TEST(vote, 0), END_OF_TESTCASES };

1 0

[tor/master] Actually check for missing protocols and exit as appropriate.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 7f718c46f355e194fb6ae8c8aabb72d2492c4d3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 19 17:45:08 2016 -0400 Actually check for missing protocols and exit as appropriate. --- src/or/networkstatus.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 2eb3cd8..6c92773 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1552,6 +1552,31 @@ networkstatus_set_current_consensus_from_ns(networkstatus_t *c, } #endif //TOR_UNIT_TESTS +/** Called when we have received a networkstatus c. If there are + * any _required_ protocols we are missing, log an error and exit + * immediately. If there are any _recommended_ protocols we are missing, + * warn. */ +static void +handle_missing_protocol_warning(const networkstatus_t *c, + const or_options_t *options) +{ + char *protocol_warning = NULL; + int should_exit = networkstatus_check_required_protocols(c, + !server_mode(options), + &protocol_warning); + if (protocol_warning) { + tor_log(should_exit ? LOG_ERR : LOG_WARN, + LD_GENERAL, + "%s", protocol_warning); + } + if (should_exit) { + tor_assert_nonfatal(protocol_warning); + } + tor_free(protocol_warning); + if (should_exit) + exit(1); +} + /** Try to replace the current cached v3 networkstatus with the one in * consensus. If we don't have enough certificates to validate it, * store it in consensus_waiting_for_certs and launch a certificate fetch. @@ -1595,6 +1620,7 @@ networkstatus_set_current_consensus(const char *consensus, time_t current_valid_after = 0; int free_consensus = 1; /* Free 'c' at the end of the function */ int old_ewma_enabled; + int checked_protocols_already = 0; if (flav < 0) { /* XXXX we don't handle unrecognized flavors yet. */ @@ -1610,6 +1636,16 @@ networkstatus_set_current_consensus(const char *consensus, goto done; } + if (from_cache && !was_waiting_for_certs) { + /* We previously stored this; check _now_ to make sure that version-kills + * really work. This happens even before we check signatures: we did so + * before when we stored this to disk. This does mean an attacker who can + * write to the datadir can make us not start: such an attacker could + * already harm us by replacing our guards, which would be worse. */ + checked_protocols_already = 1; + handle_missing_protocol_warning(c, options); + } + if ((int)c->flavor != flav) { /* This wasn't the flavor we thought we were getting. */ if (require_flavor) { @@ -1735,6 +1771,10 @@ networkstatus_set_current_consensus(const char *consensus, if (!from_cache && flav == usable_consensus_flavor()) control_event_client_status(LOG_NOTICE, "CONSENSUS_ARRIVED"); + if (!checked_protocols_already) { + handle_missing_protocol_warning(c, options); + } + /* Are we missing any certificates at all? */ if (r != 1 && dl_certs) authority_certs_fetch_missing(c, now, source_dir);

1 0

[tor/master] Rename compute_protover_vote to protover_compute_vote
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 3a3120819c8f600ef7d22ddf3f5476791c7e1d9b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 12 14:11:44 2016 -0400 Rename compute_protover_vote to protover_compute_vote --- src/or/dirvote.c | 2 +- src/or/protover.c | 2 +- src/or/protover.h | 2 +- src/test/test_protover.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index f606b07..c65243c 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1256,7 +1256,7 @@ compute_nth_protocol_set(int n, int n_voters, const smartlist_t *votes) smartlist_add(proto_votes, (void*)v); } SMARTLIST_FOREACH_END(ns); - char *protocols = compute_protover_vote(proto_votes, threshold); + char *protocols = protover_compute_vote(proto_votes, threshold); smartlist_free(proto_votes); char *result = NULL; diff --git a/src/or/protover.c b/src/or/protover.c index d29cdba..434d3f3 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -520,7 +520,7 @@ contract_protocol_list(const smartlist_t *proto_strings) * contract_protocol_list above. */ char * -compute_protover_vote(const smartlist_t *list_of_proto_strings, +protover_compute_vote(const smartlist_t *list_of_proto_strings, int threshold) { smartlist_t *all_entries = smartlist_new(); diff --git a/src/or/protover.h b/src/or/protover.h index 520db37..654127e 100644 --- a/src/or/protover.h +++ b/src/or/protover.h @@ -27,7 +27,7 @@ int protover_all_supported(const char *s, char **missing); int protover_is_supported_here(protocol_type_t pr, uint32_t ver); const char *get_supported_protocols(void); -char *compute_protover_vote(const smartlist_t *list_of_proto_strings, +char *protover_compute_vote(const smartlist_t *list_of_proto_strings, int threshold); const char *protover_compute_for_old_tor(const char *version); int protocol_list_supports_protocol(const char *list, protocol_type_t tp, diff --git a/src/test/test_protover.c b/src/test/test_protover.c index eacbbcb..f00955d 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -120,22 +120,22 @@ test_protover_vote(void *arg) (void) arg; smartlist_t *lst = smartlist_new(); - char *result = compute_protover_vote(lst, 1); + char *result = protover_compute_vote(lst, 1); tt_str_op(result, OP_EQ, ""); tor_free(result); smartlist_add(lst, (void*) "Foo=1-10,500 Bar=1,3-7,8"); - result = compute_protover_vote(lst, 1); + result = protover_compute_vote(lst, 1); tt_str_op(result, OP_EQ, "Bar=1,3-8 Foo=1-10,500"); tor_free(result); smartlist_add(lst, (void*) "Quux=123-456,78 Bar=2-6,8 Foo=9"); - result = compute_protover_vote(lst, 1); + result = protover_compute_vote(lst, 1); tt_str_op(result, OP_EQ, "Bar=1-8 Foo=1-10,500 Quux=78,123-456"); tor_free(result); - result = compute_protover_vote(lst, 2); + result = protover_compute_vote(lst, 2); tt_str_op(result, OP_EQ, "Bar=3-6,8 Foo=9"); tor_free(result);

1 0

[tor/master] Rename get_supported_protocols to protover_get_supported_protocols
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit afe0419db7adb643aff7c2f2c99f2e2302c6dc7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 12 14:18:43 2016 -0400 Rename get_supported_protocols to protover_get_supported_protocols --- src/or/protover.c | 10 ++++++---- src/or/protover.h | 2 +- src/or/router.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/or/protover.c b/src/or/protover.c index 434d3f3..a2471b0 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -260,7 +260,7 @@ protocol_list_supports_protocol(const char *list, protocol_type_t tp, /** Return the canonical string containing the list of protocols * that we support. */ const char * -get_supported_protocols(void) +protover_get_supported_protocols(void) { return "Cons=1-2 " @@ -274,8 +274,9 @@ get_supported_protocols(void) "Relay=1-2"; } -/** The protocols from get_supported_protocols(), as parsed into a list of - * proto_entry_t values. Access this via get_supported_protocol_list. */ +/** The protocols from protover_get_supported_protocols(), as parsed into a + * list of proto_entry_t values. Access this via + * get_supported_protocol_list. */ static smartlist_t *supported_protocol_list = NULL; /** Return a pointer to a smartlist of proto_entry_t for the protocols @@ -284,7 +285,8 @@ static const smartlist_t * get_supported_protocol_list(void) { if (PREDICT_UNLIKELY(supported_protocol_list == NULL)) { - supported_protocol_list = parse_protocol_list(get_supported_protocols()); + supported_protocol_list = + parse_protocol_list(protover_get_supported_protocols()); } return supported_protocol_list; } diff --git a/src/or/protover.h b/src/or/protover.h index 654127e..5f4789d 100644 --- a/src/or/protover.h +++ b/src/or/protover.h @@ -25,7 +25,7 @@ typedef enum protocol_type_t { int protover_all_supported(const char *s, char **missing); int protover_is_supported_here(protocol_type_t pr, uint32_t ver); -const char *get_supported_protocols(void); +const char *protover_get_supported_protocols(void); char *protover_compute_vote(const smartlist_t *list_of_proto_strings, int threshold); diff --git a/src/or/router.c b/src/or/router.c index 7f227b5..1449b57 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2125,7 +2125,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) get_platform_str(platform, sizeof(platform)); ri->platform = tor_strdup(platform); - ri->protocol_list = tor_strdup(get_supported_protocols()); + ri->protocol_list = tor_strdup(protover_get_supported_protocols()); /* compute ri->bandwidthrate as the min of various options */ ri->bandwidthrate = get_effective_bwrate(options);

1 0

[tor/master] Workaround a test bug
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit d97a3855350aacd1ea776506624171952fab8ed8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 25 14:28:57 2016 -0400 Workaround a test bug --- src/or/protover.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/protover.c b/src/or/protover.c index 7314d61..7feec0c 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -392,6 +392,8 @@ contract_protocol_list(const smartlist_t *proto_strings) // Parse each item and stick it entry_lists_by_name. Build // 'all_names' at the same time. SMARTLIST_FOREACH_BEGIN(proto_strings, const char *, s) { + if (BUG(!s)) + continue;// LCOV_EXCL_LINE proto_entry_t *ent = parse_single_entry(s, s+strlen(s)); if (BUG(!ent)) continue; // LCOV_EXCL_LINE @@ -513,14 +515,14 @@ compute_protover_vote(const smartlist_t *list_of_proto_strings, if (!strcmp(ent, cur_entry)) { n_times++; } else { - if (n_times >= threshold) + if (n_times >= threshold && cur_entry) smartlist_add(include_entries, (void*)cur_entry); cur_entry = ent; n_times = 1 ; } } SMARTLIST_FOREACH_END(ent); - if (n_times >= threshold) + if (n_times >= threshold && cur_entry) smartlist_add(include_entries, (void*)cur_entry); // Finally, compress that list.

1 0

[tor/master] Use protocols to see when EXTEND2 support exists.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit e525f5697f9a0682b2cc24fa9779ebe9f0f3c233 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 26 12:49:00 2016 -0400 Use protocols to see when EXTEND2 support exists. (Technically, we could just remove extend2 cell checking entirely, since all Tor versions on our network are required to have it, but let's keep this around as an example of How To Do It.) --- src/or/or.h | 9 ++++++--- src/or/protover.c | 22 ++++++++++++++++++++++ src/or/protover.h | 3 ++- src/or/routerlist.c | 4 ++-- src/or/routerparse.c | 16 +++++++++++++--- 5 files changed, 45 insertions(+), 9 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 5085139..befbf71 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2198,9 +2198,12 @@ typedef struct routerstatus_t { * if the number of traits we care about ever becomes incredibly big. */ unsigned int version_known:1; - /** True iff this router has a version that allows it to accept EXTEND2 - * cells */ - unsigned int version_supports_extend2_cells:1; + /** True iff we have a proto line for this router.*/ + unsigned int protocols_known:1; + + /** True iff this router has a version or protocol list that allows it to + * accept EXTEND2 cells */ + unsigned int supports_extend2_cells:1; unsigned int has_bandwidth:1; /**< The vote/consensus had bw info */ unsigned int has_exitsummary:1; /**< The vote/consensus had exit summaries */ diff --git a/src/or/protover.c b/src/or/protover.c index 7feec0c..ca03a71 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -235,6 +235,28 @@ protover_is_supported_here(protocol_type_t pr, uint32_t ver) return protocol_list_contains(ours, pr, ver); } +/** + * Return true iff "list" encodes a protocol list that includes support for + * the indicated protocol and version. + */ +int +protocol_list_supports_protocol(const char *list, protocol_type_t tp, + uint32_t version) +{ + /* NOTE: This is a pretty inefficient implementation. If it ever shows + * up in profiles, we should memoize it. + */ + smartlist_t *protocols = parse_protocol_list(list); + if (!protocols) { + return 0; + } + int contains = protocol_list_contains(protocols, tp, version); + + SMARTLIST_FOREACH(protocols, proto_entry_t *, ent, proto_entry_free(ent)); + smartlist_free(protocols); + return contains; +} + /** Return the canonical string containing the list of protocols * that we support. */ const char * diff --git a/src/or/protover.h b/src/or/protover.h index d378627..352fa7c 100644 --- a/src/or/protover.h +++ b/src/or/protover.h @@ -33,7 +33,8 @@ const char *get_supported_protocols(void); char * compute_protover_vote(const smartlist_t *list_of_proto_strings, int threshold); const char *protover_compute_for_old_tor(const char *version); - +int protocol_list_supports_protocol(const char *list, protocol_type_t tp, + uint32_t version); void protover_free_all(void); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 56e2385..0a03f13 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5536,11 +5536,11 @@ routerstatus_version_supports_ntor(const routerstatus_t *rs, return allow_unknown_versions; } - if (!rs->version_known) { + if (!rs->version_known && !rs->protocols_known) { return allow_unknown_versions; } - return rs->version_supports_extend2_cells; + return rs->supports_extend2_cells; } /** Assert that the internal representation of rl is diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 9428e45..459a939 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -17,6 +17,7 @@ #include "dirserv.h" #include "dirvote.h" #include "policies.h" +#include "protover.h" #include "rendcommon.h" #include "router.h" #include "routerlist.h" @@ -2904,12 +2905,21 @@ routerstatus_parse_entry_from_string(memarea_t *area, } } } + int found_protocol_list = 0; + if ((tok = find_opt_by_keyword(tokens, K_PROTO))) { + found_protocol_list = 1; + rs->protocols_known = 1; + rs->supports_extend2_cells = + protocol_list_supports_protocol(tok->args[0], PRT_RELAY, 2); + } if ((tok = find_opt_by_keyword(tokens, K_V))) { tor_assert(tok->n_args == 1); rs->version_known = 1; - if (strcmpstart(tok->args[0], "Tor ")) { - } else { - rs->version_supports_extend2_cells = + if (!strcmpstart(tok->args[0], "Tor ") && !found_protocol_list) { + /* We only do version checks like this in the case where + * the version is a "Tor" version, and where there is no + * list of protocol versions that we should be looking at instead. */ + rs->supports_extend2_cells = tor_version_as_new_as(tok->args[0], "0.2.4.8-alpha"); } if (vote_rs) {

1 0

[tor/master] Remove DoS vector in protover.c voting code
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 1e29c68ba9ad87861cc6c8a9c6d87cc5773d0480 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 26 12:54:41 2016 -0400 Remove DoS vector in protover.c voting code --- src/or/protover.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/src/or/protover.c b/src/or/protover.c index ca03a71..66d20c5 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -337,18 +337,22 @@ encode_protocol_list(const smartlist_t *sl) return result; } +/* We treat any protocol list with more than this many subprotocols in it + * as a DoS attempt. */ +const int MAX_PROTOCOLS_TO_EXPAND = (1<<16); + /** Voting helper: Given a list of proto_entry_t, return a newly allocated * smartlist of newly allocated strings, one for each included protocol * version. (So 'Foo=3,5-7' expands to a list of 'Foo=3', 'Foo=5', 'Foo=6', * 'Foo=7'.) * - * Do not list any protocol version more than once. */ + * Do not list any protocol version more than once. + * + * Return NULL if the list would be too big. + */ static smartlist_t * expand_protocol_list(const smartlist_t *protos) { - // XXXX This can make really huge lists from small inputs; that's a DoS - // problem. - smartlist_t *expanded = smartlist_new(); if (!protos) return expanded; @@ -359,6 +363,8 @@ expand_protocol_list(const smartlist_t *protos) uint32_t u; for (u = range->low; u <= range->high; ++u) { smartlist_add_asprintf(expanded, "%s=%lu", name, (unsigned long)u); + if (smartlist_len(expanded) > MAX_PROTOCOLS_TO_EXPAND) + goto too_many; } } SMARTLIST_FOREACH_END(range); } SMARTLIST_FOREACH_END(ent); @@ -366,6 +372,11 @@ expand_protocol_list(const smartlist_t *protos) smartlist_sort_strings(expanded); smartlist_uniq_strings(expanded); // This makes voting work. do not remove return expanded; + + too_many: + SMARTLIST_FOREACH(expanded, char *, cp, tor_free(cp)); + smartlist_free(expanded); + return NULL; } /** Voting helper: compare two singleton proto_entry_t items by version @@ -512,16 +523,22 @@ char * compute_protover_vote(const smartlist_t *list_of_proto_strings, int threshold) { - // XXXX This algorithm can be made to use too much RAM. Fix that. - smartlist_t *all_entries = smartlist_new(); // First, parse the inputs and break them into singleton entries. SMARTLIST_FOREACH_BEGIN(list_of_proto_strings, const char *, vote) { smartlist_t *unexpanded = parse_protocol_list(vote); smartlist_t *this_vote = expand_protocol_list(unexpanded); - smartlist_add_all(all_entries, this_vote); - smartlist_free(this_vote); + if (this_vote == NULL) { + log_warn(LD_NET, "When expanding a protocol list from an authority, I " + "got too many protocols. This is possibly an attack or a bug, " + "unless the Tor network truly has expanded to support over %d " + "different subprotocol versions. The offending string was: %s", + MAX_PROTOCOLS_TO_EXPAND, escaped(vote)); + } else { + smartlist_add_all(all_entries, this_vote); + smartlist_free(this_vote); + } SMARTLIST_FOREACH(unexpanded, proto_entry_t *, e, proto_entry_free(e)); smartlist_free(unexpanded); } SMARTLIST_FOREACH_END(vote);

1 0

[tor/master] Vote on 'proto' lines and include them after 'v' lines.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 90a6fe318cfae4d64fff034574153b8c96895a6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 26 12:33:23 2016 -0400 Vote on 'proto' lines and include them after 'v' lines. (Despite the increased size of the consensus, this should have approximately zero effect on the compressed consensus size, since the "proto" line should be completely implied by the "v" line.) --- src/or/dirvote.c | 22 ++++++++++++++++++++++ src/or/dirvote.h | 2 -- src/or/routerparse.c | 5 +++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 67f0ba8..f606b07 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1563,6 +1563,7 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_t *matching_descs = smartlist_new(); smartlist_t *chosen_flags = smartlist_new(); smartlist_t *versions = smartlist_new(); + smartlist_t *protocols = smartlist_new(); smartlist_t *exitsummaries = smartlist_new(); uint32_t *bandwidths_kb = tor_calloc(smartlist_len(votes), sizeof(uint32_t)); @@ -1705,6 +1706,7 @@ networkstatus_compute_consensus(smartlist_t *votes, routerstatus_t rs_out; const char *current_rsa_id = NULL; const char *chosen_version; + const char *chosen_protocol_list; const char *chosen_name = NULL; int exitsummary_disagreement = 0; int is_named = 0, is_unnamed = 0, is_running = 0; @@ -1718,6 +1720,7 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_clear(matching_descs); smartlist_clear(chosen_flags); smartlist_clear(versions); + smartlist_clear(protocols); num_bandwidths = 0; num_mbws = 0; num_guardfraction_inputs = 0; @@ -1737,6 +1740,12 @@ networkstatus_compute_consensus(smartlist_t *votes, if (rs->version && rs->version[0]) smartlist_add(versions, rs->version); + if (rs->protocols) { + /* We include this one even if it's empty: voting for an + * empty protocol list actually is meaningful. */ + smartlist_add(protocols, rs->protocols); + } + /* Tally up all the flags. */ for (int flag = 0; flag < n_voter_flags[voter_idx]; ++flag) { if (rs->flags & (U64_LITERAL(1) << flag)) @@ -1875,6 +1884,14 @@ networkstatus_compute_consensus(smartlist_t *votes, chosen_version = NULL; } + /* Pick the protocol list */ + if (smartlist_len(protocols)) { + smartlist_sort_strings(protocols); + chosen_protocol_list = get_most_frequent_member(protocols); + } else { + chosen_protocol_list = NULL; + } + /* If it's a guard and we have enough guardfraction votes, calculate its consensus guardfraction value. */ if (is_guard && num_guardfraction_inputs > 2 && @@ -2028,6 +2045,10 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_add(chunks, tor_strdup(chosen_version)); } smartlist_add(chunks, tor_strdup("\n")); + if (chosen_protocol_list && + consensus_method >= MIN_METHOD_FOR_RS_PROTOCOLS) { + smartlist_add_asprintf(chunks, "proto %s\n", chosen_protocol_list); + } /* Now the weight line. */ if (rs_out.has_bandwidth) { char *guardfraction_str = NULL; @@ -2068,6 +2089,7 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_free(matching_descs); smartlist_free(chosen_flags); smartlist_free(versions); + smartlist_free(protocols); smartlist_free(exitsummaries); tor_free(bandwidths_kb); tor_free(measured_bws_kb); diff --git a/src/or/dirvote.h b/src/or/dirvote.h index f29fe97..a6c847e 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -103,11 +103,9 @@ * protocols. */ #define MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 24 -#if 0 /** Lowest consensus method where authorities add protocols to routerstatus * entries. */ #define MIN_METHOD_FOR_RS_PROTOCOLS 24 -#endif /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 46209ab..9428e45 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -388,6 +388,7 @@ static token_rule_t rtrstatus_token_table[] = { T01("w", K_W, ARGS, NO_OBJ ), T0N("m", K_M, CONCAT_ARGS, NO_OBJ ), T0N("id", K_ID, GE(2), NO_OBJ ), + T01("proto", K_PROTO, CONCAT_ARGS, NO_OBJ ), T0N("opt", K_OPT, CONCAT_ARGS, OBJ_OK ), END_OF_TABLE }; @@ -2992,6 +2993,10 @@ routerstatus_parse_entry_from_string(memarea_t *area, } } } + if (t->tp == K_PROTO) { + tor_assert(t->n_args == 1); + vote_rs->protocols = tor_strdup(t->args[0]); + } } SMARTLIST_FOREACH_END(t); } else if (flav == FLAV_MICRODESC) { tok = find_opt_by_keyword(tokens, K_M);

1 0