- tor-commits - lists.torproject.org

[tor/master] Take microdesc into account when deciding about preferred OR port.
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit d827a5495a9d05976f5610655f7e4b5b160a2dac Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Aug 31 23:02:19 2012 +0200 Take microdesc into account when deciding about preferred OR port. --- src/or/nodelist.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 25ed6a6..e35039b 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -888,9 +888,17 @@ node_get_pref_ipv6_orport(const node_t *node, tor_addr_port_t *ap_out) node_assert_ok(node); tor_assert(ap_out); + /* We prefer the microdesc over a potential routerstatus here. They + are not being synchronised atm so there might be a chance that + they differ at some point, f.ex. when flipping + UseMicrodescriptors? -LN */ + if (node->ri) { tor_addr_copy(&ap_out->addr, &node->ri->ipv6_addr); ap_out->port = node->ri->ipv6_orport; + } else if (node->md) { + tor_addr_copy(&ap_out->addr, &node->md->ipv6_addr); + ap_out->port = node->md->ipv6_orport; } else if (node->rs) { tor_addr_copy(&ap_out->addr, &node->rs->ipv6_addr); ap_out->port = node->rs->ipv6_orport;

1 0

[tor/master] Merge branch 'bug5535_only_rebased'
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit d7a646edcfbceaab412bc1558ec83a3551c2c8a4 Merge: ec94d03 d827a54 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 4 18:24:20 2012 -0400 Merge branch 'bug5535_only_rebased' changes/bug5535 | 5 +++ doc/tor.1.txt | 12 ++++++++ src/or/circuitbuild.c | 72 ++++++++++++++++++++++++++++-------------------- src/or/config.c | 2 + src/or/nodelist.c | 53 +++++++++++++++++++++++++++++------- src/or/nodelist.h | 8 +++--- src/or/or.h | 11 +++++++ src/or/routerparse.c | 9 ++++++ 8 files changed, 128 insertions(+), 44 deletions(-)

1 0

[tor/master] Have directory authorities vote on IPv6 OR ports according to the spec
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit 156ffef2494136d2fa0b1456a1c21cc29cbc3ff0 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Aug 14 14:03:58 2012 +0200 Have directory authorities vote on IPv6 OR ports according to the spec Define new new consensus method 14 adding "a" lines to vote and consensus documents. From proposal 186: As with other data in the vote derived from the descriptor, the consensus will include whichever set of "a" lines are given by the most authorities who voted for the descriptor digest that will be used for the router. This patch implements this. --- changes/bug6363 | 3 ++ src/or/dirserv.c | 14 +++++++---- src/or/dirvote.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++-- src/or/routerparse.c | 63 ++++++++++++++++++++++++++++++++++++----------- src/test/test_dir.c | 8 ++++++ 5 files changed, 131 insertions(+), 23 deletions(-) diff --git a/changes/bug6363 b/changes/bug6363 new file mode 100644 index 0000000..de99b72 --- /dev/null +++ b/changes/bug6363 @@ -0,0 +1,3 @@ + o Major features: + - Directory authorities vote on IPv6 OR ports using new consensus + method 14. Implements ticket 6363. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index f4ba02b..5814171 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2053,7 +2053,7 @@ version_from_platform(const char *platform) * non-NULL, add a "v" line for the platform. Return 0 on success, -1 on * failure. * - * The format argument has three possible values: + * The format argument has one of the following values: * NS_V2 - Output an entry suitable for a V2 NS opinion document * NS_V3_CONSENSUS - Output the first portion of a V3 NS consensus entry * NS_V3_CONSENSUS_MICRODESC - Output the first portion of a V3 microdesc @@ -2092,17 +2092,18 @@ routerstatus_format_entry(char *buf, size_t buf_len, log_warn(LD_BUG, "Not enough space in buffer."); return -1; } + cp = buf + strlen(buf); /* TODO: Maybe we want to pass in what we need to build the rest of * this here, instead of in the caller. Then we could use the * networkstatus_type_t values, with an additional control port value * added -MP */ - if (format == NS_V3_CONSENSUS || format == NS_V3_CONSENSUS_MICRODESC) - return 0; - cp = buf + strlen(buf); + /* V3 microdesc consensuses don't have "a" lines. */ + if (format == NS_V3_CONSENSUS_MICRODESC) + return 0; - /* Possible "a" line, not included in consensus for now. */ + /* Possible "a" line. At most one for now. */ if (!tor_addr_is_null(&rs->ipv6_addr)) { const char *addr_str = fmt_and_decorate_addr(&rs->ipv6_addr); r = tor_snprintf(cp, buf_len - (cp-buf), @@ -2116,6 +2117,9 @@ routerstatus_format_entry(char *buf, size_t buf_len, cp += strlen(cp); } + if (format == NS_V3_CONSENSUS) + return 0; + /* NOTE: Whenever this list expands, be sure to increase MAX_FLAG_LINE_LEN*/ r = tor_snprintf(cp, buf_len - (cp-buf), "s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", diff --git a/src/or/dirvote.c b/src/or/dirvote.c index b3de90b..9056cf5 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -54,7 +54,7 @@ static int dirvote_publish_consensus(void); static char *make_consensus_method_list(int low, int high, const char *sep); /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 13 +#define MAX_SUPPORTED_CONSENSUS_METHOD 14 /** Lowest consensus method that contains a 'directory-footer' marker */ #define MIN_METHOD_FOR_FOOTER 9 @@ -76,6 +76,9 @@ static char *make_consensus_method_list(int low, int high, const char *sep); * with no microdesc. */ #define MIN_METHOD_FOR_MANDATORY_MICRODESC 13 +/** Lowest consensus method that contains "a" lines. */ +#define MIN_METHOD_FOR_A_LINES 14 + /* ===== * Voting * =====*/ @@ -430,6 +433,21 @@ _compare_vote_rs(const void **_a, const void **_b) return compare_vote_rs(a,b); } +/** Helper for sorting OR ports. */ +static int +_compare_orports(const void **_a, const void **_b) +{ + const tor_addr_port_t *a = *_a, *b = *_b; + int r; + + if ((r = tor_addr_compare(&a->addr, &b->addr, CMP_EXACT))) + return r; + if ((r = (((int) b->port) - ((int) a->port)))) + return r; + + return 0; +} + /** Given a list of vote_routerstatus_t, all for the same router identity, * return whichever is most frequent, breaking ties in favor of more * recently published vote_routerstatus_t and in case of ties there, @@ -437,7 +455,8 @@ _compare_vote_rs(const void **_a, const void **_b) */ static vote_routerstatus_t * compute_routerstatus_consensus(smartlist_t *votes, int consensus_method, - char *microdesc_digest256_out) + char *microdesc_digest256_out, + tor_addr_port_t *best_alt_orport_out) { vote_routerstatus_t *most = NULL, *cur = NULL; int most_n = 0, cur_n = 0; @@ -473,6 +492,42 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method, tor_assert(most); + /* If we're producing "a" lines, vote on potential alternative (sets + * of) OR port(s) in the winning routerstatuses. + * + * XXX prop186 There's at most one alternative OR port (_the_ IPv6 + * port) for now. */ + if (consensus_method >= MIN_METHOD_FOR_A_LINES && best_alt_orport_out) { + smartlist_t *alt_orports = smartlist_new(); + const tor_addr_port_t *most_alt_orport = NULL; + + SMARTLIST_FOREACH_BEGIN(votes, vote_routerstatus_t *, rs) { + if (compare_vote_rs(most, rs) == 0 && + !tor_addr_is_null(&rs->status.ipv6_addr) + && rs->status.ipv6_orport) { + smartlist_add(alt_orports, tor_addr_port_alloc(&rs->status.ipv6_addr, + rs->status.ipv6_orport)); + log_debug(LD_DIR, "picking %s:%d (%s) for voting on \"a\" lines", /* FIXME: remove */ + fmt_and_decorate_addr(&rs->status.ipv6_addr), rs->status.ipv6_orport, + rs->status.nickname); + } + } SMARTLIST_FOREACH_END(rs); + + smartlist_sort(alt_orports, _compare_orports); + most_alt_orport = smartlist_get_most_frequent(alt_orports, _compare_orports); + if (most_alt_orport) { + memcpy(best_alt_orport_out, most_alt_orport, sizeof(tor_addr_port_t)); + + log_debug(LD_DIR, "\"a\" line winner for %s is %s:%d", + most->status.nickname, + fmt_and_decorate_addr(&most_alt_orport->addr), + most_alt_orport->port); + } + + SMARTLIST_FOREACH(alt_orports, tor_addr_port_t *, ap, tor_free(ap)); + smartlist_free(alt_orports); + } + if (consensus_method >= MIN_METHOD_FOR_MICRODESC && microdesc_digest256_out) { smartlist_t *digests = smartlist_new(); @@ -1685,6 +1740,7 @@ networkstatus_compute_consensus(smartlist_t *votes, int n_listing = 0; int i; char microdesc_digest[DIGEST256_LEN]; + tor_addr_port_t alt_orport = {TOR_ADDR_NULL, 0}; /* Of the next-to-be-considered digest in each voter, which is first? */ SMARTLIST_FOREACH(votes, networkstatus_t *, v, { @@ -1754,7 +1810,7 @@ networkstatus_compute_consensus(smartlist_t *votes, * routerinfo and its contents are. */ memset(microdesc_digest, 0, sizeof(microdesc_digest)); rs = compute_routerstatus_consensus(matching_descs, consensus_method, - microdesc_digest); + microdesc_digest, &alt_orport); /* Copy bits of that into rs_out. */ memset(&rs_out, 0, sizeof(rs_out)); tor_assert(fast_memeq(lowest_id, rs->status.identity_digest,DIGEST_LEN)); @@ -1765,6 +1821,10 @@ networkstatus_compute_consensus(smartlist_t *votes, rs_out.published_on = rs->status.published_on; rs_out.dir_port = rs->status.dir_port; rs_out.or_port = rs->status.or_port; + if (consensus_method >= MIN_METHOD_FOR_A_LINES) { + tor_addr_copy(&rs_out.ipv6_addr, &alt_orport.addr); + rs_out.ipv6_orport = alt_orport.port; + } rs_out.has_bandwidth = 0; rs_out.has_exitsummary = 0; diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 60a2eae..cda1c00 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -67,6 +67,7 @@ typedef enum { K_OR_ADDRESS, K_P, K_R, + K_A, K_S, K_V, K_W, @@ -338,6 +339,7 @@ static token_rule_t extrainfo_token_table[] = { static token_rule_t rtrstatus_token_table[] = { T01("p", K_P, CONCAT_ARGS, NO_OBJ ), T1( "r", K_R, GE(7), NO_OBJ ), + T0N("a", K_A, GE(1), NO_OBJ ), T1( "s", K_S, ARGS, NO_OBJ ), T01("v", K_V, CONCAT_ARGS, NO_OBJ ), T01("w", K_W, ARGS, NO_OBJ ), @@ -1257,6 +1259,42 @@ dump_distinct_digest_count(int severity) #endif } +/** Try to find an IPv6 OR port in list of directory_token_t's + * with at least one argument (use GE(1) in setup). If found, store + * address and port number to addr_out and + * port_out. Return number of OR ports found. */ +static int +find_single_ipv6_orport(const smartlist_t *list, + tor_addr_t *addr_out, + uint16_t *port_out) +{ + int ret = 0; + tor_assert(list != NULL); + tor_assert(addr_out != NULL); + tor_assert(port_out != NULL); + + SMARTLIST_FOREACH_BEGIN(list, directory_token_t *, t) { + tor_addr_t a; + maskbits_t bits; + uint16_t port_min, port_max; + tor_assert(t->n_args >= 1); + /* XXXX Prop186 the full spec allows much more than this. */ + if (tor_addr_parse_mask_ports(t->args[0], &a, &bits, &port_min, + &port_max) == AF_INET6 && + bits == 128 && + port_min == port_max) { + /* Okay, this is one we can understand. Use it and ignore + any potential more addresses in list. */ + tor_addr_copy(addr_out, &a); + *port_out = port_min; + ret = 1; + break; + } + } SMARTLIST_FOREACH_END(t); + + return ret; +} + /** Helper function: reads a single router entry from *s ... * *end. Mallocs a new router and returns it if all goes well, else * returns NULL. If cache_copy is true, duplicate the contents of @@ -1513,21 +1551,8 @@ router_parse_entry_from_string(const char *s, const char *end, { smartlist_t *or_addresses = find_all_by_keyword(tokens, K_OR_ADDRESS); if (or_addresses) { - SMARTLIST_FOREACH_BEGIN(or_addresses, directory_token_t *, t) { - tor_addr_t a; - maskbits_t bits; - uint16_t port_min, port_max; - /* XXXX Prop186 the full spec allows much more than this. */ - if (tor_addr_parse_mask_ports(t->args[0], &a, &bits, &port_min, - &port_max) == AF_INET6 && - bits == 128 && - port_min == port_max) { - /* Okay, this is one we can understand. */ - tor_addr_copy(&router->ipv6_addr, &a); - router->ipv6_orport = port_min; - break; - } - } SMARTLIST_FOREACH_END(t); + find_single_ipv6_orport(or_addresses, &router->ipv6_addr, + &router->ipv6_orport); smartlist_free(or_addresses); } } @@ -2060,6 +2085,14 @@ routerstatus_parse_entry_from_string(memarea_t *area, rs->dir_port = (uint16_t) tor_parse_long(tok->args[7+offset], 10,0,65535,NULL,NULL); + { + smartlist_t *a_lines = find_all_by_keyword(tokens, K_A); + if (a_lines) { + find_single_ipv6_orport(a_lines, &rs->ipv6_addr, &rs->ipv6_orport); + smartlist_free(a_lines); + } + } + tok = find_opt_by_keyword(tokens, K_S); if (tok && vote) { int i; diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 84705d0..af878a6 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -797,6 +797,7 @@ test_dir_v3_networkstatus(void) networkstatus_t *vote=NULL, *v1=NULL, *v2=NULL, *v3=NULL, *con=NULL, *con_md=NULL; vote_routerstatus_t *vrs; + tor_addr_t addr_ipv6; routerstatus_t *rs; char *v1_text=NULL, *v2_text=NULL, *v3_text=NULL, *consensus_text=NULL, *cp; smartlist_t *votes = smartlist_new(); @@ -893,6 +894,9 @@ test_dir_v3_networkstatus(void) rs->addr = 0x99009901; rs->or_port = 443; rs->dir_port = 0; + tor_addr_parse(&addr_ipv6, "[1:2:3::4]"); + tor_addr_copy(&rs->ipv6_addr, &addr_ipv6); + rs->ipv6_orport = 4711; rs->is_exit = rs->is_stable = rs->is_fast = rs->is_flagged_running = rs->is_valid = rs->is_v2_dir = rs->is_possible_guard = 1; smartlist_add(vote->routerstatus_list, vrs); @@ -987,6 +991,8 @@ test_dir_v3_networkstatus(void) test_eq(rs->addr, 0x99009901); test_eq(rs->or_port, 443); test_eq(rs->dir_port, 0); + test_assert(tor_addr_eq(&rs->ipv6_addr, &addr_ipv6)); + test_eq(rs->ipv6_orport, 4711); test_eq(vrs->flags, U64_LITERAL(254)); // all flags except "authority." { @@ -1169,6 +1175,8 @@ test_dir_v3_networkstatus(void) test_eq(rs->addr, 0x99009901); test_eq(rs->or_port, 443); test_eq(rs->dir_port, 0); + test_assert(tor_addr_eq(&rs->ipv6_addr, &addr_ipv6)); + test_eq(rs->ipv6_orport, 4711); test_assert(!rs->is_authority); test_assert(rs->is_exit); test_assert(rs->is_fast);

1 0

[tor/master] Generate microdescriptors with "a" lines.
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit 68901da5a1dcfb210f7e8210af0b63c6161f9b63 Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Aug 31 23:02:19 2012 +0200 Generate microdescriptors with "a" lines. Generate and store all supported microdescriptor formats. Generate votes with one "m" line for each format. Only "m" lines with version info matching chosen consensus method will be voted upon. An optimisation would be to combine "m" lines with identical hashes, i.e. instead of "m 1,2,3 H1" and "m 4,5 H1", say "m 1,2,3,4,5 H1". --- src/or/dirserv.c | 37 +++++++++++++++++++++-------- src/or/dirvote.c | 69 ++++++++++++++++++++--------------------------------- src/or/dirvote.h | 33 +++++++++++++++++++++++-- 3 files changed, 83 insertions(+), 56 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 5814171..44e5291 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -62,6 +62,16 @@ static cached_dir_t *the_directory = NULL; /** For authoritative directories: the current (v1) network status. */ static cached_dir_t the_runningrouters; +/** Array of start and end of consensus methods used for supported + microdescriptor formats. */ +static const struct consensus_method_range_t { + int low; + int high; +} microdesc_consensus_methods[] = { + {MIN_METHOD_FOR_MICRODESC, MIN_METHOD_FOR_A_LINES - 1}, + {MIN_METHOD_FOR_A_LINES, MAX_SUPPORTED_CONSENSUS_METHOD}, + {-1, -1}}; + static void directory_remove_invalid(void); static cached_dir_t *dirserv_regenerate_directory(void); static char *format_versions_list(config_line_t *ln); @@ -2685,7 +2695,8 @@ dirserv_read_measured_bandwidths(const char *from_file, } /** Return a new networkstatus_t* containing our current opinion. (For v3 - * authorities) */ + * authorities) + */ networkstatus_t * dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, authority_cert_t *cert) @@ -2757,6 +2768,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, microdescriptors = smartlist_new(); SMARTLIST_FOREACH_BEGIN(routers, routerinfo_t *, ri) { + const struct consensus_method_range_t *cmr = NULL; if (ri->cache_info.published_on >= cutoff) { routerstatus_t *rs; vote_routerstatus_t *vrs; @@ -2778,15 +2790,20 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, rs->is_flagged_running = 0; vrs->version = version_from_platform(ri->platform); - md = dirvote_create_microdescriptor(ri); - if (md) { - char buf[128]; - vote_microdesc_hash_t *h; - dirvote_format_microdesc_vote_line(buf, sizeof(buf), md); - h = tor_malloc(sizeof(vote_microdesc_hash_t)); - h->microdesc_hash_line = tor_strdup(buf); - h->next = NULL; - vrs->microdesc = h; + for (cmr = microdesc_consensus_methods; + cmr->low != -1 && cmr->high != -1; + cmr++) { + md = dirvote_create_microdescriptor(ri, cmr->low); + if (md) { + char buf[128]; + vote_microdesc_hash_t *h; + dirvote_format_microdesc_vote_line(buf, sizeof(buf), md, + cmr->low, cmr->high); + h = tor_malloc(sizeof(vote_microdesc_hash_t)); + h->microdesc_hash_line = tor_strdup(buf); + h->next = vrs->microdesc; + vrs->microdesc = h; + } md->last_listed = now; smartlist_add(microdescriptors, md); } diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9056cf5..e6601cf 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -53,32 +53,6 @@ static int dirvote_compute_consensuses(void); static int dirvote_publish_consensus(void); static char *make_consensus_method_list(int low, int high, const char *sep); -/** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 14 - -/** Lowest consensus method that contains a 'directory-footer' marker */ -#define MIN_METHOD_FOR_FOOTER 9 - -/** Lowest consensus method that contains bandwidth weights */ -#define MIN_METHOD_FOR_BW_WEIGHTS 9 - -/** Lowest consensus method that contains consensus params */ -#define MIN_METHOD_FOR_PARAMS 7 - -/** Lowest consensus method that generates microdescriptors */ -#define MIN_METHOD_FOR_MICRODESC 8 - -/** Lowest consensus method that ensures a majority of authorities voted - * for a param. */ -#define MIN_METHOD_FOR_MAJORITY_PARAMS 12 - -/** Lowest consensus method where microdesc consensuses omit any entry - * with no microdesc. */ -#define MIN_METHOD_FOR_MANDATORY_MICRODESC 13 - -/** Lowest consensus method that contains "a" lines. */ -#define MIN_METHOD_FOR_A_LINES 14 - /* ===== * Voting * =====*/ @@ -3570,7 +3544,7 @@ dirvote_get_vote(const char *fp, int flags) * particular method. **/ microdesc_t * -dirvote_create_microdescriptor(const routerinfo_t *ri) +dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) { microdesc_t *result = NULL; char *key = NULL, *summary = NULL, *family = NULL; @@ -3586,6 +3560,12 @@ dirvote_create_microdescriptor(const routerinfo_t *ri) smartlist_add_asprintf(chunks, "onion-key\n%s", key); + if (consensus_method >= MIN_METHOD_FOR_A_LINES && + !tor_addr_is_null(&ri->ipv6_addr) && ri->ipv6_orport) + smartlist_add_asprintf(chunks, "a %s:%d\n", + fmt_and_decorate_addr(&ri->ipv6_addr), + ri->ipv6_orport); + if (family) smartlist_add_asprintf(chunks, "family %s\n", family); @@ -3619,33 +3599,36 @@ dirvote_create_microdescriptor(const routerinfo_t *ri) return result; } -/** Cached space-separated string to hold */ -static char *microdesc_consensus_methods = NULL; - /** Format the appropriate vote line to describe the microdescriptor md * in a consensus vote document. Write it into the out_len-byte buffer * in out. Return -1 on failure and the number of characters written * on success. */ ssize_t -dirvote_format_microdesc_vote_line(char *out, size_t out_len, - const microdesc_t *md) +dirvote_format_microdesc_vote_line(char *out_buf, size_t out_buf_len, + const microdesc_t *md, + int consensus_method_low, + int consensus_method_high) { + int ret = -1; char d64[BASE64_DIGEST256_LEN+1]; - if (!microdesc_consensus_methods) { - microdesc_consensus_methods = - make_consensus_method_list(MIN_METHOD_FOR_MICRODESC, - MAX_SUPPORTED_CONSENSUS_METHOD, - ","); - tor_assert(microdesc_consensus_methods); - } + char *microdesc_consensus_methods = + make_consensus_method_list(consensus_method_low, + consensus_method_high, + ","); + tor_assert(microdesc_consensus_methods); + if (digest256_to_base64(d64, md->digest)<0) - return -1; + goto out; - if (tor_snprintf(out, out_len, "m %s sha256=%s\n", + if (tor_snprintf(out_buf, out_buf_len, "m %s sha256=%s\n", microdesc_consensus_methods, d64)<0) - return -1; + goto out; - return strlen(out); + ret = strlen(out_buf); + + out: + tor_free(microdesc_consensus_methods); + return ret; } /** If vrs has a hash made for the consensus method method with diff --git a/src/or/dirvote.h b/src/or/dirvote.h index e6f9700..b3feeff 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -19,6 +19,32 @@ /** Smallest allowable voting interval. */ #define MIN_VOTE_INTERVAL 300 +/** The highest consensus method that we currently support. */ +#define MAX_SUPPORTED_CONSENSUS_METHOD 14 + +/** Lowest consensus method that contains a 'directory-footer' marker */ +#define MIN_METHOD_FOR_FOOTER 9 + +/** Lowest consensus method that contains bandwidth weights */ +#define MIN_METHOD_FOR_BW_WEIGHTS 9 + +/** Lowest consensus method that contains consensus params */ +#define MIN_METHOD_FOR_PARAMS 7 + +/** Lowest consensus method that generates microdescriptors */ +#define MIN_METHOD_FOR_MICRODESC 8 + +/** Lowest consensus method that ensures a majority of authorities voted + * for a param. */ +#define MIN_METHOD_FOR_MAJORITY_PARAMS 12 + +/** Lowest consensus method where microdesc consensuses omit any entry + * with no microdesc. */ +#define MIN_METHOD_FOR_MANDATORY_MICRODESC 13 + +/** Lowest consensus method that contains "a" lines. */ +#define MIN_METHOD_FOR_A_LINES 14 + void dirvote_free_all(void); /* vote manipulation */ @@ -70,10 +96,11 @@ networkstatus_t * dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, authority_cert_t *cert); -microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri); +microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method); ssize_t dirvote_format_microdesc_vote_line(char *out, size_t out_len, - const microdesc_t *md); - + const microdesc_t *md, + int consensus_method_low, + int consensus_method_high); int vote_routerstatus_find_microdesc_hash(char *digest256_out, const vote_routerstatus_t *vrs, int method,

1 0

[tor/master] Whitespace.
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit 8ef395d6a918f3f216fa24d3c71b444073fe6eb0 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Sep 4 19:28:10 2012 +0200 Whitespace. --- src/or/dirserv.c | 3 +-- src/or/dirvote.c | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 44e5291..09430fe 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2695,8 +2695,7 @@ dirserv_read_measured_bandwidths(const char *from_file, } /** Return a new networkstatus_t* containing our current opinion. (For v3 - * authorities) - */ + * authorities) */ networkstatus_t * dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, authority_cert_t *cert) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 5026605..082a1ef 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -488,7 +488,6 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method, most_alt_orport = smartlist_get_most_frequent(alt_orports, _compare_orports); if (most_alt_orport) { memcpy(best_alt_orport_out, most_alt_orport, sizeof(tor_addr_port_t)); - log_debug(LD_DIR, "\"a\" line winner for %s is %s:%d", most->status.nickname, fmt_and_decorate_addr(&most_alt_orport->addr),

1 0

[tor/master] Remove spurious debug log printout.
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit b337aa4c0e4de4ee9dfda7eb52c4869969ebb94e Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Sep 4 19:27:05 2012 +0200 Remove spurious debug log printout. --- src/or/dirvote.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 2c9e56d..5026605 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -481,9 +481,6 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method, && rs->status.ipv6_orport) { smartlist_add(alt_orports, tor_addr_port_new(&rs->status.ipv6_addr, rs->status.ipv6_orport)); - log_debug(LD_DIR, "picking %s:%d (%s) for voting on \"a\" lines", /* FIXME: remove */ - fmt_and_decorate_addr(&rs->status.ipv6_addr), rs->status.ipv6_orport, - rs->status.nickname); } } SMARTLIST_FOREACH_END(rs);

1 0

[tor/master] Add tor_addr_port_new().
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit 585ef0697811e7d62ab17142c8eed2f9372cd074 Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Aug 31 23:02:19 2012 +0200 Add tor_addr_port_new(). --- src/common/address.c | 12 ++++++++++++ src/common/address.h | 2 ++ src/or/dirvote.c | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index e88869f..e5862be 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1697,3 +1697,15 @@ tor_addr_hostname_is_local(const char *name) !strcasecmpend(name, ".local"); } + +/** Return a newly allocated tor_addr_port_t with addr and + port filled in. */ +tor_addr_port_t * +tor_addr_port_new(const tor_addr_t *addr, uint16_t port) +{ + tor_addr_port_t *ap = tor_malloc_zero(sizeof(tor_addr_port_t)); + if (addr) + tor_addr_copy(&ap->addr, addr); + ap->port = port; + return ap; +} diff --git a/src/common/address.h b/src/common/address.h index c6c1268..27dff66 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -221,5 +221,7 @@ int tor_inet_ntoa(const struct in_addr *in, char *buf, size_t buf_len); char *tor_dup_ip(uint32_t addr) ATTR_MALLOC; int get_interface_address(int severity, uint32_t *addr); +tor_addr_port_t *tor_addr_port_new(const tor_addr_t *addr, uint16_t port); + #endif diff --git a/src/or/dirvote.c b/src/or/dirvote.c index e6601cf..2c9e56d 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -479,8 +479,8 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method, if (compare_vote_rs(most, rs) == 0 && !tor_addr_is_null(&rs->status.ipv6_addr) && rs->status.ipv6_orport) { - smartlist_add(alt_orports, tor_addr_port_alloc(&rs->status.ipv6_addr, - rs->status.ipv6_orport)); + smartlist_add(alt_orports, tor_addr_port_new(&rs->status.ipv6_addr, + rs->status.ipv6_orport)); log_debug(LD_DIR, "picking %s:%d (%s) for voting on \"a\" lines", /* FIXME: remove */ fmt_and_decorate_addr(&rs->status.ipv6_addr), rs->status.ipv6_orport, rs->status.nickname);

1 0

[tor/master] Merge remote-tracking branch 'linus/bug6363_only-ln'
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit ec94d0307e06b9ea5732e86e369dcf5c727f05cb Merge: 730dd9a d34c690 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 4 18:23:18 2012 -0400 Merge remote-tracking branch 'linus/bug6363_only-ln' changes/bug6363 | 3 + src/common/address.c | 12 +++++ src/common/address.h | 2 + src/or/dirserv.c | 48 ++++++++++++++------ src/or/dirvote.c | 123 +++++++++++++++++++++++++++++++++----------------- src/or/dirvote.h | 33 ++++++++++++- src/or/routerparse.c | 63 +++++++++++++++++++------ src/test/test_dir.c | 8 +++ 8 files changed, 218 insertions(+), 74 deletions(-)

1 0

[tor/master] Allocate vote_microdesc_hash_t using tor_malloc_zero().
by nickm＠torproject.org 04 Sep '12

04 Sep '12

commit d34c690e54568a1b7813202509491b75f206e8b9 Author: Linus Nordberg <linus(a)torproject.org> Date: Tue Sep 4 19:44:13 2012 +0200 Allocate vote_microdesc_hash_t using tor_malloc_zero(). In case the struct grows in the future. Shouldn't be too expensive. --- src/or/dirserv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 09430fe..f229e59 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2798,7 +2798,7 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, vote_microdesc_hash_t *h; dirvote_format_microdesc_vote_line(buf, sizeof(buf), md, cmr->low, cmr->high); - h = tor_malloc(sizeof(vote_microdesc_hash_t)); + h = tor_malloc_zero(sizeof(vote_microdesc_hash_t)); h->microdesc_hash_line = tor_strdup(buf); h->next = vrs->microdesc; vrs->microdesc = h;

1 0

r25780: {website} add FoDT mirror and update the table. (in website/trunk: . include)
by Andrew Lewman 04 Sep '12

04 Sep '12

Author: phobos Date: 2012-09-04 21:25:59 +0000 (Tue, 04 Sep 2012) New Revision: 25780 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add FoDT mirror and update the table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-09-02 21:15:00 UTC (rev 25779) +++ website/trunk/include/mirrors-table.wmi 2012-09-04 21:25:59 UTC (rev 25780) @@ -1,6 +1,23 @@ <tr> + <td>DE</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> + <td><a href="http://torproject.lightning-bolt.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>TN</td> <td></td> @@ -18,6 +35,74 @@ <tr> + <td>US</td> + + <td>Quintex</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tormirror.quintex.com/dist/">http</a></td> + <td><a href="http://tormirror.quintex.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>PT</td> + + <td>5ª Coluna</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.pt/dist/">http</a></td> + <td><a href="http://torproject.pt/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + + <td>CCC</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>EE</td> <td>CyberSIDE</td> @@ -52,6 +137,23 @@ <tr> + <td>IT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.jcsh.it/dist/">http</a></td> + <td><a href="http://torproject.jcsh.it/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>AT</td> <td></td> @@ -154,6 +256,23 @@ <tr> + <td>AT</td> + + <td>FoDT</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.fodt.co.at/dist/">http</a></td> + <td><a href="http://tor.fodt.co.at/">http</a></td> + <td><a href="https://tor.fodt.co.at/dist/">https</a></td> + <td><a href="https://tor.fodt.co.at/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td>hessmo</td> @@ -188,23 +307,6 @@ <tr> - <td>LT</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td></td> @@ -290,6 +392,40 @@ <tr> + <td>US</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.mirrors.samwhited.com/dist/">http</a></td> + <td><a href="http://tor.mirrors.samwhited.com/">http</a></td> + <td><a href="https://tor.mirrors.samwhited.com/dist/">https</a></td> + <td><a href="https://tor.mirrors.samwhited.com/">https</a></td> + <td> - </td> + <td><a href="rsync://tor.mirrors.samwhited.com">rsync</a></td> +</tr> + +<tr> + + <td>DE</td> + + <td>factor.cc</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td></td> @@ -375,6 +511,23 @@ <tr> + <td>DE</td> + + <td>beme it</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> + <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> +</tr> + +<tr> + <td>US</td> <td>NW Linux</td> @@ -443,23 +596,6 @@ <tr> - <td>US</td> - - <td>AskApache</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>FR</td> <td>LazyTiger</td> @@ -528,6 +664,23 @@ <tr> + <td>SE</td> + + <td>homosu</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td></td> @@ -579,15 +732,15 @@ <tr> - <td>DK</td> + <td>LT</td> - <td>Zentrum der Gesundheit</td> + <td></td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -596,15 +749,15 @@ <tr> - <td>SE</td> + <td>US</td> - <td>homosu</td> + <td>AskApache</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -681,83 +834,15 @@ <tr> - <td>DE</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torproject.lightning-bolt.net/dist/">http</a></td> - <td><a href="http://torproject.lightning-bolt.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> - <td>Quintex</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tormirror.quintex.com/dist/">http</a></td> - <td><a href="http://tormirror.quintex.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>PT</td> - - <td>5ª Coluna</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://torproject.pt/dist/">http</a></td> - <td><a href="http://torproject.pt/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>NL</td> - - <td>CCC</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>IT</td> - <td></td> - <td>Unknown</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://torproject.jcsh.it/dist/">http</a></td> - <td><a href="http://torproject.jcsh.it/">http</a></td> + <td><a href="http://tor.loritsu.com/dist/">http</a></td> + <td><a href="http://tor.loritsu.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -800,74 +885,6 @@ <tr> - <td>US</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.mirrors.samwhited.com/dist/">http</a></td> - <td><a href="http://tor.mirrors.samwhited.com/">http</a></td> - <td><a href="https://tor.mirrors.samwhited.com/dist/">https</a></td> - <td><a href="https://tor.mirrors.samwhited.com/">https</a></td> - <td> - </td> - <td><a href="rsync://tor.mirrors.samwhited.com">rsync</a></td> -</tr> - -<tr> - - <td>US</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.loritsu.com/dist/">http</a></td> - <td><a href="http://tor.loritsu.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - - <td>factor.cc</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - - <td>beme it</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> - <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> -</tr> - -<tr> - <td>NL</td> <td></td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-09-02 21:15:00 UTC (rev 25779) +++ website/trunk/update-mirrors.pl 2012-09-04 21:25:59 UTC (rev 25780) @@ -1052,6 +1052,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror074 => { + adminContact => "", + orgName => "FoDT", + isoCC => "AT", + subRegion => "", + region => "AT", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.fodt.co.at/", + httpsWebsiteMirror => "https://tor.fodt.co.at/", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://tor.fodt.co.at/dist/", + httpsDistMirror => "https://tor.fodt.co.at/dist/", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0