- tor-commits - lists.torproject.org

[tor/master] Replace _AUTHORITY enum values with _DIRINFO values (automted)
by nickm＠torproject.org 06 May '11

06 May '11

commit 3df22887a3028318dc34a45984a8a195dfc0c026 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 8 14:35:02 2010 -0500 Replace _AUTHORITY enum values with _DIRINFO values (automted) --- src/or/circuitbuild.c | 2 +- src/or/config.c | 56 ++++++++++++++++++++++++------------------------ src/or/control.c | 2 +- src/or/directory.c | 44 ++++++++++++++++++------------------ src/or/dirserv.c | 10 ++++---- src/or/dirvote.c | 10 ++++---- src/or/networkstatus.c | 8 +++--- src/or/or.h | 21 +++++++++-------- src/or/router.c | 20 ++++++++-------- src/or/routerlist.c | 24 ++++++++++---------- src/or/routerlist.h | 2 +- 11 files changed, 100 insertions(+), 99 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5127ec8..e31cc1e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4649,7 +4649,7 @@ retry_bridge_descriptor_fetch_directly(const char *digest) void fetch_bridge_descriptors(or_options_t *options, time_t now) { - int num_bridge_auths = get_n_authorities(BRIDGE_AUTHORITY); + int num_bridge_auths = get_n_authorities(BRIDGE_DIRINFO); int ask_bridge_directly; int can_use_bridge_authority; diff --git a/src/or/config.c b/src/or/config.c index da842da..c936991 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -875,16 +875,16 @@ validate_dir_authorities(or_options_t *options, or_options_t *old_options) /* Now go through the four ways you can configure an alternate * set of directory authorities, and make sure none are broken. */ for (cl = options->DirServers; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, NO_AUTHORITY, 1)<0) + if (parse_dir_server_line(cl->value, NO_DIRINFO, 1)<0) return -1; for (cl = options->AlternateBridgeAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, NO_AUTHORITY, 1)<0) + if (parse_dir_server_line(cl->value, NO_DIRINFO, 1)<0) return -1; for (cl = options->AlternateDirAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, NO_AUTHORITY, 1)<0) + if (parse_dir_server_line(cl->value, NO_DIRINFO, 1)<0) return -1; for (cl = options->AlternateHSAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, NO_AUTHORITY, 1)<0) + if (parse_dir_server_line(cl->value, NO_DIRINFO, 1)<0) return -1; return 0; } @@ -915,27 +915,27 @@ consider_adding_dir_authorities(or_options_t *options, if (!options->DirServers) { /* then we may want some of the defaults */ - dirinfo_type_t type = NO_AUTHORITY; + dirinfo_type_t type = NO_DIRINFO; if (!options->AlternateBridgeAuthority) - type |= BRIDGE_AUTHORITY; + type |= BRIDGE_DIRINFO; if (!options->AlternateDirAuthority) - type |= V1_AUTHORITY | V2_AUTHORITY | V3_AUTHORITY; + type |= V1_DIRINFO | V2_DIRINFO | V3_DIRINFO; if (!options->AlternateHSAuthority) - type |= HIDSERV_AUTHORITY; + type |= HIDSERV_DIRINFO; add_default_trusted_dir_authorities(type); } for (cl = options->DirServers; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, NO_AUTHORITY, 0)<0) + if (parse_dir_server_line(cl->value, NO_DIRINFO, 0)<0) return -1; for (cl = options->AlternateBridgeAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, NO_AUTHORITY, 0)<0) + if (parse_dir_server_line(cl->value, NO_DIRINFO, 0)<0) return -1; for (cl = options->AlternateDirAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, NO_AUTHORITY, 0)<0) + if (parse_dir_server_line(cl->value, NO_DIRINFO, 0)<0) return -1; for (cl = options->AlternateHSAuthority; cl; cl = cl->next) - if (parse_dir_server_line(cl->value, NO_AUTHORITY, 0)<0) + if (parse_dir_server_line(cl->value, NO_DIRINFO, 0)<0) return -1; return 0; } @@ -2849,23 +2849,23 @@ compute_publishserverdescriptor(or_options_t *options) { smartlist_t *list = options->PublishServerDescriptor; dirinfo_type_t *auth = &options->_PublishServerDescriptor; - *auth = NO_AUTHORITY; + *auth = NO_DIRINFO; if (!list) /* empty list, answer is none */ return 0; SMARTLIST_FOREACH(list, const char *, string, { if (!strcasecmp(string, "v1")) - *auth |= V1_AUTHORITY; + *auth |= V1_DIRINFO; else if (!strcmp(string, "1")) if (options->BridgeRelay) - *auth |= BRIDGE_AUTHORITY; + *auth |= BRIDGE_DIRINFO; else - *auth |= V2_AUTHORITY | V3_AUTHORITY; + *auth |= V2_DIRINFO | V3_DIRINFO; else if (!strcasecmp(string, "v2")) - *auth |= V2_AUTHORITY; + *auth |= V2_DIRINFO; else if (!strcasecmp(string, "v3")) - *auth |= V3_AUTHORITY; + *auth |= V3_DIRINFO; else if (!strcasecmp(string, "bridge")) - *auth |= BRIDGE_AUTHORITY; + *auth |= BRIDGE_DIRINFO; else if (!strcasecmp(string, "hidserv")) log_warn(LD_CONFIG, "PublishServerDescriptor hidserv is invalid. See " @@ -3311,9 +3311,9 @@ options_validate(or_options_t *old_options, or_options_t *options, } if ((options->BridgeRelay - || options->_PublishServerDescriptor & BRIDGE_AUTHORITY) + || options->_PublishServerDescriptor & BRIDGE_DIRINFO) && (options->_PublishServerDescriptor - & (V1_AUTHORITY|V2_AUTHORITY|V3_AUTHORITY))) { + & (V1_DIRINFO|V2_DIRINFO|V3_DIRINFO))) { REJECT("Bridges are not supposed to publish router descriptors to the " "directory authorities. Please correct your " "PublishServerDescriptor line."); @@ -4561,7 +4561,7 @@ parse_dir_server_line(const char *line, dirinfo_type_t required_type, uint16_t dir_port = 0, or_port = 0; char digest[DIGEST_LEN]; char v3_digest[DIGEST_LEN]; - dirinfo_type_t type = V2_AUTHORITY; + dirinfo_type_t type = V2_DIRINFO; int is_not_hidserv_authority = 0, is_not_v2_authority = 0; items = smartlist_create(); @@ -4582,13 +4582,13 @@ parse_dir_server_line(const char *line, dirinfo_type_t required_type, if (TOR_ISDIGIT(flag[0])) break; if (!strcasecmp(flag, "v1")) { - type |= (V1_AUTHORITY | HIDSERV_AUTHORITY); + type |= (V1_DIRINFO | HIDSERV_DIRINFO); } else if (!strcasecmp(flag, "hs")) { - type |= HIDSERV_AUTHORITY; + type |= HIDSERV_DIRINFO; } else if (!strcasecmp(flag, "no-hs")) { is_not_hidserv_authority = 1; } else if (!strcasecmp(flag, "bridge")) { - type |= BRIDGE_AUTHORITY; + type |= BRIDGE_DIRINFO; } else if (!strcasecmp(flag, "no-v2")) { is_not_v2_authority = 1; } else if (!strcasecmpstart(flag, "orport=")) { @@ -4605,7 +4605,7 @@ parse_dir_server_line(const char *line, dirinfo_type_t required_type, log_warn(LD_CONFIG, "Bad v3 identity digest '%s' on DirServer line", flag); } else { - type |= V3_AUTHORITY; + type |= V3_DIRINFO; } } else { log_warn(LD_CONFIG, "Unrecognized flag '%s' on DirServer line", @@ -4615,9 +4615,9 @@ parse_dir_server_line(const char *line, dirinfo_type_t required_type, smartlist_del_keeporder(items, 0); } if (is_not_hidserv_authority) - type &= ~HIDSERV_AUTHORITY; + type &= ~HIDSERV_DIRINFO; if (is_not_v2_authority) - type &= ~V2_AUTHORITY; + type &= ~V2_DIRINFO; if (smartlist_len(items) < 2) { log_warn(LD_CONFIG, "Too few arguments to DirServer line."); diff --git a/src/or/control.c b/src/or/control.c index 705bdc1..eb8288f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1847,7 +1847,7 @@ getinfo_helper_events(control_connection_t *control_conn, } else if (!strcmp(question, "status/version/num-versioning") || !strcmp(question, "status/version/num-concurring")) { char s[33]; - tor_snprintf(s, sizeof(s), "%d", get_n_authorities(V3_AUTHORITY)); + tor_snprintf(s, sizeof(s), "%d", get_n_authorities(V3_DIRINFO)); *answer = tor_strdup(s); log_warn(LD_GENERAL, "%s is deprecated; it no longer gives useful " "information", question); diff --git a/src/or/directory.c b/src/or/directory.c index 3effd37..f21dc85 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -153,15 +153,15 @@ dirinfo_type_to_string(dirinfo_type_t auth) { char *result; smartlist_t *lst = smartlist_create(); - if (auth & V1_AUTHORITY) + if (auth & V1_DIRINFO) smartlist_add(lst, (void*)"V1"); - if (auth & V2_AUTHORITY) + if (auth & V2_DIRINFO) smartlist_add(lst, (void*)"V2"); - if (auth & V3_AUTHORITY) + if (auth & V3_DIRINFO) smartlist_add(lst, (void*)"V3"); - if (auth & BRIDGE_AUTHORITY) + if (auth & BRIDGE_DIRINFO) smartlist_add(lst, (void*)"Bridge"); - if (auth & HIDSERV_AUTHORITY) + if (auth & HIDSERV_DIRINFO) smartlist_add(lst, (void*)"Hidden service"); if (smartlist_len(lst)) { result = smartlist_join_strings(lst, ", ", 0, NULL); @@ -356,30 +356,30 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, * it elsewhere in directory.c. -RD */ switch (dir_purpose) { case DIR_PURPOSE_FETCH_EXTRAINFO: - type = EXTRAINFO_CACHE | - (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : - V3_AUTHORITY); + type = EXTRAINFO_DIRINFO | + (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_DIRINFO : + V3_DIRINFO); break; case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: - type = V2_AUTHORITY; + type = V2_DIRINFO; break; case DIR_PURPOSE_FETCH_SERVERDESC: - type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : - V3_AUTHORITY); + type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_DIRINFO : + V3_DIRINFO); break; case DIR_PURPOSE_FETCH_RENDDESC: - type = HIDSERV_AUTHORITY; + type = HIDSERV_DIRINFO; break; case DIR_PURPOSE_FETCH_STATUS_VOTE: case DIR_PURPOSE_FETCH_DETACHED_SIGNATURES: - type = V3_AUTHORITY; + type = V3_DIRINFO; break; case DIR_PURPOSE_FETCH_CONSENSUS: case DIR_PURPOSE_FETCH_CERTIFICATE: - type = V3_AUTHORITY; + type = V3_DIRINFO; break; case DIR_PURPOSE_FETCH_MICRODESC: - type = V3_AUTHORITY; + type = V3_DIRINFO; break; default: log_warn(LD_BUG, "Unexpected purpose %d", (int)dir_purpose); @@ -407,11 +407,11 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, } } - if (!options->FetchServerDescriptors && type != HIDSERV_AUTHORITY) + if (!options->FetchServerDescriptors && type != HIDSERV_DIRINFO) return; if (!get_via_tor) { - if (options->UseBridges && type != BRIDGE_AUTHORITY) { + if (options->UseBridges && type != BRIDGE_DIRINFO) { /* want to ask a running bridge for which we have a descriptor. */ /* XXX023 we assume that all of our bridges can answer any * possible directory question. This won't be true forever. -RD */ @@ -435,7 +435,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, "nodes are available yet."); return; } else { - if (prefer_authority || type == BRIDGE_AUTHORITY) { + if (prefer_authority || type == BRIDGE_DIRINFO) { /* only ask authdirservers, and don't ask myself */ rs = router_pick_trusteddirserver(type, pds_flags); if (rs == NULL && (pds_flags & (PDS_NO_EXISTING_SERVERDESC_FETCH| @@ -457,7 +457,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, } } } - if (!rs && type != BRIDGE_AUTHORITY) { + if (!rs && type != BRIDGE_DIRINFO) { /* anybody with a non-zero dirport will do */ rs = router_pick_directory_server(type, pds_flags); if (!rs) { @@ -474,7 +474,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, if (dir_purpose == DIR_PURPOSE_FETCH_RENDDESC) { /* only ask hidserv authorities, any of them will do */ pds_flags |= PDS_IGNORE_FASCISTFIREWALL|PDS_ALLOW_SELF; - rs = router_pick_trusteddirserver(HIDSERV_AUTHORITY, pds_flags); + rs = router_pick_trusteddirserver(HIDSERV_DIRINFO, pds_flags); } else { /* anybody with a non-zero dirport will do. Disregard firewalls. */ pds_flags |= PDS_IGNORE_FASCISTFIREWALL; @@ -520,7 +520,7 @@ directory_get_from_all_authorities(uint8_t dir_purpose, routerstatus_t *rs; if (router_digest_is_me(ds->digest)) continue; - if (!(ds->type & V3_AUTHORITY)) + if (!(ds->type & V3_DIRINFO)) continue; rs = &ds->fake_status; directory_initiate_command_routerstatus(rs, dir_purpose, router_purpose, @@ -1047,7 +1047,7 @@ directory_get_consensus_url(int supports_conditional_consensus, trusted_dir_server_t *, ds, { char *hex; - if (!(ds->type & V3_AUTHORITY)) + if (!(ds->type & V3_DIRINFO)) continue; hex = tor_malloc(2*CONDITIONAL_CONSENSUS_FPR_LEN+1); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index c42c4fe..0ac2d80 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1555,8 +1555,8 @@ dirserv_pick_cached_dir_obj(cached_dir_t *cache_src, dirinfo_type_t auth_type) { or_options_t *options = get_options(); - int authority = (auth_type == V1_AUTHORITY && authdir_mode_v1(options)) || - (auth_type == V2_AUTHORITY && authdir_mode_v2(options)); + int authority = (auth_type == V1_DIRINFO && authdir_mode_v1(options)) || + (auth_type == V2_DIRINFO && authdir_mode_v2(options)); if (!authority || authdir_mode_bridge(options)) { return cache_src; @@ -1585,7 +1585,7 @@ dirserv_get_directory(void) return dirserv_pick_cached_dir_obj(cached_directory, the_directory, the_directory_is_dirty, dirserv_regenerate_directory, - "v1 server directory", V1_AUTHORITY); + "v1 server directory", V1_DIRINFO); } /** Only called by v1 auth dirservers. @@ -1678,7 +1678,7 @@ dirserv_get_runningrouters(void) &cached_runningrouters, &the_runningrouters, runningrouters_is_dirty, generate_runningrouters, - "v1 network status list", V1_AUTHORITY); + "v1 network status list", V1_DIRINFO); } /** Return the latest downloaded consensus networkstatus in encoded, signed, @@ -2967,7 +2967,7 @@ dirserv_get_networkstatus_v2_fingerprints(smartlist_t *result, } else { SMARTLIST_FOREACH(router_get_trusted_dir_servers(), trusted_dir_server_t *, ds, - if (ds->type & V2_AUTHORITY) + if (ds->type & V2_DIRINFO) smartlist_add(result, tor_memdup(ds->digest, DIGEST_LEN))); } smartlist_sort_digests(result); diff --git a/src/or/dirvote.c b/src/or/dirvote.c index b90684c..fa403e0 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2742,7 +2742,7 @@ dirvote_perform_vote(void) directory_post_to_dirservers(DIR_PURPOSE_UPLOAD_VOTE, ROUTER_PURPOSE_GENERAL, - V3_AUTHORITY, + V3_DIRINFO, pending_vote->vote_body->dir, pending_vote->vote_body->dir_len, 0); log_notice(LD_DIR, "Vote posted."); @@ -2761,7 +2761,7 @@ dirvote_fetch_missing_votes(void) SMARTLIST_FOREACH(router_get_trusted_dir_servers(), trusted_dir_server_t *, ds, { - if (!(ds->type & V3_AUTHORITY)) + if (!(ds->type & V3_DIRINFO)) continue; if (!dirvote_get_vote(ds->v3_identity_digest, DGV_BY_ID|DGV_INCLUDE_PENDING)) { @@ -2874,7 +2874,7 @@ list_v3_auth_ids(void) char *keys; SMARTLIST_FOREACH(router_get_trusted_dir_servers(), trusted_dir_server_t *, ds, - if ((ds->type & V3_AUTHORITY) && + if ((ds->type & V3_DIRINFO) && !tor_digest_is_zero(ds->v3_identity_digest)) smartlist_add(known_v3_keys, tor_strdup(hex_str(ds->v3_identity_digest, DIGEST_LEN)))); @@ -3069,7 +3069,7 @@ dirvote_compute_consensuses(void) if (!pending_vote_list) pending_vote_list = smartlist_create(); - n_voters = get_n_authorities(V3_AUTHORITY); + n_voters = get_n_authorities(V3_DIRINFO); n_votes = smartlist_len(pending_vote_list); if (n_votes <= n_voters/2) { log_warn(LD_DIR, "We don't have enough votes to generate a consensus: " @@ -3208,7 +3208,7 @@ dirvote_compute_consensuses(void) directory_post_to_dirservers(DIR_PURPOSE_UPLOAD_SIGNATURES, ROUTER_PURPOSE_GENERAL, - V3_AUTHORITY, + V3_DIRINFO, pending_consensus_signatures, strlen(pending_consensus_signatures), 0); log_notice(LD_DIR, "Signature(s) posted."); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 50982d7..b191f57 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -482,7 +482,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, int n_bad = 0; int n_unknown = 0; int n_no_signature = 0; - int n_v3_authorities = get_n_authorities(V3_AUTHORITY); + int n_v3_authorities = get_n_authorities(V3_DIRINFO); int n_required = n_v3_authorities/2 + 1; smartlist_t *need_certs_from = smartlist_create(); smartlist_t *unrecognized = smartlist_create(); @@ -553,7 +553,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, SMARTLIST_FOREACH(router_get_trusted_dir_servers(), trusted_dir_server_t *, ds, { - if ((ds->type & V3_AUTHORITY) && + if ((ds->type & V3_DIRINFO) && !networkstatus_get_voter_by_id(consensus, ds->v3_identity_digest)) smartlist_add(missing_authorities, ds); }); @@ -736,7 +736,7 @@ router_set_networkstatus_v2(const char *s, time_t arrived_at, base16_encode(fp, HEX_DIGEST_LEN+1, ns->identity_digest, DIGEST_LEN); if (!(trusted_dir = router_get_trusteddirserver_by_digest(ns->identity_digest)) || - !(trusted_dir->type & V2_AUTHORITY)) { + !(trusted_dir->type & V2_DIRINFO)) { log_info(LD_DIR, "Network status was signed, but not by an authoritative " "directory we recognize."); source_desc = fp; @@ -1130,7 +1130,7 @@ update_v2_networkstatus_cache_downloads(time_t now) { char resource[HEX_DIGEST_LEN+6]; /* fp/hexdigit.z\0 */ tor_addr_t addr; - if (!(ds->type & V2_AUTHORITY)) + if (!(ds->type & V2_DIRINFO)) continue; if (router_digest_is_me(ds->digest)) continue; diff --git a/src/or/or.h b/src/or/or.h index 62054a3..a976916 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2090,23 +2090,24 @@ typedef struct authority_cert_t { uint8_t is_cross_certified; } authority_cert_t; -/** Bitfield enum type listing types of directory authority/directory - * server. */ +/** Bitfield enum type listing types of information that directory authorities + * can be authoritative about, and that directory caches may or may not cache. + */ typedef enum { - NO_AUTHORITY = 0, + NO_DIRINFO = 0, /** Serves/signs v1 directory information: Big lists of routers, and short * routerstatus documents. */ - V1_AUTHORITY = 1 << 0, + V1_DIRINFO = 1 << 0, /** Serves/signs v2 directory information: i.e. v2 networkstatus documents */ - V2_AUTHORITY = 1 << 1, + V2_DIRINFO = 1 << 1, /** Serves/signs v3 directory information: votes, consensuses, certs */ - V3_AUTHORITY = 1 << 2, + V3_DIRINFO = 1 << 2, /** Serves hidden service descriptors. */ - HIDSERV_AUTHORITY = 1 << 3, + HIDSERV_DIRINFO = 1 << 3, /** Serves bridge descriptors. */ - BRIDGE_AUTHORITY = 1 << 4, - /** Serves extrainfo documents. (XXX Not precisely an authority type)*/ - EXTRAINFO_CACHE = 1 << 5, + BRIDGE_DIRINFO = 1 << 4, + /** Serves extrainfo documents. */ + EXTRAINFO_DIRINFO = 1 << 5, } dirinfo_type_t; #define CRYPT_PATH_MAGIC 0x70127012u diff --git a/src/or/router.c b/src/or/router.c index 5f51935..e4dab0e 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -697,11 +697,11 @@ init_keys(void) } /* 6b. [authdirserver only] add own key to approved directories. */ crypto_pk_get_digest(get_server_identity_key(), digest); - type = ((options->V1AuthoritativeDir ? V1_AUTHORITY : NO_AUTHORITY) | - (options->V2AuthoritativeDir ? V2_AUTHORITY : NO_AUTHORITY) | - (options->V3AuthoritativeDir ? V3_AUTHORITY : NO_AUTHORITY) | - (options->BridgeAuthoritativeDir ? BRIDGE_AUTHORITY : NO_AUTHORITY) | - (options->HSAuthoritativeDir ? HIDSERV_AUTHORITY : NO_AUTHORITY)); + type = ((options->V1AuthoritativeDir ? V1_DIRINFO : NO_DIRINFO) | + (options->V2AuthoritativeDir ? V2_DIRINFO : NO_DIRINFO) | + (options->V3AuthoritativeDir ? V3_DIRINFO : NO_DIRINFO) | + (options->BridgeAuthoritativeDir ? BRIDGE_DIRINFO : NO_DIRINFO) | + (options->HSAuthoritativeDir ? HIDSERV_DIRINFO : NO_DIRINFO)); ds = router_get_trusteddirserver_by_digest(digest); if (!ds) { @@ -723,7 +723,7 @@ init_keys(void) type, ds->type); ds->type = type; } - if (v3_digest_set && (ds->type & V3_AUTHORITY) && + if (v3_digest_set && (ds->type & V3_DIRINFO) && memcmp(v3_digest, ds->v3_identity_digest, DIGEST_LEN)) { log_warn(LD_DIR, "V3 identity key does not match identity declared in " "DirServer line. Adjusting."); @@ -910,7 +910,7 @@ router_orport_found_reachable(void) if (!can_reach_or_port && me) { log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from " "the outside. Excellent.%s", - get_options()->_PublishServerDescriptor != NO_AUTHORITY ? + get_options()->_PublishServerDescriptor != NO_DIRINFO ? " Publishing server descriptor." : ""); can_reach_or_port = 1; mark_my_descriptor_dirty(); @@ -1135,7 +1135,7 @@ decide_if_publishable_server(void) if (options->ClientOnly) return 0; - if (options->_PublishServerDescriptor == NO_AUTHORITY) + if (options->_PublishServerDescriptor == NO_DIRINFO) return 0; if (!server_mode(options)) return 0; @@ -1203,7 +1203,7 @@ router_upload_dir_desc_to_dirservers(int force) return; } ei = router_get_my_extrainfo(); - if (auth == NO_AUTHORITY) + if (auth == NO_DIRINFO) return; if (!force && !desc_needs_upload) return; @@ -1220,7 +1220,7 @@ router_upload_dir_desc_to_dirservers(int force) msg[desc_len+extra_len] = 0; directory_post_to_dirservers(DIR_PURPOSE_UPLOAD_DIR, - (auth & BRIDGE_AUTHORITY) ? + (auth & BRIDGE_DIRINFO) ? ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL, auth, msg, desc_len, extra_len); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 39ff6e0..8bcfa05 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -120,7 +120,7 @@ get_n_authorities(dirinfo_type_t type) return n; } -#define get_n_v2_authorities() get_n_authorities(V2_AUTHORITY) +#define get_n_v2_authorities() get_n_authorities(V2_DIRINFO) /** Helper: Return the cert_list_t for an authority whose authority ID is * <b>id_digest</b>, allocating a new list if necessary. */ @@ -518,7 +518,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) } SMARTLIST_FOREACH_BEGIN(trusted_dir_servers, trusted_dir_server_t *, ds) { int found = 0; - if (!(ds->type & V3_AUTHORITY)) + if (!(ds->type & V3_DIRINFO)) continue; if (smartlist_digest_isin(missing_digests, ds->v3_identity_digest)) continue; @@ -976,7 +976,7 @@ router_get_my_share_of_directory_requests(double *v2_share_out, /* XXXX This is a bit of a kludge */ if (rs->is_v2_dir) { sl_last_total_weighted_bw = 0; - router_pick_directory_server(V2_AUTHORITY, pds_flags); + router_pick_directory_server(V2_DIRINFO, pds_flags); if (sl_last_total_weighted_bw != 0) { *v2_share_out = U64_TO_DBL(sl_last_weighted_bw_of_me) / U64_TO_DBL(sl_last_total_weighted_bw); @@ -985,7 +985,7 @@ router_get_my_share_of_directory_requests(double *v2_share_out, if (rs->version_supports_v3_dir) { sl_last_total_weighted_bw = 0; - router_pick_directory_server(V3_AUTHORITY, pds_flags); + router_pick_directory_server(V3_DIRINFO, pds_flags); if (sl_last_total_weighted_bw != 0) { *v3_share_out = U64_TO_DBL(sl_last_weighted_bw_of_me) / U64_TO_DBL(sl_last_total_weighted_bw); @@ -1026,7 +1026,7 @@ trusteddirserver_get_by_v3_auth_digest(const char *digest) SMARTLIST_FOREACH(trusted_dir_servers, trusted_dir_server_t *, ds, { if (!memcmp(ds->v3_identity_digest, digest, DIGEST_LEN) && - (ds->type & V3_AUTHORITY)) + (ds->type & V3_DIRINFO)) return ds; }); @@ -1115,16 +1115,16 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags) continue; if (requireother && router_digest_is_me(node->identity)) continue; - if (type & V3_AUTHORITY) { + if (type & V3_DIRINFO) { if (!(status->version_supports_v3_dir || router_digest_is_trusted_dir_type(node->identity, - V3_AUTHORITY))) + V3_DIRINFO))) continue; } is_trusted = router_digest_is_trusted_dir(node->identity); - if ((type & V2_AUTHORITY) && !(node->rs->is_v2_dir || is_trusted)) + if ((type & V2_DIRINFO) && !(node->rs->is_v2_dir || is_trusted)) continue; - if ((type & EXTRAINFO_CACHE) && + if ((type & EXTRAINFO_DIRINFO) && !router_supports_extrainfo(node->identity, 0)) continue; if (try_excluding && options->ExcludeNodes && @@ -1227,7 +1227,7 @@ router_pick_trusteddirserver_impl(dirinfo_type_t type, int flags, if (!d->is_running) continue; if ((type & d->type) == 0) continue; - if ((type & EXTRAINFO_CACHE) && + if ((type & EXTRAINFO_DIRINFO) && !router_supports_extrainfo(d->digest, 1)) continue; if (requireother && me && router_digest_is_me(d->digest)) @@ -4084,7 +4084,7 @@ add_trusted_dir_server(const char *nickname, const char *address, ent->is_running = 1; ent->type = type; memcpy(ent->digest, digest, DIGEST_LEN); - if (v3_auth_digest && (type & V3_AUTHORITY)) + if (v3_auth_digest && (type & V3_DIRINFO)) memcpy(ent->v3_identity_digest, v3_auth_digest, DIGEST_LEN); dlen = 64 + strlen(hostname) + (nickname?strlen(nickname):0); @@ -4163,7 +4163,7 @@ int any_trusted_dir_is_v1_authority(void) { if (trusted_dir_servers) - return get_n_authorities(V1_AUTHORITY) > 0; + return get_n_authorities(V1_DIRINFO) > 0; return 0; } diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 987fdf2..41a4c90 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -60,7 +60,7 @@ int router_digest_version_as_new_as(const char *digest, const char *cutoff); int router_digest_is_trusted_dir_type(const char *digest, dirinfo_type_t type); #define router_digest_is_trusted_dir(d) \ - router_digest_is_trusted_dir_type((d), NO_AUTHORITY) + router_digest_is_trusted_dir_type((d), NO_DIRINFO) int router_addr_is_trusted_dir(uint32_t addr); int hexdigest_to_digest(const char *hexdigest, char *digest);

1 0

[tor/master] Code to make clients fetch and use microdescriptors for circuit building
by nickm＠torproject.org 06 May '11

06 May '11

commit 4cc348e896f74a4e02ef15a77d22fc636b08afae Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 8 14:21:32 2010 -0500 Code to make clients fetch and use microdescriptors for circuit building To turn this on, set UseMicrodescriptors to "1" (or "auto" if you want it on-if-you're-a-client). It should go auto-by-default once 0.2.3.1-alpha is released. Because of our node logic, directory caches will never use microdescriptors when they have the right routerinfo available. --- changes/microdesc_use | 10 +++++++++ src/or/config.c | 6 +++- src/or/directory.c | 11 +++++---- src/or/directory.h | 1 - src/or/microdesc.c | 53 ++++++++++++++++++++++++++++++++++++++++++++--- src/or/microdesc.h | 5 ++++ src/or/networkstatus.c | 18 +++++++++------- src/or/or.h | 22 +++++++++++++++---- src/or/router.c | 3 +- src/or/routerlist.c | 41 +++++++++++++++++++------------------ src/or/routerlist.h | 1 - src/or/routerparse.c | 3 ++ 12 files changed, 127 insertions(+), 47 deletions(-) diff --git a/changes/microdesc_use b/changes/microdesc_use new file mode 100644 index 0000000..89faf7c --- /dev/null +++ b/changes/microdesc_use @@ -0,0 +1,10 @@ + o Major features + - Clients can now use microdescriptors instead of regular descriptors + to build circuits. Microdescriptors are authority-generated and + -authenticated summaries of regular descriptors' contents, designed + to change very rarely. This feature is designed to save bandwidth, + especially for clients on slow internet connections. It's off + by default for now, since nearly no caches support it, but it will + be on-by-default for clients in a future version. You can use the + UseMicrodescriptors option to turn it on. + diff --git a/src/or/config.c b/src/or/config.c index c936991..09ad51f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -381,6 +381,7 @@ static config_var_t _option_vars[] = { V(UpdateBridgesFromAuthority, BOOL, "0"), V(UseBridges, BOOL, "0"), V(UseEntryGuards, BOOL, "1"), + V(UseMicrodescriptors, AUTOBOOL, "0"), V(User, STRING, NULL), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir, "0"), @@ -919,7 +920,8 @@ consider_adding_dir_authorities(or_options_t *options, if (!options->AlternateBridgeAuthority) type |= BRIDGE_DIRINFO; if (!options->AlternateDirAuthority) - type |= V1_DIRINFO | V2_DIRINFO | V3_DIRINFO; + type |= V1_DIRINFO | V2_DIRINFO | V3_DIRINFO | EXTRAINFO_DIRINFO | + MICRODESC_DIRINFO; if (!options->AlternateHSAuthority) type |= HIDSERV_DIRINFO; add_default_trusted_dir_authorities(type); @@ -4605,7 +4607,7 @@ parse_dir_server_line(const char *line, dirinfo_type_t required_type, log_warn(LD_CONFIG, "Bad v3 identity digest '%s' on DirServer line", flag); } else { - type |= V3_DIRINFO; + type |= V3_DIRINFO|EXTRAINFO_DIRINFO|MICRODESC_DIRINFO; } } else { log_warn(LD_CONFIG, "Unrecognized flag '%s' on DirServer line", diff --git a/src/or/directory.c b/src/or/directory.c index f21dc85..184a6b4 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -147,9 +147,10 @@ purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose) return 1; } -/** Return a newly allocated string describing <b>auth</b>. */ -char * -dirinfo_type_to_string(dirinfo_type_t auth) +/** Return a newly allocated string describing <b>auth</b>. Only describes + * authority features. */ +static char * +authdir_type_to_string(dirinfo_type_t auth) { char *result; smartlist_t *lst = smartlist_create(); @@ -328,7 +329,7 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, NULL, payload, upload_len, 0); } SMARTLIST_FOREACH_END(ds); if (!found) { - char *s = dirinfo_type_to_string(type); + char *s = authdir_type_to_string(type); log_warn(LD_DIR, "Publishing server descriptor to directory authorities " "of type '%s', but no authorities of that type listed!", s); tor_free(s); @@ -379,7 +380,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, type = V3_DIRINFO; break; case DIR_PURPOSE_FETCH_MICRODESC: - type = V3_DIRINFO; + type = MICRODESC_DIRINFO; break; default: log_warn(LD_BUG, "Unexpected purpose %d", (int)dir_purpose); diff --git a/src/or/directory.h b/src/or/directory.h index 9f4c31d..caff938 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -13,7 +13,6 @@ #define _TOR_DIRECTORY_H int directories_have_accepted_server_descriptor(void); -char *dirinfo_type_to_string(dirinfo_type_t auth); void directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, dirinfo_type_t type, const char *payload, size_t payload_len, size_t extrainfo_len); diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 6209bbf..0e8aa83 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -9,6 +9,7 @@ #include "networkstatus.h" #include "nodelist.h" #include "policies.h" +#include "router.h" #include "routerlist.h" #include "routerparse.h" @@ -251,6 +252,9 @@ microdescs_add_list_to_cache(microdesc_cache_t *cache, SMARTLIST_FOREACH(added, microdesc_t *, md, nodelist_add_microdesc(md)); } + if (smartlist_len(added)) + router_dir_info_changed(); + return added; } @@ -570,6 +574,8 @@ microdesc_list_missing_digest256(networkstatus_t *ns, microdesc_cache_t *cache, continue; if (skip && digestmap_get(skip, rs->descriptor_digest)) continue; + if (tor_mem_is_zero(rs->descriptor_digest, DIGEST256_LEN)) + continue; /* This indicates a bug somewhere XXXX023*/ /* XXXX Also skip if we're a noncache and wouldn't use this router. * XXXX NM Microdesc */ @@ -602,11 +608,8 @@ update_microdesc_downloads(time_t now) if (!consensus) return; - if (!directory_caches_dir_info(options)) { - /* Right now, only caches fetch microdescriptors. - * XXXX NM Microdescs */ + if (!we_fetch_microdescriptors(options)) return; - } pending = digestmap_new(); list_pending_microdesc_downloads(pending); @@ -647,3 +650,45 @@ update_microdescs_from_networkstatus(time_t now) } SMARTLIST_FOREACH_END(rs); } +/** Return true iff we should prefer to use microdescriptors rather than + * routerdescs for building circuits. */ +int +we_use_microdescriptors_for_circuits(or_options_t *options) +{ + int ret = options->UseMicrodescriptors; + if (ret == -1) { + /* UseMicrodescriptors is "auto"; we need to decide: */ + /* So we decide that we'll use microdescriptors iff we are not a server */ + ret = ! server_mode(options); + } + return ret; +} + +/** Return true iff we should try to download microdescriptors at all. */ +int +we_fetch_microdescriptors(or_options_t *options) +{ + if (directory_caches_dir_info(options)) + return 1; + return we_use_microdescriptors_for_circuits(options); +} + +/** Return true iff we should try to download router descriptors at all. */ +int +we_fetch_router_descriptors(or_options_t *options) +{ + if (directory_caches_dir_info(options)) + return 1; + return ! we_use_microdescriptors_for_circuits(options); +} + +/** Return the consensus flavor we actually want to use to build circuits. */ +int +usable_consensus_flavor(void) +{ + if (we_use_microdescriptors_for_circuits(get_options())) { + return FLAV_MICRODESC; + } else { + return FLAV_NS; + } +} diff --git a/src/or/microdesc.h b/src/or/microdesc.h index c967742..94b1ff6 100644 --- a/src/or/microdesc.h +++ b/src/or/microdesc.h @@ -43,5 +43,10 @@ void microdesc_free_all(void); void update_microdesc_downloads(time_t now); void update_microdescs_from_networkstatus(time_t now); +int usable_consensus_flavor(void); +int we_fetch_microdescriptors(or_options_t *options); +int we_fetch_router_descriptors(or_options_t *options); +int we_use_microdescriptors_for_circuits(or_options_t *options); + #endif diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index b191f57..663d1ad 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -50,7 +50,9 @@ static strmap_t *unnamed_server_map = NULL; * of whichever type we are using for our own circuits. This will be the same * as one of current_ns_consensus or current_md_consensus. */ -#define current_consensus current_ns_consensus +#define current_consensus \ + (we_use_microdescriptors_for_circuits(get_options()) ? \ + current_md_consensus : current_ns_consensus) /** Most recently received and validated v3 "ns"-flavored consensus network * status. */ @@ -1187,7 +1189,7 @@ we_want_to_fetch_flavor(or_options_t *options, int flavor) } /* Otherwise, we want the flavor only if we want to use it to build * circuits. */ - return (flavor == USABLE_CONSENSUS_FLAVOR); + return flavor == usable_consensus_flavor(); } /** How many times will we try to fetch a consensus before we give up? */ @@ -1392,7 +1394,7 @@ update_certificate_downloads(time_t now) int consensus_is_waiting_for_certs(void) { - return consensus_waiting_for_certs[USABLE_CONSENSUS_FLAVOR].consensus + return consensus_waiting_for_certs[usable_consensus_flavor()].consensus ? 1 : 0; } @@ -1621,7 +1623,7 @@ networkstatus_set_current_consensus(const char *consensus, flavor = networkstatus_get_flavor_name(flav); } - if (flav != USABLE_CONSENSUS_FLAVOR && + if (flav != usable_consensus_flavor() && !directory_caches_dir_info(options)) { /* This consensus is totally boring to us: we won't use it, and we won't * serve it. Drop it. */ @@ -1726,14 +1728,14 @@ networkstatus_set_current_consensus(const char *consensus, } } - if (!from_cache && flav == USABLE_CONSENSUS_FLAVOR) + if (!from_cache && flav == usable_consensus_flavor()) control_event_client_status(LOG_NOTICE, "CONSENSUS_ARRIVED"); /* Are we missing any certificates at all? */ if (r != 1 && dl_certs) authority_certs_fetch_missing(c, now); - if (flav == USABLE_CONSENSUS_FLAVOR) { + if (flav == usable_consensus_flavor()) { notify_control_networkstatus_changed(current_consensus, c); } if (flav == FLAV_NS) { @@ -1780,8 +1782,8 @@ networkstatus_set_current_consensus(const char *consensus, download_status_failed(&consensus_dl_status[flav], 0); } - if (flav == USABLE_CONSENSUS_FLAVOR) { - /* XXXXNM Microdescs: needs a non-ns variant. */ + if (flav == usable_consensus_flavor()) { + /* XXXXNM Microdescs: needs a non-ns variant. ???? NM*/ update_consensus_networkstatus_fetch_time(now); nodelist_set_consensus(current_consensus); diff --git a/src/or/or.h b/src/or/or.h index a976916..f45ccb7 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1641,6 +1641,9 @@ typedef struct routerstatus_t { /** True iff this router is a version that, if it caches directory info, * we can get v3 downloads from. */ unsigned int version_supports_v3_dir:1; + /** True iff this router is a version that, if it caches directory info, + * we can get microdescriptors from. */ + unsigned int version_supports_microdesc_cache:1; unsigned int has_bandwidth:1; /**< The vote/consensus had bw info */ unsigned int has_exitsummary:1; /**< The vote/consensus had exit summaries */ @@ -1918,9 +1921,6 @@ typedef enum { FLAV_MICRODESC = 1, } consensus_flavor_t; -/** Which consensus flavor do we actually want to use to build circuits? */ -#define USABLE_CONSENSUS_FLAVOR FLAV_NS - /** How many different consensus flavors are there? */ #define N_CONSENSUS_FLAVORS ((int)(FLAV_MICRODESC)+1) @@ -2092,6 +2092,12 @@ typedef struct authority_cert_t { /** Bitfield enum type listing types of information that directory authorities * can be authoritative about, and that directory caches may or may not cache. + * + * Note that the granularity here is based on authority granularity and on + * cache capabilities. Thus, one particular bit may correspond in practice to + * a few types of directory info, so long as every authority that pronounces + * officially about one of the types prounounces officially about all of them, + * and so long as every cache that caches one of them caches all of them. */ typedef enum { NO_DIRINFO = 0, @@ -2107,7 +2113,9 @@ typedef enum { /** Serves bridge descriptors. */ BRIDGE_DIRINFO = 1 << 4, /** Serves extrainfo documents. */ - EXTRAINFO_DIRINFO = 1 << 5, + EXTRAINFO_DIRINFO=1 << 5, + /** Serves microdescriptors. */ + MICRODESC_DIRINFO=1 << 6, } dirinfo_type_t; #define CRYPT_PATH_MAGIC 0x70127012u @@ -2642,7 +2650,7 @@ typedef struct { /** To what authority types do we publish our descriptor? Choices are * "v1", "v2", "v3", "bridge", or "". */ smartlist_t *PublishServerDescriptor; - /** An authority type, derived from PublishServerDescriptor. */ + /** A bitfield of authority types, derived from PublishServerDescriptor. */ dirinfo_type_t _PublishServerDescriptor; /** Boolean: do we publish hidden service descriptors to the HS auths? */ int PublishHidServDescriptors; @@ -3043,6 +3051,10 @@ typedef struct { * the defaults have changed. */ int _UsingTestNetworkDefaults; + /** If 1, we try to use microdescriptors to build circuits. If 0, we don't. + * If -1, Tor decides. */ + int UseMicrodescriptors; + } or_options_t; /** Persistent state for an onion router, as saved to disk. */ diff --git a/src/or/router.c b/src/or/router.c index e4dab0e..6de069f 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -699,7 +699,8 @@ init_keys(void) crypto_pk_get_digest(get_server_identity_key(), digest); type = ((options->V1AuthoritativeDir ? V1_DIRINFO : NO_DIRINFO) | (options->V2AuthoritativeDir ? V2_DIRINFO : NO_DIRINFO) | - (options->V3AuthoritativeDir ? V3_DIRINFO : NO_DIRINFO) | + (options->V3AuthoritativeDir ? + (V3_DIRINFO|MICRODESC_DIRINFO|EXTRAINFO_DIRINFO) : NO_DIRINFO) | (options->BridgeAuthoritativeDir ? BRIDGE_DIRINFO : NO_DIRINFO) | (options->HSAuthoritativeDir ? HIDSERV_DIRINFO : NO_DIRINFO)); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 8bcfa05..6f90a8b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1127,6 +1127,9 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags) if ((type & EXTRAINFO_DIRINFO) && !router_supports_extrainfo(node->identity, 0)) continue; + if ((type & MICRODESC_DIRINFO) && !is_trusted && + !node->rs->version_supports_microdesc_cache) + continue; if (try_excluding && options->ExcludeNodes && routerset_contains_routerstatus(options->ExcludeNodes, status, country)) { @@ -2443,18 +2446,6 @@ router_get_by_nickname(const char *nickname, int warn_if_unnamed) #endif } -/** Try to find a routerinfo for <b>digest</b>. If we don't have one, - * return 1. If we do, ask tor_version_as_new_as() for the answer. - */ -int -router_digest_version_as_new_as(const char *digest, const char *cutoff) -{ - const routerinfo_t *router = router_get_by_id_digest(digest); - if (!router) - return 1; - return tor_version_as_new_as(router->platform, cutoff); -} - /** Return true iff <b>digest</b> is the digest of the identity key of a * trusted directory matching at least one bit of <b>type</b>. If <b>type</b> * is zero, any authority is okay. */ @@ -4726,6 +4717,8 @@ update_router_descriptor_downloads(time_t now) static time_t last_dummy_download = 0; if (should_delay_dir_fetches(options)) return; + if (!we_fetch_router_descriptors(options)) + return; if (directory_fetches_dir_info_early(options)) { update_router_descriptor_cache_downloads_v2(now); } @@ -4879,20 +4872,28 @@ count_usable_descriptors(int *num_present, int *num_usable, or_options_t *options, time_t now, routerset_t *in_set) { + const int md = (consensus->flavor == FLAV_MICRODESC); *num_present = 0, *num_usable=0; - SMARTLIST_FOREACH(consensus->routerstatus_list, routerstatus_t *, rs, - { + SMARTLIST_FOREACH_BEGIN(consensus->routerstatus_list, routerstatus_t *, rs) + { if (in_set && ! routerset_contains_routerstatus(in_set, rs, -1)) continue; if (client_would_use_router(rs, now, options)) { + const char * const digest = rs->descriptor_digest; + int present; ++*num_usable; /* the consensus says we want it. */ - if (router_get_by_descriptor_digest(rs->descriptor_digest)) { + if (md) + present = NULL != (microdesc_cache_lookup_by_digest256(NULL, digest)); + else + present = NULL != router_get_by_descriptor_digest(digest); + if (present) { /* we have the descriptor listed in the consensus. */ ++*num_present; } } - }); + } + SMARTLIST_FOREACH_END(rs); log_debug(LD_DIR, "%d usable, %d present.", *num_usable, *num_present); } @@ -4906,7 +4907,7 @@ count_loading_descriptors_progress(void) int num_present = 0, num_usable=0; time_t now = time(NULL); const networkstatus_t *consensus = - networkstatus_get_reasonably_live_consensus(now, FLAV_NS); + networkstatus_get_reasonably_live_consensus(now, usable_consensus_flavor()); double fraction; if (!consensus) @@ -4936,14 +4937,14 @@ update_router_have_minimum_dir_info(void) int res; or_options_t *options = get_options(); const networkstatus_t *consensus = - networkstatus_get_reasonably_live_consensus(now, FLAV_NS); + networkstatus_get_reasonably_live_consensus(now, usable_consensus_flavor()); if (!consensus) { if (!networkstatus_get_latest_consensus()) - strlcpy(dir_info_status, "We have no network-status consensus.", + strlcpy(dir_info_status, "We have no usable consensus.", sizeof(dir_info_status)); else - strlcpy(dir_info_status, "We have no recent network-status consensus.", + strlcpy(dir_info_status, "We have no recent usable consensus.", sizeof(dir_info_status)); res = 0; goto done; diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 41a4c90..940e206 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -56,7 +56,6 @@ const node_t *router_choose_random_node(smartlist_t *excludedsmartlist, const routerinfo_t *router_get_by_nickname(const char *nickname, int warn_if_unnamed); -int router_digest_version_as_new_as(const char *digest, const char *cutoff); int router_digest_is_trusted_dir_type(const char *digest, dirinfo_type_t type); #define router_digest_is_trusted_dir(d) \ diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 80214b3..163cc37 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2085,6 +2085,7 @@ routerstatus_parse_entry_from_string(memarea_t *area, rs->version_supports_begindir = 1; rs->version_supports_extrainfo_upload = 1; rs->version_supports_conditional_consensus = 1; + rs->version_supports_microdesc_cache = 1; } else { rs->version_supports_begindir = tor_version_as_new_as(tok->args[0], "0.2.0.1-alpha"); @@ -2094,6 +2095,8 @@ routerstatus_parse_entry_from_string(memarea_t *area, tor_version_as_new_as(tok->args[0], "0.2.0.8-alpha"); rs->version_supports_conditional_consensus = tor_version_as_new_as(tok->args[0], "0.2.1.1-alpha"); + rs->version_supports_microdesc_cache = + tor_version_as_new_as(tok->args[0], "0.2.3.0-alpha"); } if (vote_rs) { vote_rs->version = tor_strdup(tok->args[0]);

1 0

[vidalia/alpha] tell po4a it is xhtml and not html to avoid weird FIXME comments
by chiiph＠torproject.org 05 May '11

05 May '11

commit 489273067befeec911a2bb02f75d7141d9aa0d7c Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Thu May 5 20:23:43 2011 +0100 tell po4a it is xhtml and not html to avoid weird FIXME comments --- src/vidalia/help/content/po/templates/links.pot | 76 ++++++++++------------- 1 files changed, 34 insertions(+), 42 deletions(-) diff --git a/src/vidalia/help/content/po/templates/links.pot b/src/vidalia/help/content/po/templates/links.pot index 953242a..a1d0a8d 100644 --- a/src/vidalia/help/content/po/templates/links.pot +++ b/src/vidalia/help/content/po/templates/links.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-05-05 20:03+0200\n" +"POT-Creation-Date: 2011-05-05 20:21+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -23,74 +23,66 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. type: h1 -#: FIXME:0 -#, no-wrap +#. type: Content of: <html><body><h1> +#: links.html:16 msgid "Helpful Links" msgstr "" -#. type: h3 -#: FIXME:0 -#, no-wrap +#. type: Content of: <html><body><h3> +#: links.html:19 msgid "Vidalia" msgstr "" -#. type: td -#: FIXME:0 FIXME:0 FIXME:0 FIXME:0 FIXME:0 -#, no-wrap +#. type: Content of: <html><body><table><tr><td> +#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57 msgid "   " msgstr "" -#. type: td -#: FIXME:0 FIXME:0 -#, no-wrap +#. type: Content of: <html><body><table><tr><td> +#: links.html:23 links.html:43 msgid "Homepage" msgstr "" -#. type: a -#: FIXME:0 -#, no-wrap -msgid "https://www.torproject.org/vidalia/" +#. type: Content of: <html><body><table><tr><td> +#: links.html:25 +msgid "" +"<a href=\"https://www.torproject.org/vidalia/\"> " +"https://www.torproject.org/vidalia/</a>" msgstr "" -#. type: td -#: FIXME:0 FIXME:0 -#, no-wrap +#. type: Content of: <html><body><table><tr><td> +#: links.html:31 links.html:58 msgid "Wiki and Bugtracker" msgstr "" -#. type: a -#: FIXME:0 -#, no-wrap -msgid "http://trac.torproject.org/" +#. type: Content of: <html><body><table><tr><td> +#: links.html:33 +msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" msgstr "" -#. type: h3 -#: FIXME:0 -#, no-wrap +#. type: Content of: <html><body><h3> +#: links.html:39 msgid "Tor" msgstr "" -#. type: a -#: FIXME:0 -#, no-wrap -msgid "https://www.torproject.org/" +#. type: Content of: <html><body><table><tr><td> +#: links.html:45 +msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" msgstr "" -#. type: td -#: FIXME:0 -#, no-wrap +#. type: Content of: <html><body><table><tr><td> +#: links.html:50 msgid "FAQ" msgstr "" -#. type: a -#: FIXME:0 -#, no-wrap -msgid "https://www.torproject.org/docs/faq.html" +#. type: Content of: <html><body><table><tr><td> +#: links.html:52 +msgid "" +"<a href=\"https://www.torproject.org/docs/faq.html\"> " +"https://www.torproject.org/docs/faq.html</a>" msgstr "" -#. type: a -#: FIXME:0 -#, no-wrap -msgid "https://trac.torproject.org/" +#. type: Content of: <html><body><table><tr><td> +#: links.html:60 +msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" msgstr ""

1 0

[vidalia/alpha] Merge remote-tracking branch 'runa/master'
by chiiph＠torproject.org 05 May '11

05 May '11

commit 342d88c9c1c80949b1cd3fa77371f75b571e19d9 Merge: 1334480 4892730 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu May 5 16:24:49 2011 -0300 Merge remote-tracking branch 'runa/master' src/vidalia/help/content/po/templates/links.pot | 66 ++++++++--------------- 1 files changed, 22 insertions(+), 44 deletions(-)

1 0

[vidalia/alpha] Change application strings so they look ok in the new text
by chiiph＠torproject.org 05 May '11

05 May '11

commit d56971293f6c85d3f2f6a1de09cb23655449daa8 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu May 5 16:51:32 2011 -0300 Change application strings so they look ok in the new text --- src/vidalia/MainWindow.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index ea0b8b3..860eae4 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1648,17 +1648,17 @@ MainWindow::warnDangerousPort(quint16 port, bool rejected) QString application; switch (port) { case 23: - application = tr(", probably Telnet, "); + application = tr("(probably Telnet)"); break; case 109: case 110: case 143: - application = tr(", probably an email client, "); + application = tr("(probably an email client)"); break; default: - application = " "; + application = ""; } QString text = tr("One of your applications %1 appears to be making a "

1 0

[vidalia/alpha] Merge branch 'master' into alpha
by chiiph＠torproject.org 05 May '11

05 May '11

commit 70680a3325b820abf41bffc0eea1c7a7523ffaad Merge: 5193835 d569712 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu May 5 17:09:54 2011 -0300 Merge branch 'master' into alpha Conflicts: src/vidalia/MainWindow.cpp src/vidalia/help/content/po/templates/links.pot src/vidalia/MainWindow.cpp | 8 ++-- src/vidalia/help/content/po/templates/links.pot | 46 +++++++++------------- 2 files changed, 23 insertions(+), 31 deletions(-) diff --cc src/vidalia/MainWindow.cpp index d1fd2a4,860eae4..c373d01 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@@ -1038,116 -858,435 +1038,116 @@@ MainWindow::bootstrapStatusChanged(cons setStartupProgress(percentComplete, description); } -/** Updates the UI to reflect Tor's current <b>status</b>. Returns the - * previously set TorStatus value.*/ -MainWindow::TorStatus -MainWindow::updateTorStatus(TorStatus status) -{ - QString statusText, actionText; - QString trayIconFile, statusIconFile; - TorStatus prevStatus = _status; - - vNotice("Tor status changed from '%1' to '%2'.") - .arg(toString(prevStatus)).arg(toString(status)); - _status = status; - - if (status == Stopped) { - statusText = tr("Tor is not running"); - actionText = tr("Start Tor"); - trayIconFile = IMG_TOR_STOPPED; - statusIconFile = IMG_TOR_STOPPED_48; - _actionStartStopTor->setEnabled(true); - _actionStartStopTor->setText(actionText); - _actionStartStopTor->setIcon(QIcon(IMG_START_TOR_16)); - ui.lblStartStopTor->setEnabled(true); - ui.lblStartStopTor->setText(actionText); - ui.lblStartStopTor->setPixmap(QPixmap(IMG_START_TOR_48)); - ui.lblStartStopTor->setStatusTip(actionText); - - /* XXX: This might need to be smarter if we ever start connecting other - * slots to these triggered() and clicked() signals. */ - QObject::disconnect(_actionStartStopTor, SIGNAL(triggered()), this, 0); - QObject::disconnect(ui.lblStartStopTor, SIGNAL(clicked()), this, 0); - connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(start())); - connect(ui.lblStartStopTor, SIGNAL(clicked()), this, SLOT(start())); - setStartupProgressVisible(false); - } else if (status == Stopping) { - if (_delayedShutdownStarted) { - statusText = tr("Your relay is shutting down.\n" - "Click 'Stop' again to stop your relay now."); - } else { - statusText = tr("Tor is shutting down"); - } - trayIconFile = IMG_TOR_STOPPING; - statusIconFile = IMG_TOR_STOPPING_48; - - ui.lblStartStopTor->setStatusTip(tr("Stop Tor Now")); - } else if (status == Started) { - actionText = tr("Stop Tor"); - _actionStartStopTor->setEnabled(true); - _actionStartStopTor->setText(actionText); - _actionStartStopTor->setIcon(QIcon(IMG_STOP_TOR_16)); - ui.lblStartStopTor->setEnabled(true); - ui.lblStartStopTor->setText(actionText); - ui.lblStartStopTor->setPixmap(QPixmap(IMG_STOP_TOR_48)); - ui.lblStartStopTor->setStatusTip(actionText); - - /* XXX: This might need to be smarter if we ever start connecting other - * slots to these triggered() and clicked() signals. */ - QObject::disconnect(_actionStartStopTor, SIGNAL(triggered()), this, 0); - QObject::disconnect(ui.lblStartStopTor, SIGNAL(clicked()), this, 0); - connect(_actionStartStopTor, SIGNAL(triggered()), this, SLOT(stop())); - connect(ui.lblStartStopTor, SIGNAL(clicked()), this, SLOT(stop())); - } else if (status == Starting) { - statusText = tr("Starting the Tor software"); - trayIconFile = IMG_TOR_STARTING; - statusIconFile = IMG_TOR_STARTING_48; - _actionStartStopTor->setEnabled(false); - ui.lblStartStopTor->setText(tr("Starting Tor")); - ui.lblStartStopTor->setEnabled(false); - ui.lblStartStopTor->setStatusTip(statusText); - setStartupProgressVisible(true); - setStartupProgress(STARTUP_PROGRESS_STARTING, statusText); - } else if (status == CircuitEstablished) { - statusText = tr("Connected to the Tor network!"); - trayIconFile = IMG_TOR_RUNNING; - statusIconFile = IMG_TOR_RUNNING_48; - setStartupProgressVisible(false); - } - - /* Update the tray icon */ - if (!trayIconFile.isEmpty()) { - setTrayIcon(trayIconFile); - } - /* Update the status banner on the control panel */ - if (!statusIconFile.isEmpty()) - ui.lblTorStatusImg->setPixmap(QPixmap(statusIconFile)); - if (!statusText.isEmpty()) { - _trayIcon.setToolTip(statusText); - ui.lblTorStatus->setText(statusText); - } - return prevStatus; -} - -/** Called when the "show on startup" checkbox is toggled. */ +/** Called when Tor has successfully established a circuit. */ void -MainWindow::toggleShowOnStartup(bool checked) +MainWindow::circuitEstablished() { - VidaliaSettings settings; - settings.setShowMainWindowAtStart(checked); -} + updateTorStatus(CircuitEstablished); + // TODO: fix hardcoded total length + setStartupProgress(130, + tr("Connected to the Tor network!")); + startSubprocesses(); -/** Sets the visibility of the startup status description and progress bar to - * <b>visible</b>. */ -void -MainWindow::setStartupProgressVisible(bool visible) -{ - /* XXX: We force a repaint() to make sure the progress bar and onion status - * icon don't overlap briefly. This is pretty hacktastic. */ - if (visible) { - ui.lblTorStatus->setVisible(false); - ui.lblTorStatusImg->setVisible(false); - repaint(ui.grpStatus->rect()); - ui.lblStartupProgress->setVisible(true); - ui.progressBar->setVisible(true); - } else { - ui.lblStartupProgress->setVisible(false); - ui.progressBar->setVisible(false); - repaint(ui.grpStatus->rect()); - ui.lblTorStatus->setVisible(true); - ui.lblTorStatusImg->setVisible(true); +#if defined(USE_AUTOUPDATE) + VidaliaSettings settings; + if (settings.isAutoUpdateEnabled()) { + QDateTime lastCheckedAt = settings.lastCheckedForUpdates(); + if (UpdateProcess::shouldCheckForUpdates(lastCheckedAt)) { + /* Initiate a background check for updates now */ + _updateTimer.stop(); + checkForUpdates(); + } } +#endif } -/** Sets the progress bar completion value to <b>progressValue</b> and sets - * the status text to <b>description</b>. */ +/** Called when Tor thinks the user has tried to connect to a port that + * typically is used for unencrypted applications. Warns the user and allows + * them to ignore future warnings on <b>port</b>. It is possible that Tor + * will produce multiple asynchronous status events warning of dangerous ports + * while the message box is displayed (for example, while the user is away + * from the keyboard), so subsequent messages will be discarded until the + * first message box is dismissed. */ void -MainWindow::setStartupProgress(int progressValue, - const QString &description) -{ - ui.progressBar->setValue(progressValue); - ui.lblStartupProgress->setText(description); - _trayIcon.setToolTip(description); -} - -/** Attempts to start Tor. If Tor fails to start, then startFailed() will be - * called with an error message containing the reason. */ -void -MainWindow::start() +MainWindow::warnDangerousPort(quint16 port, bool rejected) { - TorSettings settings; - QStringList args; - - updateTorStatus(Starting); - - /* Check if Tor is already running separately */ - if(settings.getControlMethod() == ControlMethod::Port) { - if (net_test_connect(settings.getControlAddress(), - settings.getControlPort())) { - started(); - return; - } - } else { - if (socket_test_connect(settings.getSocketPath())) { - started(); - return; - } - } - - QString torrc = settings.getTorrc(); + static QMessageBox *dlg = 0; - if(settings.bootstrap()) { - QString boottorrc = settings.bootstrapFrom(); - vNotice(tr("Bootstrapping torrc from %1 to %2") - .arg(boottorrc).arg(torrc)); - if(QFileInfo(boottorrc).exists()) { - if(QFile::copy(boottorrc, torrc)) { - settings.setBootstrap(false); - } - } - } + /* Don't display another message box until the first one is dismissed */ + if (dlg) + return; - /* Make sure the torrc we want to use really exists. */ - if (!torrc.isEmpty()) { - if (!QFileInfo(torrc).exists()) - touch_file(torrc, true); - args << "-f" << torrc; - } + QString application; + switch (port) { + case 23: - application = tr(", probably Telnet, "); ++ application = tr("(probably Telnet)"); + break; - /* Specify Tor's data directory, if different from the default */ - QString dataDirectory = settings.getDataDirectory(); - if (!dataDirectory.isEmpty()) - args << "DataDirectory" << expand_filename(dataDirectory); - - if(settings.getControlMethod() == ControlMethod::Port) { - /* Add the intended control port value */ - quint16 controlPort = settings.getControlPort(); - if (controlPort) - args << "ControlPort" << QString::number(controlPort); - } else { - QString path = settings.getSocketPath(); - args << "ControlSocket" << path; - } - - /* Add the control port authentication arguments */ - switch (settings.getAuthenticationMethod()) { - case TorSettings::PasswordAuth: - if (! vApp->readPasswordFromStdin()) { - if (settings.useRandomPassword()) { - _controlPassword = TorSettings::randomPassword(); - _useSavedPassword = false; - } else { - _controlPassword = settings.getControlPassword(); - _useSavedPassword = true; - } - } - args << "HashedControlPassword" - << TorSettings::hashPassword(_controlPassword); - break; - case TorSettings::CookieAuth: - args << "CookieAuthentication" << "1"; + case 109: + case 110: + case 143: - application = tr(", probably an email client, "); ++ application = tr("(probably an email client)"); break; - default: - args << "CookieAuthentication" << "0"; - } - - /* This doesn't get set to false until Tor is actually up and running, so we - * don't yell at users twice if their Tor doesn't even start, due to the fact - * that QProcess::stopped() is emitted even if the process didn't even - * start. */ - _isIntentionalExit = true; - /* Kick off the Tor process */ - _torControl->start(settings.getExecutable(), args); -} -/** Called when the user changes a setting that needs Tor restarting */ -void -MainWindow::restart() -{ - if(_torControl->stop()) { - start(); + default: - application = " "; ++ application = ""; } -} - QString text = tr("One of your applications%1appears to be making a " -/** Called when the Tor process fails to start, for example, because the path - * specified to the Tor executable didn't lead to an executable. */ -void -MainWindow::startFailed(QString errmsg) -{ - /* We don't display the error message for now, because the error message - * that Qt gives us in this instance is almost always "Unknown Error". That - * will make users sad. */ - Q_UNUSED(errmsg); - - updateTorStatus(Stopped); - - /* Display an error message and see if the user wants some help */ - int response = VMessageBox::warning(this, tr("Error Starting Tor"), - tr("Vidalia was unable to start Tor. Check your settings " - "to ensure the correct name and location of your Tor " - "executable is specified."), - VMessageBox::ShowSettings|VMessageBox::Default, - VMessageBox::Cancel|VMessageBox::Escape, - VMessageBox::Help); ++ QString text = tr("One of your applications %1 appears to be making a " + "potentially unencrypted and unsafe connection to port %2.") + .arg(application).arg(port); - if (response == VMessageBox::ShowSettings) { - /* Show the settings dialog so the user can make sure they're pointing to - * the correct Tor. */ - showConfigDialog(); - } else if (response == VMessageBox::Help) { - /* Show troubleshooting information about starting Tor */ - showHelpDialog("troubleshooting.start"); + QString extraText = p(tr("Anything sent over this connection could be " + "monitored. Please check your application's " + "configuration and use only encrypted protocols, " + "such as SSL, if possible.")); + if (rejected) { + extraText.append(p(tr("Tor has automatically closed your connection in " + "order to protect your anonymity."))); } -} - -/** Slot: Called when the Tor process is started. It will connect the control - * socket and set the icons and tooltips accordingly. */ -void -MainWindow::started() -{ - TorSettings settings; - - updateTorStatus(Started); - - /* Now that Tor is running, we want to know if it dies when we didn't want - * it to. */ - _isIntentionalExit = false; - /* We haven't started a delayed shutdown yet. */ - _delayedShutdownStarted = false; - /* Remember whether we started Tor or not */ - _isVidaliaRunningTor = _torControl->isVidaliaRunningTor(); - /* Try to connect to Tor's control port */ - if(settings.getControlMethod() == ControlMethod::Port) - _torControl->connect(settings.getControlAddress(), - settings.getControlPort()); - else - _torControl->connect(settings.getSocketPath()); - setStartupProgress(STARTUP_PROGRESS_CONNECTING, tr("Connecting to Tor")); -} - -/** Called when the connection to the control socket fails. The reason will be - * given in the errmsg parameter. */ -void -MainWindow::connectFailed(QString errmsg) -{ - /* Ok, ok. It really isn't going to connect. I give up. */ - int response = VMessageBox::warning(this, - tr("Connection Error"), p(errmsg), - VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape, - VMessageBox::Retry, VMessageBox::Help); + dlg = new QMessageBox(QMessageBox::Warning, + tr("Potentially Unsafe Connection"), text, + QMessageBox::Ok | QMessageBox::Ignore); + dlg->setInformativeText(extraText); + dlg->setDefaultButton(QMessageBox::Ok); + dlg->setEscapeButton(QMessageBox::Ok); - if (response == VMessageBox::Retry) { - /* Let's give it another try. */ + int ret = dlg->exec(); + if (ret == QMessageBox::Ignore) { + TorControl *tc = Vidalia::torControl(); TorSettings settings; - _torControl->connect(settings.getControlAddress(), - settings.getControlPort()); - } else { - /* Show the help browser (if requested) */ - if (response == VMessageBox::Help) - showHelpDialog("troubleshooting.connect"); - /* Since Vidalia can't connect, we can't really do much, so stop Tor. */ - _torControl->stop(); - } -} - -/** Disconnects the control socket and stops the Tor process. */ -bool -MainWindow::stop() -{ - ServerSettings server(_torControl); - QString errmsg; - TorStatus prevStatus; - bool rc; - - /* If we're running a server, give users the option of terminating - * gracefully so clients have time to find new servers. */ - if (server.isServerEnabled() && !_delayedShutdownStarted) { - /* Ask the user if they want to shutdown nicely. */ - int response = VMessageBox::question(this, tr("Relaying is Enabled"), - tr("You are currently running a relay. " - "Terminating your relay will interrupt any " - "open connections from clients.\n\n" - "Would you like to shutdown gracefully and " - "give clients time to find a new relay?"), - VMessageBox::Yes|VMessageBox::Default, - VMessageBox::No, - VMessageBox::Cancel|VMessageBox::Escape); - if (response == VMessageBox::Yes) - _delayedShutdownStarted = true; - else if (response == VMessageBox::Cancel) - return false; - } - - prevStatus = updateTorStatus(Stopping); - if (_delayedShutdownStarted) { - /* Start a delayed shutdown */ - rc = _torControl->signal(TorSignal::Shutdown, &errmsg); - } else { - /* We want Tor to stop now, regardless of whether we're a server. */ - _isIntentionalExit = true; - rc = _torControl->stop(&errmsg); - } - - if (!rc) { - /* We couldn't tell Tor to stop, for some reason. */ - int response = VMessageBox::warning(this, tr("Error Shutting Down"), - p(tr("Vidalia was unable to stop the Tor software.")) - + p(errmsg), - VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape, - VMessageBox::Help); - - if (response == VMessageBox::Help) { - /* Show some troubleshooting help */ - showHelpDialog("troubleshooting.stop"); - } - /* Tor is still running since stopping failed */ - _isIntentionalExit = false; - _delayedShutdownStarted = false; - updateTorStatus(prevStatus); - } - return rc; -} + QStringList portList; + QList<quint16> ports; + int idx; -/** Slot: Called when the Tor process has exited. It will adjust the tray - * icons and tooltips accordingly. */ -void -MainWindow::stopped(int exitCode, QProcess::ExitStatus exitStatus) -{ - updateTorStatus(Stopped); + ports = settings.getWarnPlaintextPorts(); + idx = ports.indexOf(port); + if (idx >= 0) { + ports.removeAt(idx); + settings.setWarnPlaintextPorts(ports); - /* If we didn't intentionally close Tor, then check to see if it crashed or - * if it closed itself and returned an error code. */ - if (!_isIntentionalExit) { - /* A quick overview of Tor's code tells me that if it catches a SIGTERM or - * SIGINT, Tor will exit(0). We might need to change this warning message - * if this turns out to not be the case. */ - if (exitStatus == QProcess::CrashExit || exitCode != 0) { - int ret = VMessageBox::warning(this, tr("Unexpected Error"), - tr("Vidalia detected that the Tor software exited " - "unexpectedly.\n\n" - "Please check the message log for recent " - "warning or error messages."), - VMessageBox::Ok|VMessageBox::Escape, - VMessageBox::ShowLog|VMessageBox::Default, - VMessageBox::Help); - if (ret == VMessageBox::ShowLog) - _messageLog->showWindow(); - else if (ret == VMessageBox::Help) - showHelpDialog("troubleshooting.torexited"); + foreach (quint16 port, ports) { + portList << QString::number(port); + } + tc->setConf("WarnPlaintextPorts", portList.join(",")); + portList.clear(); } - } -} - -/** Called when the control socket has successfully connected to Tor. */ -void -MainWindow::connected() -{ - authenticate(); -} -/** Called when Vidalia wants to disconnect from a Tor it did not start. */ -void -MainWindow::disconnect() -{ - _torControl->disconnect(); -} + ports = settings.getRejectPlaintextPorts(); + idx = ports.indexOf(port); + if (idx >= 0) { + ports.removeAt(idx); + settings.setRejectPlaintextPorts(ports); -/** Called when the control socket has been disconnected. */ -void -MainWindow::disconnected() -{ - if (!_isVidaliaRunningTor) { - /* If we didn't start our own Tor process, interpret losing the control - * connection as "Tor is stopped". */ - updateTorStatus(Stopped); + foreach (quint16 port, ports) { + portList << QString::number(port); + } + tc->setConf("RejectPlaintextPorts", portList.join(",")); + } } - - /*XXX We should warn here if we get disconnected when we didn't intend to */ - _actionNewIdentity->setEnabled(false); - ui.lblNewIdentity->setEnabled(false); - _isVidaliaRunningTor = false; + delete dlg; + dlg = 0; } /** Attempts to authenticate to Tor's control port, depending on the

1 0

[vidalia/master] Change application strings so they look ok in the new text
by chiiph＠torproject.org 05 May '11

05 May '11

commit d56971293f6c85d3f2f6a1de09cb23655449daa8 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu May 5 16:51:32 2011 -0300 Change application strings so they look ok in the new text --- src/vidalia/MainWindow.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index ea0b8b3..860eae4 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1648,17 +1648,17 @@ MainWindow::warnDangerousPort(quint16 port, bool rejected) QString application; switch (port) { case 23: - application = tr(", probably Telnet, "); + application = tr("(probably Telnet)"); break; case 109: case 110: case 143: - application = tr(", probably an email client, "); + application = tr("(probably an email client)"); break; default: - application = " "; + application = ""; } QString text = tr("One of your applications %1 appears to be making a "

1 0

[vidalia/alpha] Merge branch 'bug2744_bandwidth'
by chiiph＠torproject.org 05 May '11

05 May '11

commit 1334480dc306064ecc7bf9adadec0afeac36b2cf Merge: 7b01d6c 9adaff9 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu May 5 15:55:52 2011 -0300 Merge branch 'bug2744_bandwidth' src/vidalia/network/RouterDescriptorView.cpp | 5 ++++- src/vidalia/network/RouterListItem.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[vidalia/alpha] Use minimum bandwidth
by chiiph＠torproject.org 05 May '11

05 May '11

commit 9adaff9833062acc773ab446d6becd3dc08bf8e6 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Sat Apr 30 17:14:18 2011 -0300 Use minimum bandwidth --- src/vidalia/network/RouterDescriptorView.cpp | 5 ++++- src/vidalia/network/RouterListItem.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/vidalia/network/RouterDescriptorView.cpp b/src/vidalia/network/RouterDescriptorView.cpp index 63c3102..ab94889 100644 --- a/src/vidalia/network/RouterDescriptorView.cpp +++ b/src/vidalia/network/RouterDescriptorView.cpp @@ -110,8 +110,11 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist) /* If the router is online, then show the uptime and bandwidth stats. */ if (!rd.offline()) { + qint64 minBandwidth = (qint64)qMin(rd.observedBandwidth(), + qMin(rd.averageBandwidth(), + rd.burstBandwidth())); html.append(trow(tcol(b(tr("Bandwidth:"))) + - tcol(string_format_bandwidth(rd.observedBandwidth())))); + tcol(string_format_bandwidth(minBandwidth)))); html.append(trow(tcol(b(tr("Uptime:"))) + tcol(string_format_uptime( adjustUptime(rd.uptime(), rd.published()))))); diff --git a/src/vidalia/network/RouterListItem.cpp b/src/vidalia/network/RouterListItem.cpp index 904a3f7..f0bdcad 100644 --- a/src/vidalia/network/RouterListItem.cpp +++ b/src/vidalia/network/RouterListItem.cpp @@ -69,7 +69,9 @@ RouterListItem::update(const RouterDescriptor &rd) statusIcon = QIcon(IMG_NODE_SLEEPING); setToolTip(STATUS_COLUMN, tr("Hibernating")); } else { - _statusValue = (qint64)_rd->observedBandwidth(); + _statusValue = (qint64)qMin(_rd->observedBandwidth(), + qMin(_rd->averageBandwidth(), + _rd->burstBandwidth())); if (_statusValue >= 400*1024) { statusIcon = QIcon(IMG_NODE_HIGH_BW); } else if (_statusValue >= 60*1024) {

1 0

[vidalia/alpha] Merge branch 'master' into alpha
by chiiph＠torproject.org 05 May '11

05 May '11

commit f9d789ef4c8ce6e9006255a7f79517bcf5c15534 Merge: ff19c25 1334480 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Thu May 5 15:58:30 2011 -0300 Merge branch 'master' into alpha src/vidalia/network/RouterDescriptorView.cpp | 5 ++++- src/vidalia/network/RouterListItem.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0