- tor-commits - lists.torproject.org

[tor/master] Make the router_get_*_orport interface consistent with node_*.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 39ec781b8fa164dd2b68cec349f2b38d81fa3cbb Author: Linus Nordberg <linus(a)nordberg.se> Date: Mon Nov 28 13:51:56 2011 +0100 Make the router_get_*_orport interface consistent with node_*. --- src/or/nodelist.c | 3 +-- src/or/router.c | 22 +++++++++++----------- src/or/router.h | 4 ++-- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 921ce1a..7d634a1 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -740,8 +740,7 @@ void node_get_pref_ipv6_addr(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { - tor_addr_copy(&ap_out->addr, &node->ri->ipv6_addr); - ap_out->port = node->ri->ipv6_orport; + router_get_pref_ipv6_orport(node->ri, ap_out); } else if (node->rs) { /* No IPv6 in routerstatus_t yet. XXXprop186 ok for private bridges but needs fixing */ diff --git a/src/or/router.c b/src/or/router.c index a0ae79a..6904e85 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2132,16 +2132,6 @@ router_get_prim_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) ap_out->port = router->or_port; } -/** Copy the alternative, presumably IPv6, OR port (IP address and TCP - * port) for router into *ap_out. */ -void -router_get_alt_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) -{ - tor_assert(ap_out != NULL); - tor_addr_copy(&ap_out->addr, &router->ipv6_addr); - ap_out->port = router->ipv6_orport; -} - /** Return 1 if we prefer the IPv6 address and OR TCP port of * router, else 0. * @@ -2162,11 +2152,21 @@ void router_get_pref_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) { if (router_ipv6_preferred(router)) - router_get_alt_orport(router, ap_out); + router_get_pref_ipv6_orport(router, ap_out); else router_get_prim_orport(router, ap_out); } +/** Copy the preferred IPv6 OR port (IP address and TCP port) for + * router into *ap_out. */ +void +router_get_pref_ipv6_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) +{ + tor_assert(ap_out != NULL); + tor_addr_copy(&ap_out->addr, &router->ipv6_addr); + ap_out->port = router->ipv6_orport; +} + /** Load the contents of filename, find the last line starting with * end_line, ensure that its timestamp is not more than 25 hours in * the past or more than 1 hour in the future with respect to now, diff --git a/src/or/router.h b/src/or/router.h index 6095d02..d426b25 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -87,10 +87,10 @@ int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, crypto_pk_env_t *ident_key); void router_get_prim_orport(const routerinfo_t *router, tor_addr_port_t *addr_port_out); -void router_get_alt_orport(const routerinfo_t *router, - tor_addr_port_t *addr_port_out); void router_get_pref_orport(const routerinfo_t *router, tor_addr_port_t *addr_port_out); +void router_get_pref_ipv6_orport(const routerinfo_t *router, + tor_addr_port_t *addr_port_out); int router_ipv6_preferred(const routerinfo_t *router); int extrainfo_dump_to_string(char **s, extrainfo_t *extrainfo, crypto_pk_env_t *ident_key);

1 0

[tor/master] Make router_get_{prim, alt, pref}_addr_port take tor_addr_port_t *.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 3b51b326e4fb71b7ec75c5c8ef5a4869f5c4acc1 Author: Linus Nordberg <linus(a)nordberg.se> Date: Mon Nov 28 13:47:12 2011 +0100 Make router_get_{prim,alt,pref}_addr_port take tor_addr_port_t *. Rename to *_orport for consistency with node_*. --- src/or/circuitbuild.c | 16 ++++++-------- src/or/nodelist.c | 6 ++-- src/or/router.c | 54 +++++++++++++++++++++--------------------------- src/or/router.h | 12 +++++----- 4 files changed, 40 insertions(+), 48 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 1283256..faf939e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3332,16 +3332,15 @@ extend_info_alloc(const char *nickname, const char *digest, extend_info_t * extend_info_from_router(const routerinfo_t *r, int for_direct_connect) { - tor_addr_t addr; - uint16_t port; + tor_addr_port_t ap; tor_assert(r); if (for_direct_connect) - router_get_pref_addr_port(r, &addr, &port); + router_get_pref_orport(r, &ap); else - router_get_prim_addr_port(r, &addr, &port); + router_get_prim_orport(r, &ap); return extend_info_alloc(r->nickname, r->cache_info.identity_digest, - r->onion_pkey, &addr, port); + r->onion_pkey, &ap.addr, ap.port); } /** Allocate and return a new extend_info that can be used to build a @@ -4855,11 +4854,10 @@ get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr, static bridge_info_t * get_configured_bridge_by_routerinfo(const routerinfo_t *ri) { - tor_addr_t addr; - uint16_t port; + tor_addr_port_t ap; - router_get_pref_addr_port(ri, &addr, &port); - return get_configured_bridge_by_addr_port_digest(&addr, port, + router_get_pref_orport(ri, &ap); + return get_configured_bridge_by_addr_port_digest(&ap.addr, ap.port, ri->cache_info.identity_digest); } diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 493c03f..921ce1a 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -688,7 +688,7 @@ void node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { - router_get_prim_addr_port(node->ri, &ap_out->addr, &ap_out->port); + router_get_prim_orport(node->ri, ap_out); } else if (node->rs) { tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); @@ -725,7 +725,7 @@ void node_get_pref_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { - router_get_pref_addr_port(node->ri, &ap_out->addr, &ap_out->port); + router_get_pref_orport(node->ri, ap_out); } else if (node->rs) { /* No IPv6 in routerstatus_t yet. XXXprop186 ok for private bridges but needs fixing */ @@ -737,7 +737,7 @@ node_get_pref_orport(const node_t *node, tor_addr_port_t *ap_out) /** Copy the preferred IPv6 OR port (address and TCP port) for * node into *ap_out. */ void -node_get_pref_ipv6_orport(const node_t *node, tor_addr_port_t *ap_out) +node_get_pref_ipv6_addr(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { tor_addr_copy(&ap_out->addr, &node->ri->ipv6_addr); diff --git a/src/or/router.c b/src/or/router.c index d021737..a0ae79a 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2122,37 +2122,33 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, } -/** Copy the primary, IPv4, address and port for router into - *addr_out and *port_out. */ +/** Copy the primary (IPv4) OR port (IP address and TCP port) for + * router into *ap_out. */ void -router_get_prim_addr_port(const routerinfo_t *router, tor_addr_t *addr_out, - uint16_t *port_out) +router_get_prim_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) { - if (addr_out != NULL) - tor_addr_from_ipv4h(addr_out, router->addr); - if (port_out != NULL) - *port_out = router->or_port; + tor_assert(ap_out != NULL); + tor_addr_from_ipv4h(&ap_out->addr, router->addr); + ap_out->port = router->or_port; } -/** Copy the alternative, presumably IPv6, address and port for - router into *addr_out and *port_out. */ +/** Copy the alternative, presumably IPv6, OR port (IP address and TCP + * port) for router into *ap_out. */ void -router_get_alt_addr_port(const routerinfo_t *router, - tor_addr_t *addr_out, - uint16_t *port_out) +router_get_alt_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) { - if (addr_out != NULL) - tor_addr_copy(addr_out, &router->ipv6_addr); - if (port_out != NULL) - *port_out = router->ipv6_orport; + tor_assert(ap_out != NULL); + tor_addr_copy(&ap_out->addr, &router->ipv6_addr); + ap_out->port = router->ipv6_orport; } -/** Return 1 if we prefer the IPv6 address of router, else 0. - - We prefer the IPv6 address if the router has one and - i) the routerinfo_t says so - or - ii) the router has no IPv4 address. */ +/** Return 1 if we prefer the IPv6 address and OR TCP port of + * router, else 0. + * + * We prefer the IPv6 address if the router has one and + * i) the routerinfo_t says so + * or + * ii) the router has no IPv4 address. */ int router_ipv6_preferred(const routerinfo_t *router) { @@ -2160,17 +2156,15 @@ router_ipv6_preferred(const routerinfo_t *router) && (router->ipv6_preferred || router->addr == 0)); } -/** Copy the preferred IP address and port for router into - *addr_out and *port_out . */ +/** Copy the preferred OR port (IP address and TCP port) for + * router into *addr_out. */ void -router_get_pref_addr_port(const routerinfo_t *router, - tor_addr_t *addr_out, - uint16_t *port_out) +router_get_pref_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) { if (router_ipv6_preferred(router)) - router_get_alt_addr_port(router, addr_out, port_out); + router_get_alt_orport(router, ap_out); else - router_get_prim_addr_port(router, addr_out, port_out); + router_get_prim_orport(router, ap_out); } /** Load the contents of filename, find the last line starting with diff --git a/src/or/router.h b/src/or/router.h index 4094b66..6095d02 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -85,12 +85,12 @@ int router_pick_published_address(const or_options_t *options, uint32_t *addr); int router_rebuild_descriptor(int force); int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, crypto_pk_env_t *ident_key); -void router_get_prim_addr_port(const routerinfo_t *router, tor_addr_t *addr_out, - uint16_t *port_out); -void router_get_alt_addr_port(const routerinfo_t *router, tor_addr_t *addr_out, - uint16_t *port_out); -void router_get_pref_addr_port(const routerinfo_t *router, tor_addr_t *addr_out, - uint16_t *port_out); +void router_get_prim_orport(const routerinfo_t *router, + tor_addr_port_t *addr_port_out); +void router_get_alt_orport(const routerinfo_t *router, + tor_addr_port_t *addr_port_out); +void router_get_pref_orport(const routerinfo_t *router, + tor_addr_port_t *addr_port_out); int router_ipv6_preferred(const routerinfo_t *router); int extrainfo_dump_to_string(char **s, extrainfo_t *extrainfo, crypto_pk_env_t *ident_key);

1 0

[tor/master] Whitespace changes.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 32d10bdfb3a55fe3752f85a7937e1f3f5c7e2c56 Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Nov 29 11:00:43 2011 +0100 Whitespace changes. --- src/or/circuitbuild.c | 8 ++++---- src/or/config.c | 8 ++++---- src/or/config.h | 3 ++- src/or/router.c | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index faf939e..6b7be66 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4858,7 +4858,7 @@ get_configured_bridge_by_routerinfo(const routerinfo_t *ri) router_get_pref_orport(ri, &ap); return get_configured_bridge_by_addr_port_digest(&ap.addr, ap.port, - ri->cache_info.identity_digest); + ri->cache_info.identity_digest); } /** Return 1 if ri is one of our known bridges, else 0. */ @@ -4872,7 +4872,7 @@ routerinfo_is_a_configured_bridge(const routerinfo_t *ri) int node_is_a_configured_bridge(const node_t *node) { - int retval = 0; /* Negative. */ + int retval = 0; /* Negative. */ smartlist_t *orports = NULL; if (!node) @@ -4884,13 +4884,13 @@ node_is_a_configured_bridge(const node_t *node) SMARTLIST_FOREACH_BEGIN(orports, tor_addr_port_t *, orport) { if (get_configured_bridge_by_addr_port_digest(&orport->addr, orport->port, - node->identity) != NULL) { + node->identity) != NULL) { retval = 1; goto out; } } SMARTLIST_FOREACH_END(orport); -out: + out: if (orports != NULL) { SMARTLIST_FOREACH(orports, tor_addr_port_t *, p, tor_free(p)); smartlist_free(orports); diff --git a/src/or/config.c b/src/or/config.c index c9320f4..40b6187 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5918,11 +5918,11 @@ get_first_advertised_port_by_type_af(int listener_type, int address_family) if (cfg->type == listener_type && !cfg->no_advertise && (tor_addr_family(&cfg->addr) == address_family || - tor_addr_family(&cfg->addr) == AF_UNSPEC)) { + tor_addr_family(&cfg->addr) == AF_UNSPEC)) { if (tor_addr_family(&cfg->addr) != AF_UNSPEC || - (address_family == AF_INET && !cfg->ipv6_only) || - (address_family == AF_INET6 && !cfg->ipv4_only)) { - return cfg->port; + (address_family == AF_INET && !cfg->ipv6_only) || + (address_family == AF_INET6 && !cfg->ipv4_only)) { + return cfg->port; } } } SMARTLIST_FOREACH_END(cfg); diff --git a/src/or/config.h b/src/or/config.h index cbba9e6..2d94192 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -65,7 +65,8 @@ int did_last_state_file_write_fail(void); int or_state_save(time_t now); const smartlist_t *get_configured_ports(void); -int get_first_advertised_port_by_type_af(int listener_type, int address_family); +int get_first_advertised_port_by_type_af(int listener_type, + int address_family); #define get_primary_or_port() \ (get_first_advertised_port_by_type_af(CONN_TYPE_OR_LISTENER, AF_INET)) #define get_primary_dir_port() \ diff --git a/src/or/router.c b/src/or/router.c index 6904e85..a08a200 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2121,7 +2121,6 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, return (int)written+1; } - /** Copy the primary (IPv4) OR port (IP address and TCP port) for * router into *ap_out. */ void @@ -2143,7 +2142,7 @@ int router_ipv6_preferred(const routerinfo_t *router) { return (!tor_addr_is_null(&router->ipv6_addr) - && (router->ipv6_preferred || router->addr == 0)); + && (router->ipv6_preferred || router->addr == 0)); } /** Copy the preferred OR port (IP address and TCP port) for @@ -2160,7 +2159,8 @@ router_get_pref_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) /** Copy the preferred IPv6 OR port (IP address and TCP port) for * router into *ap_out. */ void -router_get_pref_ipv6_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) +router_get_pref_ipv6_orport(const routerinfo_t *router, + tor_addr_port_t *ap_out) { tor_assert(ap_out != NULL); tor_addr_copy(&ap_out->addr, &router->ipv6_addr);

1 0

[tor/master] Warn user about client ignoring non-preferred IP address for a bridge.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 1dca559db8525e18336144535de1d2b2e77a41b2 Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Nov 29 15:25:04 2011 +0100 Warn user about client ignoring non-preferred IP address for a bridge. --- src/or/circuitbuild.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6b7be66..7934a2e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5183,6 +5183,20 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) protocol that the bridge address indicates. Last bridge descriptor handled wins. */ ri->ipv6_preferred = tor_addr_family(&bridge->addr) == AF_INET6; + + /* XXXipv6 we lack support for falling back to another address for + the same relay, warn the user */ + if (!tor_addr_is_null(&ri->ipv6_addr)) + { + tor_addr_port_t ap; + router_get_pref_orport(ri, &ap); + log_notice(LD_CONFIG, + "Bridge '%s' has both an IPv4 and an IPv6 address. " + "Will prefer using its %s address (%s:%d).", + ri->nickname, + ri->ipv6_preferred ? "IPv6" : "IPv4", + fmt_addr(&ap.addr), ap.port); + } } if (node->rs) { routerstatus_t *rs = node->rs;

1 0

[tor/master] Add changes file.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 192de441e01b6da013f573b46e066b380848873e Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Nov 29 15:39:22 2011 +0100 Add changes file. --- changes/bug3786 | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug3786 b/changes/bug3786 new file mode 100644 index 0000000..8e61ee0 --- /dev/null +++ b/changes/bug3786 @@ -0,0 +1,7 @@ + o Major features: + - Implement support for clients connecting to private bridges over + IPv6. Bridges still need at least one IPv4 address in order to + connect to other relays. Currently, adding Bridge lines with + both an IPv4 and an IPv6 address to the same bridge will most + probably result in the IPv6 address not being used. Implements + parts of proposal 186.

1 0

[tor/master] Rename one more recalcitrant function.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 5412b3728cc0af782650f38ddb8e1566443f882c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 12:01:16 2011 -0500 Rename one more recalcitrant function. --- src/or/nodelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 7d634a1..eafc9b8 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -737,7 +737,7 @@ node_get_pref_orport(const node_t *node, tor_addr_port_t *ap_out) /** Copy the preferred IPv6 OR port (address and TCP port) for * node into *ap_out. */ void -node_get_pref_ipv6_addr(const node_t *node, tor_addr_port_t *ap_out) +node_get_pref_ipv6_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { router_get_pref_ipv6_orport(node->ri, ap_out);

1 0

[tor/master] Merge branch 'ipv6_bridges_squashed'
by nickm＠torproject.org 30 Nov '11

30 Nov '11

1 0

[tor/master] Add an assert before dereferencing entry_conn->socks_request
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 825f3d31b1f1ec57b7321f9e05a8d027cb777c6a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Nov 29 20:34:33 2011 -0800 Add an assert before dereferencing entry_conn->socks_request This may turn a segfault which katmagic saw into an assertion failure. --- src/or/relay.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index ac3114b..6cf4b73 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -924,6 +924,7 @@ connection_edge_process_relay_cell_not_open( } circuit_log_path(LOG_INFO,LD_APP,TO_ORIGIN_CIRCUIT(circ)); /* don't send a socks reply to transparent conns */ + tor_assert(entry_conn->socks_request != NULL); if (!entry_conn->socks_request->has_finished) connection_ap_handshake_socks_reply(entry_conn, NULL, 0, 0);

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 30 Nov '11

30 Nov '11

commit 53df14a5e3be557f603f9e631fa9bdf0dfe52a6e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 30 13:45:25 2011 +0000 Update translations for vidalia_help --- it/troubleshooting.po | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/it/troubleshooting.po b/it/troubleshooting.po index 9fbfde6..c5e461f 100644 --- a/it/troubleshooting.po +++ b/it/troubleshooting.po @@ -1,12 +1,13 @@ # # Translators: +# Luca <luca(a)jeckodevelopment.it>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-08-03 15:49-0300\n" -"PO-Revision-Date: 2010-11-30 05:04+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-30 13:34+0000\n" +"Last-Translator: jeckodevelopment <luca(a)jeckodevelopment.it>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" # type: Content of: <html><body><h1> #: en/troubleshooting.html:16 msgid "Troubleshooting" -msgstr "" +msgstr "Risoluzione dei problemi" # type: Content of: <html><body> #: en/troubleshooting.html:19 @@ -31,7 +32,7 @@ msgstr "" # type: Content of: <html><body><h3> #: en/troubleshooting.html:25 msgid "I Can't Start Tor" -msgstr "" +msgstr "Impossibile avviare Tor" # type: Content of: <html><body> #: en/troubleshooting.html:27 @@ -57,22 +58,27 @@ msgid "" " if Tor printed any information about errors it encountered while trying to " "start." msgstr "" +"Se ciò non ha aiutato, controlla il tuo <a href=\"log.html\">messaggio di " +"log</a> per vedere se Tor ha registrato qualche informazione sugli errori " +"che ha incontrato in fase di avvio." # type: Content of: <html><body> #: en/troubleshooting.html:43 msgid "<a name=\"connect\"/>" -msgstr "" +msgstr "<a name=\"connect\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:44 msgid "Vidalia Can't Connect to Tor" -msgstr "" +msgstr "Vidalia non riesce a connettersi a Tor" # type: Content of: <html><body> #: en/troubleshooting.html:46 msgid "" "Vidalia manages Tor by communicating with it via Tor's control port." msgstr "" +"Vidalia gestisce Tor comunicando con esso attraverso la porta di " +"controllo di Tor." # type: Content of: <html><body> #: en/troubleshooting.html:49 @@ -82,6 +88,11 @@ msgid "" "your <a href=\"log.html\">message log</a> to see if Tor reported any errors " "while it started." msgstr "" +"La ragione più comune per la quale Vidalia non riesce a connettersi a Tor è " +"perché Tor si è avviato, tuttavia si è verificato un errore ed il processo è" +" terminato immediatamente. Dovresti controllare il tuo <a " +"href=\"log.html\">messaggio di log</a> per vedere se Tor ha registrato " +"qualche informazione sugli errori che ha incontrato in fase di avvio." # type: Content of: <html><body> #: en/troubleshooting.html:55 @@ -97,12 +108,12 @@ msgstr "" # type: Content of: <html><body> #: en/troubleshooting.html:63 msgid "<a name=\"password\"/>" -msgstr "" +msgstr "<a name=\"password\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:64 msgid "Why is Vidalia asking me for a \"control password\"?" -msgstr "" +msgstr "Perché Vidalia mi chiede una \"password di controllo\"?" # type: Content of: <html><body> #: en/troubleshooting.html:66 @@ -181,12 +192,12 @@ msgstr "" # type: Content of: <html><body> #: en/troubleshooting.html:122 msgid "<a name=\"torexited\"/>" -msgstr "" +msgstr "<a name=\"torexited\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:123 msgid "Tor Exited Unexpectedly" -msgstr "" +msgstr "Tor è terminato inaspettatamente" # type: Content of: <html><body> #: en/troubleshooting.html:125 @@ -227,12 +238,12 @@ msgstr "" # type: Content of: <html><body> #: en/troubleshooting.html:147 msgid "<a name=\"stop\"/>" -msgstr "" +msgstr "<a name=\"stop\"/>" # type: Content of: <html><body><h3> #: en/troubleshooting.html:148 msgid "Vidalia Can't Stop Tor" -msgstr "" +msgstr "Vidalia non riesce a bloccare Tor" # type: Content of: <html><body> #: en/troubleshooting.html:150

1 0

[metrics-web/master] Take out top-10 relays by bandwidth history.
by karsten＠torproject.org 30 Nov '11

30 Nov '11

commit c7675d04f7cb861f65877d9162da9572eade7242 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 30 07:54:53 2011 +0100 Take out top-10 relays by bandwidth history. Updating this table for a new time interval took 2--5 minutes. That's unacceptable. This happened at least four times a day when the cached table data got stale or whenever a user entered a different start or end date of the time interval. This doesn't just delay page load times, but also keeps the database busy and affects other users. If we want this table back, we'll have to pre-calculate some values. --- rserve/tables.R | 16 ---------- .../ernie/web/GraphsSubpagesServlet.java | 3 -- .../ernie/web/TableParameterChecker.java | 1 - web/WEB-INF/network.jsp | 30 -------------------- 4 files changed, 0 insertions(+), 50 deletions(-) diff --git a/rserve/tables.R b/rserve/tables.R index b4ef535..e2e270d 100644 --- a/rserve/tables.R +++ b/rserve/tables.R @@ -70,19 +70,3 @@ write_censorship_events <- function(start, end, path) { write.csv(r, path, quote = FALSE, row.names = FALSE) } -write_top_10_relays <- function(start, end, path) { - drv <- dbDriver("PostgreSQL") - con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) - q <- paste("SELECT fingerprint, SUM(written_sum) ", - "AS written_sum FROM bwhist WHERE date >= '", start, - "' AND date <= '", end, "' GROUP BY 1 ORDER BY 2 DESC LIMIT 10", - sep = "") - rs <- dbSendQuery(con, q) - c <- fetch(rs, n = -1) - dbDisconnect(con) - dbUnloadDriver(drv) - c <- data.frame(fingerprint = c$fingerprint, - written_sum = round(c$written_sum / 2^40, 2)) - write.csv(c, path, quote = FALSE, row.names = FALSE) -} - diff --git a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java index 16d0db0..c7f3056 100644 --- a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java +++ b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java @@ -36,9 +36,6 @@ public class GraphsSubpagesServlet extends HttpServlet { this.availableGraphsSubpageTables.put("users.html", new HashSet<String>(Arrays.asList( "direct-users,censorship-events".split(",")))); - this.availableGraphsSubpageTables.put("network.html", - new HashSet<String>(Arrays.asList( - "top-10-relays".split(",")))); this.knownCountries = Countries.getInstance().getCountryList(); } diff --git a/src/org/torproject/ernie/web/TableParameterChecker.java b/src/org/torproject/ernie/web/TableParameterChecker.java index 2c0a7be..5b6f627 100644 --- a/src/org/torproject/ernie/web/TableParameterChecker.java +++ b/src/org/torproject/ernie/web/TableParameterChecker.java @@ -41,7 +41,6 @@ public class TableParameterChecker { this.availableTables = new HashMap<String, String>(); this.availableTables.put("direct-users", "start,end,filename"); this.availableTables.put("censorship-events", "start,end,filename"); - this.availableTables.put("top-10-relays", "start,end,filename"); this.knownParameterValues = new HashMap<String, String>(); } diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index dc7facc..d105575 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -234,36 +234,6 @@ in the network. </form> <a href="csv/bandwidth.csv">CSV</a> file containing all data. -<a name="top-10-relays"></a> -Top-10 relays by bandwidth history: -<table> - <tr> - <th>Fingerprint</th> - <th>Bandwidth history</th> - </tr> - <c:forEach var="row" items="${top_10_relays_tabledata}"> - <tr> - <td><a href="https://metrics.torproject.org/relay.html?fingerprint=${row['fingerprint']}">${row['fingerprint']}</a>&emsp;</td> - <td><fmt:formatNumber type="number" minFractionDigits="2" value="${row['written_sum']}" /> TiB</td> - </tr> - </c:forEach> -</table> - -<form action="network.html#top-10-relays"> - <div class="formrow"> - <input type="hidden" name="table" value="top-10-relays"> - - <label>Start date (yyyy-mm-dd):</label> - <input type="text" name="start" size="10" - value="<c:choose><c:when test="${fn:length(top_10_relays_start) == 0}">${default_start_date}</c:when><c:otherwise>${top_10_relays_start[0]}</c:otherwise></c:choose>"> - <label>End date (yyyy-mm-dd):</label> - <input type="text" name="end" size="10" - value="<c:choose><c:when test="${fn:length(top_10_relays_end) == 0}">${default_end_date}</c:when><c:otherwise>${top_10_relays_end[0]}</c:otherwise></c:choose>"> - - <input class="submit" type="submit" value="Update table"> - - </div> -</form> <a name="bwhist-flags"></a> <h3><a href="#bwhist-flags" class="anchor">Relay bandwidth by Exit and/or

1 0