- tor-commits - lists.torproject.org

[tor/master] Our warning now is much more specific, mentioning proxy type/addr/port.
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit abe03f494321c985f5909558b5b476269982a894 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 14 03:27:07 2011 +0200 Our warning now is much more specific, mentioning proxy type/addr/port. Not included in the previous commit, because the implementation is ugly; I see no other way of doing this though. --- src/or/connection.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/connection.h | 1 + src/or/main.c | 7 +---- src/or/or.h | 2 + 4 files changed, 59 insertions(+), 6 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index ae69502..087ee29 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -66,6 +66,8 @@ static void set_constrained_socket_buffers(tor_socket_t sock, int size); static const char *connection_proxy_state_to_string(int state); static int connection_read_https_proxy_response(connection_t *conn); static void connection_send_socks5_connect(connection_t *conn); +static const char *proxy_type_to_string(int proxy_type); + /** The last IPv4 address that our network interface seemed to have been * binding to, in host order. We use this to detect when our IP changes. */ @@ -3936,7 +3938,7 @@ connection_dump_buffer_mem_stats(int severity) U64_PRINTF_ARG(used_by_type[i]), U64_PRINTF_ARG(alloc_by_type[i])); } } - + /** Verify that connection conn has all of its invariants * correct. Trigger an assert if anything is invalid. */ @@ -4099,3 +4101,54 @@ assert_connection_ok(connection_t *conn, time_t now) } } +void +log_failed_proxy_connection(connection_t *conn) +{ + or_options_t *options = get_options(); + int proxy_type; + tor_addr_t proxy_addr; + int proxy_port; + + if (options->HTTPSProxy) { + tor_addr_copy(&proxy_addr, &options->HTTPSProxyAddr); + proxy_port = options->HTTPSProxyPort; + proxy_type = PROXY_CONNECT; + } else if (options->Socks4Proxy) { + tor_addr_copy(&proxy_addr, &options->Socks4ProxyAddr); + proxy_port = options->Socks4ProxyPort; + proxy_type = PROXY_SOCKS4; + } else if (options->Socks5Proxy) { + tor_addr_copy(&proxy_addr, &options->Socks5ProxyAddr); + proxy_port = options->Socks5ProxyPort; + proxy_type = PROXY_SOCKS5; + } else if (options->ClientTransportPlugin) { + transport_info_t *transport; + transport = find_transport_by_bridge_addrport(&conn->addr, conn->port); + if (transport) { + tor_addr_copy(&proxy_addr, &transport->addr); + proxy_port = transport->port; + proxy_type = PROXY_PLUGGABLE; + } else + return; + } else + tor_assert(0); + + log_warn(LD_NET, + "The connection to the %s proxy server at %s:%u just failed. " + "Make sure that the proxy server is up and running.", + proxy_type_to_string(proxy_type), fmt_addr(&proxy_addr), + proxy_port); +} + +static const char * +proxy_type_to_string(int proxy_type) +{ + switch (proxy_type) { + case PROXY_CONNECT: return "HTTP"; + case PROXY_SOCKS4: return "SOCKS4"; + case PROXY_SOCKS5: return "SOCKS5"; + case PROXY_PLUGGABLE: return "pluggable transports SOCKS"; + case PROXY_NONE: return "NULL"; /* probably a bug */ + default: tor_assert(0); + } +} diff --git a/src/or/connection.h b/src/or/connection.h index 94ae645..ba6a258 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -57,6 +57,7 @@ int connection_connect(connection_t *conn, const char *address, int connection_proxy_connect(connection_t *conn, int type); int connection_read_proxy_handshake(connection_t *conn); +void log_failed_proxy_connection(connection_t *conn); int retry_all_listeners(smartlist_t *replaced_conns, smartlist_t *new_conns); diff --git a/src/or/main.c b/src/or/main.c index 09d35ed..f456b03 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -761,11 +761,8 @@ conn_close_if_marked(int i) /* If the connection we are about to close was trying to connect to a proxy server and failed, the client won't be able to use that proxy. We should warn him about this. */ - if (conn->proxy_state == PROXY_INFANT) { - log_warn(LD_NET, - "The connection to a configured proxy server just failed. " - "Make sure that the proxy server is up and running."); - } + if (conn->proxy_state == PROXY_INFANT) + log_failed_proxy_connection(conn); IF_HAS_BUFFEREVENT(conn, goto unlink); if ((SOCKET_OK(conn->s) || conn->linked_conn) && diff --git a/src/or/or.h b/src/or/or.h index 6f056b2..f713db7 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -230,6 +230,8 @@ typedef enum { #define PROXY_CONNECT 1 #define PROXY_SOCKS4 2 #define PROXY_SOCKS5 3 +/* pluggable transports proxy type */ +#define PROXY_PLUGGABLE 4 /* Proxy client handshake states */ /* We use a proxy but we haven't even connected to it yet. */

1 0

[tor/master] This commit is an attempt to beautify the previous commit.
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 5b050a9b08fa81421d7e923ef04d06b569f5f742 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 14 04:28:36 2011 +0200 This commit is an attempt to beautify the previous commit. It creates some helper functions that return the proxy type, proxy addr/port, etc. --- src/or/connection.c | 98 +++++++++++++++++++++++++++++++++++------------ src/or/connection.h | 3 + src/or/connection_or.c | 34 ++++++----------- 3 files changed, 88 insertions(+), 47 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 087ee29..f7ad84a 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4101,37 +4101,82 @@ assert_connection_ok(connection_t *conn, time_t now) } } -void -log_failed_proxy_connection(connection_t *conn) +/** + Fills addr and port with the details of the proxy + server of type 'proxy_type' we are using. + 'conn' contains a connection_t and is used for finding pluggable + transports proxies. + + Returns 1 if we were successfull, 0 if we are not using a proxy + server and -1 if something went wrong. +*/ +int +get_proxy_addrport(int proxy_type, tor_addr_t *addr, uint16_t *port, + connection_t *conn) { - or_options_t *options = get_options(); - int proxy_type; - tor_addr_t proxy_addr; - int proxy_port; - - if (options->HTTPSProxy) { - tor_addr_copy(&proxy_addr, &options->HTTPSProxyAddr); - proxy_port = options->HTTPSProxyPort; - proxy_type = PROXY_CONNECT; - } else if (options->Socks4Proxy) { - tor_addr_copy(&proxy_addr, &options->Socks4ProxyAddr); - proxy_port = options->Socks4ProxyPort; - proxy_type = PROXY_SOCKS4; - } else if (options->Socks5Proxy) { - tor_addr_copy(&proxy_addr, &options->Socks5ProxyAddr); - proxy_port = options->Socks5ProxyPort; - proxy_type = PROXY_SOCKS5; - } else if (options->ClientTransportPlugin) { + or_options_t *options; + + if (proxy_type == PROXY_NONE) + return 0; + + options = get_options(); + + if (proxy_type == PROXY_CONNECT) { + tor_addr_copy(addr, &options->HTTPSProxyAddr); + *port = options->HTTPSProxyPort; + } else if (proxy_type == PROXY_SOCKS4) { + tor_addr_copy(addr, &options->Socks4ProxyAddr); + *port = options->Socks4ProxyPort; + } else if (proxy_type == PROXY_SOCKS5) { + tor_addr_copy(addr, &options->Socks5ProxyAddr); + *port = options->Socks5ProxyPort; + } else if (proxy_type == PROXY_PLUGGABLE) { transport_info_t *transport; transport = find_transport_by_bridge_addrport(&conn->addr, conn->port); if (transport) { - tor_addr_copy(&proxy_addr, &transport->addr); - proxy_port = transport->port; - proxy_type = PROXY_PLUGGABLE; + tor_addr_copy(addr, &transport->addr); + *port = transport->port; } else - return; + return -1; } else - tor_assert(0); + return -1; + + return 1; +} + +/** + Returns the proxy type used by tor. +*/ +int +get_proxy_type(void) +{ + or_options_t *options = get_options(); + + if (options->HTTPSProxy) + return PROXY_CONNECT; + else if (options->Socks4Proxy) + return PROXY_SOCKS4; + else if (options->Socks5Proxy) + return PROXY_SOCKS5; + else if (options->ClientTransportPlugin) + return PROXY_PLUGGABLE; + else + return PROXY_NONE; +} + +/** + Log a failed connection to a proxy server. +*/ +void +log_failed_proxy_connection(connection_t *conn) +{ + int proxy_type; + tor_addr_t proxy_addr; + uint16_t proxy_port; + + proxy_type = get_proxy_type(); + if (get_proxy_addrport(proxy_type, &proxy_addr, &proxy_port, conn) <= 0) + return; log_warn(LD_NET, "The connection to the %s proxy server at %s:%u just failed. " @@ -4140,6 +4185,9 @@ log_failed_proxy_connection(connection_t *conn) proxy_port); } +/** + Transforms 'proxy_type' to it's string representation/ +*/ static const char * proxy_type_to_string(int proxy_type) { diff --git a/src/or/connection.h b/src/or/connection.h index ba6a258..544e939 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -58,6 +58,9 @@ int connection_connect(connection_t *conn, const char *address, int connection_proxy_connect(connection_t *conn, int type); int connection_read_proxy_handshake(connection_t *conn); void log_failed_proxy_connection(connection_t *conn); +int get_proxy_addrport(int proxy_type, tor_addr_t *addr, uint16_t *port, connection_t *conn); +int get_proxy_type(void); + int retry_all_listeners(smartlist_t *replaced_conns, smartlist_t *new_conns); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index b72cd77..f111bc1 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -839,6 +839,11 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, int socket_error = 0; tor_addr_t addr; + int r; + int proxy_type; + tor_addr_t proxy_addr; + uint16_t proxy_port; + tor_assert(_addr); tor_assert(id_digest); tor_addr_copy(&addr, _addr); @@ -855,29 +860,14 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, conn->_base.state = OR_CONN_STATE_CONNECTING; control_event_or_conn_status(conn, OR_CONN_EVENT_LAUNCHED, 0); - /* use a proxy server if available */ - if (options->HTTPSProxy) { - conn->_base.proxy_state = PROXY_INFANT; - tor_addr_copy(&addr, &options->HTTPSProxyAddr); - port = options->HTTPSProxyPort; - } else if (options->Socks4Proxy) { - conn->_base.proxy_state = PROXY_INFANT; - tor_addr_copy(&addr, &options->Socks4ProxyAddr); - port = options->Socks4ProxyPort; - } else if (options->Socks5Proxy) { + proxy_type = get_proxy_type(); + r = get_proxy_addrport(proxy_type, &proxy_addr, &proxy_port, TO_CONN(conn)); + if (r == 1) { /* proxy found. */ + addr = proxy_addr; + port = proxy_port; conn->_base.proxy_state = PROXY_INFANT; - tor_addr_copy(&addr, &options->Socks5ProxyAddr); - port = options->Socks5ProxyPort; - } else if (options->ClientTransportPlugin) { - transport_info_t *transport; - transport = find_transport_by_bridge_addrport(&addr, port); - if (transport) { - log_debug(LD_GENERAL, "Found transport. Setting up proxying!"); - conn->_base.proxy_state = PROXY_INFANT; - tor_addr_copy(&addr, &transport->addr); - port = transport->port; - } - } + } else if (r < 0) + return NULL; switch (connection_connect(TO_CONN(conn), conn->_base.address, &addr, port, &socket_error)) {

1 0

[tor/master] Fixes on circuitbuild.[ch] based on nick's comments.
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 392e947df5db1d2cdd0cbd0d63226f734dfd7267 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 21 18:46:50 2011 +0200 Fixes on circuitbuild.[ch] based on nick's comments. * Renamed transport_info_t to transport_t. * Introduced transport_get_by_name(). * Killed match_bridges_with_transports(). We currently *don't* detect whether any bridges miss their transports, of if any transports miss their bridges. * Various code and aesthetic tweaks and English language changes. --- src/or/circuitbuild.c | 231 ++++++++++++++++++------------------------------ src/or/circuitbuild.h | 10 +-- 2 files changed, 91 insertions(+), 150 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 53a3063..d5989f3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -79,6 +79,28 @@ typedef struct { * at which we last failed to connect to it. */ } entry_guard_t; +/** Information about a configured bridge. Currently this just matches the + * ones in the torrc file, but one day we may be able to learn about new + * bridges on our own, and remember them in the state file. */ +typedef struct { + /** Address of the bridge. */ + tor_addr_t addr; + /** TLS port for the bridge. */ + uint16_t port; + /** Boolean: We are re-parsing our bridge list, and we are going to remove + * this one if we don't find it in the list of configured bridges. */ + unsigned marked_for_removal : 1; + /** Expected identity digest, or all zero bytes if we don't know what the + * digest should be. */ + char identity[DIGEST_LEN]; + + /** Name of pluggable transport protocol taken from its config line. */ + char *transport_name; + + /** When should we next try to fetch a descriptor for this bridge? */ + download_status_t fetch_status; +} bridge_info_t; + /** A list of our chosen entry guards. */ static smartlist_t *entry_guards = NULL; /** A value of 1 means that the entry_guards list has changed @@ -100,7 +122,10 @@ static int count_acceptable_nodes(smartlist_t *routers); static int onion_append_hop(crypt_path_t **head_ptr, extend_info_t *choice); static void entry_guards_changed(void); -static void transport_free(transport_info_t *transport); + +static transport_t *transport_get_by_name(const char *name); +static void transport_free(transport_t *transport); +static void bridge_free(bridge_info_t *bridge); /** * This function decides if CBT learning should be disabled. It returns @@ -4498,33 +4523,6 @@ getinfo_helper_entry_guards(control_connection_t *conn, return 0; } -/** Information about a configured bridge. Currently this just matches the - * ones in the torrc file, but one day we may be able to learn about new - * bridges on our own, and remember them in the state file. */ -typedef struct { - /** Address of the bridge. */ - tor_addr_t addr; - /** TLS port for the bridge. */ - uint16_t port; - /** Boolean: We are re-parsing our bridge list, and we are going to remove - * this one if we don't find it in the list of configured bridges. */ - unsigned marked_for_removal : 1; - /** Expected identity digest, or all zero bytes if we don't know what the - * digest should be. */ - char identity[DIGEST_LEN]; - - /** Name of pluggable transport protocol taken from its config line. - Free'd when we match the bridge with a transport at - match_bridges_with_transports(). */ - char *transport_name_config; - - /** Pluggable transport proxy this bridge uses. */ - transport_info_t *transport; - - /** When should we next try to fetch a descriptor for this bridge? */ - download_status_t fetch_status; -} bridge_info_t; - /** A list of configured bridges. Whenever we actually get a descriptor * for one, we add it as an entry guard. Note that the order of bridges * in this list does not necessarily correspond to the order of bridges @@ -4552,7 +4550,7 @@ sweep_bridge_list(void) SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, b) { if (b->marked_for_removal) { SMARTLIST_DEL_CURRENT(bridge_list, b); - tor_free(b); + bridge_free(b); } } SMARTLIST_FOREACH_END(b); } @@ -4563,54 +4561,80 @@ clear_bridge_list(void) { if (!bridge_list) bridge_list = smartlist_create(); - SMARTLIST_FOREACH(bridge_list, bridge_info_t *, b, tor_free(b)); + SMARTLIST_FOREACH(bridge_list, bridge_info_t *, b, bridge_free(b)); smartlist_clear(bridge_list); } +/** Free the transport_t transport. */ +static void +bridge_free(bridge_info_t *bridge) +{ + if (!bridge) + return; + + tor_free(bridge->transport_name); + tor_free(bridge); +} + /** A list of pluggable transports found in torrc. */ static smartlist_t *transport_list = NULL; /** Initialize the pluggable transports list to empty, creating it if - needed. */ + * needed. */ void clear_transport_list(void) { if (!transport_list) transport_list = smartlist_create(); - SMARTLIST_FOREACH(transport_list, transport_info_t *, t, transport_free(t)); + SMARTLIST_FOREACH(transport_list, transport_t *, t, transport_free(t)); smartlist_clear(transport_list); } -/** - Free the transport_info_t transport. -*/ +/** Free the transport_t transport. */ static void -transport_free(transport_info_t *transport) +transport_free(transport_t *transport) { + if (!transport) + return; + tor_free(transport->name); tor_free(transport); } -/** Remember a new pluggable transport proxy at addr:port. - name is set to the name of the protocol this proxy uses. - socks_ver is set to the SOCKS version of the proxy. +/** Returns the transport in our transport list that has the name name. + * Else returns NULL. */ +static transport_t * +transport_get_by_name(const char *name) +{ + tor_assert(name); + if (transport_list) { + SMARTLIST_FOREACH_BEGIN(transport_list, transport_t *, transport) { + if (!strcmp(transport->name, name)) + return transport; + } SMARTLIST_FOREACH_END(transport); + } - Returns 1 on success, -1 on fail. -*/ + log_notice(LD_GENERAL, "We were asked to match '%s' to a pluggable " + "transport, and we failed. If you didn't expect this, please " + "check your configuration.", name); + return NULL; +} + +/** Remember a new pluggable transport proxy at addr:port. + * name is set to the name of the protocol this proxy uses. + * socks_ver is set to the SOCKS version of the proxy. + * + * Returns 0 on success, -1 on fail. */ int transport_add_from_config(const tor_addr_t *addr, uint16_t port, const char *name, int socks_ver) { - transport_info_t *t = tor_malloc_zero(sizeof(transport_info_t)); + transport_t *t = tor_malloc_zero(sizeof(transport_t)); - if (transport_list) { /*check out for duplicate transport names*/ - SMARTLIST_FOREACH_BEGIN(transport_list, transport_info_t *, transport) { - if (!strcmp(transport->name, name)) { - log_notice(LD_CONFIG, "More than one transports have '%s' as " - "their name.", transport->name); - goto err; - } - } SMARTLIST_FOREACH_END(transport); + if (transport_get_by_name(name)) { /* check for duplicate names */ + log_notice(LD_CONFIG, "More than one transports have '%s' as " + "their name.", name); + goto err; } tor_addr_copy(&t->addr, addr); @@ -4622,75 +4646,13 @@ transport_add_from_config(const tor_addr_t *addr, uint16_t port, transport_list = smartlist_create(); smartlist_add(transport_list, t); - return 1; + return 0; err: tor_free(t); return -1; } -/** - Attempts to map every transport found on torrc to it's - corresponding bridge. - Returns 1 on a succesfull bijective map, otherwise it returns -1. -*/ -int -match_bridges_with_transports(void) -{ - /* Used to check if a transport was finally found for a bridge */ - int found_match=0; - /* Number of matches. */ - int n_matches=0; - /* Number of transports. */ - int n_transports=0; - - tor_assert(transport_list); - tor_assert(bridge_list); - - /* Iterate bridges */ - SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, b) - { - /* Skip bridges without transports. */ - if (!b->transport_name_config) - continue; - found_match=0; - /* Iterate transports */ - SMARTLIST_FOREACH_BEGIN(transport_list, transport_info_t *, t) - { - /* If the transport name of the transport is the same as the - transport name of the bridge, we have a match. */ - if (!strcmp(b->transport_name_config, t->name)) { - found_match=1; - n_matches++; - b->transport = t; - log_warn(LD_CONFIG, "Matched transport '%s'", t->name); - break; - } - } SMARTLIST_FOREACH_END(t); - if (!found_match) { - log_warn(LD_CONFIG, "Couldn't find transport " - "match for %s!\n", b->transport_name_config); - /* tor_free(b->transport_name_config); */ - return -1; - } - } SMARTLIST_FOREACH_END(b); - - /* Count number of transports to make sure that all transports got - matched to bridges. */ - SMARTLIST_FOREACH(transport_list, transport_info_t *, t, n_transports++); - if (n_transports != n_matches) { - log_warn(LD_CONFIG, "You have %d transports but we only " - "managed to match %d of them!\n", n_transports, n_matches); - return -1; - } - - /* clear the method names taken from the config, we no longer need them. */ - SMARTLIST_FOREACH(bridge_list, bridge_info_t *, b, - tor_free(b->transport_name_config)); - - return 1; -} - /** Return a bridge pointer if ri is one of our known bridges * (either by comparing keys if possible, else by comparing addr/port). * Else return NULL. */ @@ -4771,11 +4733,8 @@ learned_router_identity(const tor_addr_t *addr, uint16_t port, * is set, it tells us the identity key too. If we already had the * bridge in our list, unmark it, and don't actually add anything new. * If transport_name is non-NULL - the bridge is associated with a - * pluggable transport - we assign the transport to the bridge. - * - * Returns 1 on success, -1 on fail. - */ -int + * pluggable transport - we assign the transport to the bridge. */ +void bridge_add_from_config(const tor_addr_t *addr, uint16_t port, const char *digest, const char *transport_name) { @@ -4783,7 +4742,7 @@ bridge_add_from_config(const tor_addr_t *addr, uint16_t port, if ((b = get_configured_bridge_by_addr_port_digest(addr, port, digest))) { b->marked_for_removal = 0; - return 1; + return; } b = tor_malloc_zero(sizeof(bridge_info_t)); @@ -4791,28 +4750,13 @@ bridge_add_from_config(const tor_addr_t *addr, uint16_t port, b->port = port; if (digest) memcpy(b->identity, digest, DIGEST_LEN); - if (transport_name) { - if (bridge_list) { /*check out for duplicate transport names*/ - SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, bridge) { - if (!strcmp(bridge->transport_name_config, transport_name)) { - log_notice(LD_CONFIG, "More than one bridges have '%s' as " - "their transport name.", transport_name); - goto err; - } - } SMARTLIST_FOREACH_END(bridge); - } - b->transport_name_config = strdup(transport_name); - } + if (transport_name) + b->transport_name = tor_strdup(transport_name); b->fetch_status.schedule = DL_SCHED_BRIDGE; if (!bridge_list) bridge_list = smartlist_create(); smartlist_add(bridge_list, b); - return 1; - - err: - tor_free(b); - return -1; } /** Return true iff routerset contains the bridge bridge. */ @@ -4846,23 +4790,22 @@ find_bridge_by_digest(const char *digest) } /** If addr and port match one of our known bridges, - * returns its transport protocol if it has one, else returns NULL. - */ -transport_info_t * + * returns its transport protocol if it has one, else returns NULL. */ +transport_t * find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port) { - assert(bridge_list); + tor_assert(bridge_list); SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, bridge) { if (tor_addr_eq(&bridge->addr, addr) && (bridge->port == port)) { - if (bridge->transport) { - log_debug(LD_GENERAL, "Found matching bridge!\n"); - return bridge->transport; + if (bridge->transport_name) { + return transport_get_by_name(bridge->transport_name); } else /* bridge found, but it had no transport */ - return NULL; + break; } } SMARTLIST_FOREACH_END(bridge); + return NULL; } diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 9e05d6e..83eb7ba 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -12,8 +12,7 @@ #ifndef _TOR_CIRCUITBUILD_H #define _TOR_CIRCUITBUILD_H -/** - Represents a pluggable transport proxy used by a bridge. */ +/** Represents a pluggable transport proxy used by a bridge. */ typedef struct { /* SOCKS version */ int socks_version; @@ -23,7 +22,7 @@ typedef struct { tor_addr_t addr; /* Port of proxy */ uint16_t port; -} transport_info_t; +} transport_t; char *circuit_list_path(origin_circuit_t *circ, int verbose); char *circuit_list_path_for_controller(origin_circuit_t *circ); @@ -82,7 +81,7 @@ int routerinfo_is_a_configured_bridge(const routerinfo_t *ri); int node_is_a_configured_bridge(const node_t *node); void learned_router_identity(const tor_addr_t *addr, uint16_t port, const char *digest); -int bridge_add_from_config(const tor_addr_t *addr, uint16_t port, +void bridge_add_from_config(const tor_addr_t *addr, uint16_t port, const char *digest, const char *transport_name); void retry_bridge_descriptor_fetch_directly(const char *digest); @@ -141,10 +140,9 @@ void circuit_build_times_network_circ_success(circuit_build_times_t *cbt); int circuit_build_times_get_bw_scale(networkstatus_t *ns); void clear_transport_list(void); -int match_bridges_with_transports(void); int transport_add_from_config(const tor_addr_t *addr, uint16_t port, const char *name, int socks_ver); -transport_info_t * +transport_t * find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port); #endif

1 0

[tor/master] Fixes small bugs.
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 93526cdf0b9a9df1bcb69454060d24d819c15024 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 14 16:00:55 2011 +0200 Fixes small bugs. --- src/or/circuitbuild.c | 50 ++++++++++++++++++++++++++++++++++++++++++----- src/or/circuitbuild.h | 4 +- src/or/config.c | 28 +++++++++++++++++++------- src/or/connection.c | 5 +-- src/or/connection_or.c | 5 +++- 5 files changed, 72 insertions(+), 20 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 4dcc685..53a3063 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4594,21 +4594,39 @@ transport_free(transport_info_t *transport) /** Remember a new pluggable transport proxy at addr:port. name is set to the name of the protocol this proxy uses. socks_ver is set to the SOCKS version of the proxy. + + Returns 1 on success, -1 on fail. */ -void +int transport_add_from_config(const tor_addr_t *addr, uint16_t port, const char *name, int socks_ver) { transport_info_t *t = tor_malloc_zero(sizeof(transport_info_t)); + if (transport_list) { /*check out for duplicate transport names*/ + SMARTLIST_FOREACH_BEGIN(transport_list, transport_info_t *, transport) { + if (!strcmp(transport->name, name)) { + log_notice(LD_CONFIG, "More than one transports have '%s' as " + "their name.", transport->name); + goto err; + } + } SMARTLIST_FOREACH_END(transport); + } + tor_addr_copy(&t->addr, addr); t->port = port; t->name = tor_strdup(name); + t->socks_version = socks_ver; if (!transport_list) transport_list = smartlist_create(); smartlist_add(transport_list, t); + return 1; + + err: + tor_free(t); + return -1; } /** @@ -4645,9 +4663,8 @@ match_bridges_with_transports(void) found_match=1; n_matches++; b->transport = t; - tor_free(b->transport_name_config); log_warn(LD_CONFIG, "Matched transport '%s'", t->name); - continue; + break; } } SMARTLIST_FOREACH_END(t); if (!found_match) { @@ -4667,6 +4684,10 @@ match_bridges_with_transports(void) return -1; } + /* clear the method names taken from the config, we no longer need them. */ + SMARTLIST_FOREACH(bridge_list, bridge_info_t *, b, + tor_free(b->transport_name_config)); + return 1; } @@ -4751,8 +4772,10 @@ learned_router_identity(const tor_addr_t *addr, uint16_t port, * bridge in our list, unmark it, and don't actually add anything new. * If transport_name is non-NULL - the bridge is associated with a * pluggable transport - we assign the transport to the bridge. + * + * Returns 1 on success, -1 on fail. */ -void +int bridge_add_from_config(const tor_addr_t *addr, uint16_t port, const char *digest, const char *transport_name) { @@ -4760,7 +4783,7 @@ bridge_add_from_config(const tor_addr_t *addr, uint16_t port, if ((b = get_configured_bridge_by_addr_port_digest(addr, port, digest))) { b->marked_for_removal = 0; - return; + return 1; } b = tor_malloc_zero(sizeof(bridge_info_t)); @@ -4768,13 +4791,28 @@ bridge_add_from_config(const tor_addr_t *addr, uint16_t port, b->port = port; if (digest) memcpy(b->identity, digest, DIGEST_LEN); - if (transport_name) + if (transport_name) { + if (bridge_list) { /*check out for duplicate transport names*/ + SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, bridge) { + if (!strcmp(bridge->transport_name_config, transport_name)) { + log_notice(LD_CONFIG, "More than one bridges have '%s' as " + "their transport name.", transport_name); + goto err; + } + } SMARTLIST_FOREACH_END(bridge); + } b->transport_name_config = strdup(transport_name); + } b->fetch_status.schedule = DL_SCHED_BRIDGE; if (!bridge_list) bridge_list = smartlist_create(); smartlist_add(bridge_list, b); + return 1; + + err: + tor_free(b); + return -1; } /** Return true iff routerset contains the bridge bridge. */ diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index c1833d2..9e05d6e 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -82,7 +82,7 @@ int routerinfo_is_a_configured_bridge(const routerinfo_t *ri); int node_is_a_configured_bridge(const node_t *node); void learned_router_identity(const tor_addr_t *addr, uint16_t port, const char *digest); -void bridge_add_from_config(const tor_addr_t *addr, uint16_t port, +int bridge_add_from_config(const tor_addr_t *addr, uint16_t port, const char *digest, const char *transport_name); void retry_bridge_descriptor_fetch_directly(const char *digest); @@ -142,7 +142,7 @@ int circuit_build_times_get_bw_scale(networkstatus_t *ns); void clear_transport_list(void); int match_bridges_with_transports(void); -void transport_add_from_config(const tor_addr_t *addr, uint16_t port, +int transport_add_from_config(const tor_addr_t *addr, uint16_t port, const char *name, int socks_ver); transport_info_t * find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port); diff --git a/src/or/config.c b/src/or/config.c index 4770287..a78252c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -570,7 +570,8 @@ static int options_transition_affects_descriptor(or_options_t *old_options, static int check_nickname_list(const char *lst, const char *name, char **msg); static void config_register_addressmaps(or_options_t *options); -static int parse_bridge_line(const char *line, int validate_only); +static int parse_bridge_line(const char *line, int validate_only, + or_options_t *options); static int parse_client_transport_line(const char *line, int validate_only); static int parse_dir_server_line(const char *line, dirinfo_type_t required_type, @@ -1222,7 +1223,7 @@ options_act(or_options_t *old_options) if (options->Bridges) { mark_bridge_list(); for (cl = options->Bridges; cl; cl = cl->next) { - if (parse_bridge_line(cl->value, 0)<0) { + if (parse_bridge_line(cl->value, 0, options)<0) { log_warn(LD_BUG, "Previously validated Bridge line could not be added!"); return -1; @@ -3709,7 +3710,7 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->Bridges) { for (cl = options->Bridges; cl; cl = cl->next) { - if (parse_bridge_line(cl->value, 1)<0) + if (parse_bridge_line(cl->value, 1, options)<0) REJECT("Bridge line did not parse. See logs for details."); } } @@ -4592,7 +4593,8 @@ options_init_logs(or_options_t *options, int validate_only) * validate_only is 0, and the line is well-formed, then add * the bridge described in the line to our internal bridge list. */ static int -parse_bridge_line(const char *line, int validate_only) +parse_bridge_line(const char *line, int validate_only, + or_options_t *options) { smartlist_t *items = NULL; int r; @@ -4616,6 +4618,12 @@ parse_bridge_line(const char *line, int validate_only) smartlist_del_keeporder(items, 0); if (!strstr(field1, ".")) { /* new-style bridge line */ + if (!options->ClientTransportPlugin) { + log_warn(LD_CONFIG, "Pluggable transports protocol found " + "in bridge line, but no ClientTransportPlugin lines found."); + goto err; + } + transport_name = field1; addrport = smartlist_get(items, 0); smartlist_del_keeporder(items, 0); @@ -4649,8 +4657,10 @@ parse_bridge_line(const char *line, int validate_only) log_debug(LD_DIR, "Bridge at %s:%d with transport %s (%s)", fmt_addr(&addr), (int)port, transport_name, fingerprint ? fingerprint : "no key listed"); - bridge_add_from_config(&addr, port, - fingerprint ? digest : NULL, transport_name); + + if (bridge_add_from_config(&addr, port, + fingerprint ? digest : NULL,transport_name) < 0) + goto err; } r = 0; @@ -4729,8 +4739,10 @@ parse_client_transport_line(const char *line, int validate_only) if (!validate_only) { log_debug(LD_DIR, "Transport %s found at %s:%d", name, fmt_addr(&addr), (int)port); - transport_add_from_config(&addr, port, name, - socks_ver); + + if (transport_add_from_config(&addr, port, name, + socks_ver) < 0) + goto err; } r = 0; diff --git a/src/or/connection.c b/src/or/connection.c index f7ad84a..898f242 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4104,8 +4104,7 @@ assert_connection_ok(connection_t *conn, time_t now) /** Fills addr and port with the details of the proxy server of type 'proxy_type' we are using. - 'conn' contains a connection_t and is used for finding pluggable - transports proxies. + 'conn' contains the connection_t we are using the proxy for. Returns 1 if we were successfull, 0 if we are not using a proxy server and -1 if something went wrong. @@ -4186,7 +4185,7 @@ log_failed_proxy_connection(connection_t *conn) } /** - Transforms 'proxy_type' to it's string representation/ + Return string representation of proxy_type. */ static const char * proxy_type_to_string(int proxy_type) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index f111bc1..4ed4723 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -860,14 +860,17 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, conn->_base.state = OR_CONN_STATE_CONNECTING; control_event_or_conn_status(conn, OR_CONN_EVENT_LAUNCHED, 0); + /* If we are using a proxy server, find it and use it. */ proxy_type = get_proxy_type(); r = get_proxy_addrport(proxy_type, &proxy_addr, &proxy_port, TO_CONN(conn)); if (r == 1) { /* proxy found. */ addr = proxy_addr; port = proxy_port; conn->_base.proxy_state = PROXY_INFANT; - } else if (r < 0) + } else if (r < 0) { + log_info(LD_PROTOCOL, "Failed on getting proxy addrport."); return NULL; + } switch (connection_connect(TO_CONN(conn), conn->_base.address, &addr, port, &socket_error)) {

1 0

[tor/master] Tweaked connection{.c, .h, _or.c} based on nick's comments.
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 298f1700367f4d17cf376ea09442b23e7f16229b Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 21 18:48:43 2011 +0200 Tweaked connection{.c,.h,_or.c} based on nick's comments. * Tweaked doxygen comments. * Changed returns of get_proxy_addrport(). * Ran make check-spaces. * Various small code tweaks. --- src/or/connection.c | 62 +++++++++++++++++++++--------------------------- src/or/connection.h | 4 +- src/or/connection_or.c | 9 ++---- 3 files changed, 32 insertions(+), 43 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 898f242..fafea43 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -68,7 +68,6 @@ static int connection_read_https_proxy_response(connection_t *conn); static void connection_send_socks5_connect(connection_t *conn); static const char *proxy_type_to_string(int proxy_type); - /** The last IPv4 address that our network interface seemed to have been * binding to, in host order. We use this to detect when our IP changes. */ static uint32_t last_interface_ip = 0; @@ -3938,7 +3937,7 @@ connection_dump_buffer_mem_stats(int severity) U64_PRINTF_ARG(used_by_type[i]), U64_PRINTF_ARG(alloc_by_type[i])); } } - + /** Verify that connection conn has all of its invariants * correct. Trigger an assert if anything is invalid. */ @@ -4101,22 +4100,19 @@ assert_connection_ok(connection_t *conn, time_t now) } } -/** - Fills addr and port with the details of the proxy - server of type 'proxy_type' we are using. - 'conn' contains the connection_t we are using the proxy for. - - Returns 1 if we were successfull, 0 if we are not using a proxy - server and -1 if something went wrong. -*/ +/** Fills addr and port with the details of the proxy + * server of type proxy_type we are using. + * conn contains the connection_t we are using the proxy for. + * Returns 0 if we were successfull or returns 1 if we are not using + * a proxy. */ int -get_proxy_addrport(int proxy_type, tor_addr_t *addr, uint16_t *port, +get_proxy_addrport(int proxy_type, tor_addr_t *addr, uint16_t *port, connection_t *conn) { or_options_t *options; if (proxy_type == PROXY_NONE) - return 0; + return 1; options = get_options(); @@ -4130,22 +4126,20 @@ get_proxy_addrport(int proxy_type, tor_addr_t *addr, uint16_t *port, tor_addr_copy(addr, &options->Socks5ProxyAddr); *port = options->Socks5ProxyPort; } else if (proxy_type == PROXY_PLUGGABLE) { - transport_info_t *transport; + transport_t *transport; transport = find_transport_by_bridge_addrport(&conn->addr, conn->port); if (transport) { tor_addr_copy(addr, &transport->addr); *port = transport->port; - } else - return -1; - } else - return -1; + } else { /* no transport for this bridge. */ + return 1; + } + } - return 1; -} + return 0; +} -/** - Returns the proxy type used by tor. -*/ +/** Returns the proxy type used by tor. */ int get_proxy_type(void) { @@ -4162,10 +4156,9 @@ get_proxy_type(void) else return PROXY_NONE; } - -/** - Log a failed connection to a proxy server. -*/ + +/** Log a failed connection to a proxy server. + * conn is the connection we use the proxy server for. */ void log_failed_proxy_connection(connection_t *conn) { @@ -4174,19 +4167,17 @@ log_failed_proxy_connection(connection_t *conn) uint16_t proxy_port; proxy_type = get_proxy_type(); - if (get_proxy_addrport(proxy_type, &proxy_addr, &proxy_port, conn) <= 0) - return; - + if (get_proxy_addrport(proxy_type, &proxy_addr, &proxy_port, conn) != 0) + return; /* if we have no proxy set up leave this function. */ + log_warn(LD_NET, "The connection to the %s proxy server at %s:%u just failed. " "Make sure that the proxy server is up and running.", - proxy_type_to_string(proxy_type), fmt_addr(&proxy_addr), - proxy_port); + proxy_type_to_string(proxy_type), fmt_addr(&proxy_addr), + proxy_port); } -/** - Return string representation of proxy_type. -*/ +/** Return string representation of proxy_type. */ static const char * proxy_type_to_string(int proxy_type) { @@ -4196,6 +4187,7 @@ proxy_type_to_string(int proxy_type) case PROXY_SOCKS5: return "SOCKS5"; case PROXY_PLUGGABLE: return "pluggable transports SOCKS"; case PROXY_NONE: return "NULL"; /* probably a bug */ - default: tor_assert(0); + default: tor_assert(0); } } + diff --git a/src/or/connection.h b/src/or/connection.h index 544e939..34be9cc 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -58,10 +58,10 @@ int connection_connect(connection_t *conn, const char *address, int connection_proxy_connect(connection_t *conn, int type); int connection_read_proxy_handshake(connection_t *conn); void log_failed_proxy_connection(connection_t *conn); -int get_proxy_addrport(int proxy_type, tor_addr_t *addr, uint16_t *port, connection_t *conn); +int get_proxy_addrport(int proxy_type, tor_addr_t *addr, + uint16_t *port, connection_t *conn); int get_proxy_type(void); - int retry_all_listeners(smartlist_t *replaced_conns, smartlist_t *new_conns); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 4ed4723..6ed6fe6 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -336,7 +336,7 @@ connection_or_finished_connecting(or_connection_t *or_conn) else if (get_options()->Socks5Proxy) proxy_type = PROXY_SOCKS5; else if (get_options()->ClientTransportPlugin) { - transport_info_t *transport; + transport_t *transport; transport = find_transport_by_bridge_addrport(&conn->addr,conn->port); if (transport) { /* this bridge supports transports. use proxy. */ log_debug(LD_GENERAL, "Found transport. Setting proxy type!\n"); @@ -863,13 +863,10 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, /* If we are using a proxy server, find it and use it. */ proxy_type = get_proxy_type(); r = get_proxy_addrport(proxy_type, &proxy_addr, &proxy_port, TO_CONN(conn)); - if (r == 1) { /* proxy found. */ - addr = proxy_addr; + if (r == 0) { /* proxy found. */ + tor_addr_copy(&addr, &proxy_addr); port = proxy_port; conn->_base.proxy_state = PROXY_INFANT; - } else if (r < 0) { - log_info(LD_PROTOCOL, "Failed on getting proxy addrport."); - return NULL; } switch (connection_connect(TO_CONN(conn), conn->_base.address,

1 0

[tor/master] Look at the right consensus in router_add_to_routerlist()
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 60832766ac19e8f027455d23254e376042c21ef2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 10:02:24 2011 -0400 Look at the right consensus in router_add_to_routerlist() Just looking at the "latest" consensus could give us a microdesc consensus, if microdescs were enabled. That would make us decide that every routerdesc was unlisted in the latest consensus and drop them all: Ouch. Fixes bug 3113; bugfix on 0.2.3.1-alpha. --- changes/bug3113 | 4 ++++ src/or/routerlist.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug3113 b/changes/bug3113 new file mode 100644 index 0000000..7c3b5ce --- /dev/null +++ b/changes/bug3113 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Do not free all general-purposes regular descriptors just + because microdescriptor use is enabled. Fixes bug 3113; + bugfix on 0.2.3.1-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 00557a2..5aaa4a9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3273,7 +3273,8 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg, int authdir = authdir_mode_handles_descs(options, router->purpose); int authdir_believes_valid = 0; routerinfo_t *old_router; - networkstatus_t *consensus = networkstatus_get_latest_consensus(); + networkstatus_t *consensus = + networkstatus_get_latest_consensus_by_flavor(FLAV_NS); const smartlist_t *networkstatus_v2_list = networkstatus_get_v2_list(); int in_consensus = 0;

1 0

[tor/master] Kill redundant checks around routerset_contains_*()
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 64c8e8edda5a7f3525a1ab365c4bd72b19212322 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 7 11:52:13 2011 -0400 Kill redundant checks around routerset_contains_*() All of the routerset_contains*() functions return 0 if their routerset_t argument is NULL. Therefore, there's no point in doing "if (ExcludeNodes && routerset_contains*(ExcludeNodes...))", for example. This patch fixes every instance of if (X && routerstatus_contains*(X,...)) Note that there are other patterns that _aren't_ redundant. For example, we *don't* want to change: if (EntryNodes && !routerstatus_contains(EntryNodes,...)) Fixes #2797. No bug here; just needless code. --- src/or/circuitbuild.c | 6 ++---- src/or/connection_edge.c | 3 +-- src/or/directory.c | 2 +- src/or/rendclient.c | 2 +- src/or/rendservice.c | 2 +- src/or/routerlist.c | 7 ++++--- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 4ec45bc..90d9280 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2693,8 +2693,7 @@ choose_good_exit_server_general(int need_uptime, int need_capacity) n_supported[i] = -1; continue; /* skip routers that are known to be down or bad exits */ } - if (options->_ExcludeExitNodesUnion && - routerset_contains_node(options->_ExcludeExitNodesUnion, node)) { + if (routerset_contains_node(options->_ExcludeExitNodesUnion, node)) { n_supported[i] = -1; continue; /* user asked us not to use it, no matter what */ } @@ -3505,8 +3504,7 @@ entry_is_live(entry_guard_t *e, int need_uptime, int need_capacity, return NULL; } } - if (options->EntryNodes && - routerset_contains_node(options->EntryNodes, node)) { + if (routerset_contains_node(options->EntryNodes, node)) { /* they asked for it, they get it */ need_uptime = need_capacity = 0; } diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index c490148..3f6e87c 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3146,8 +3146,7 @@ connection_ap_can_use_exit(edge_connection_t *conn, const node_t *exit) if (!conn->chosen_exit_name && node_exit_policy_rejects_all(exit)) return 0; } - if (options->_ExcludeExitNodesUnion && - routerset_contains_node(options->_ExcludeExitNodesUnion, exit)) { + if (routerset_contains_node(options->_ExcludeExitNodesUnion, exit)) { /* Not a suitable exit. Refuse it. */ return 0; } diff --git a/src/or/directory.c b/src/or/directory.c index 9e1373d..17413ed 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -306,7 +306,7 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, if (exclude_self && router_digest_is_me(ds->digest)) continue; - if (options->ExcludeNodes && options->StrictNodes && + if (options->StrictNodes && routerset_contains_routerstatus(options->ExcludeNodes, rs, -1)) { log_warn(LD_DIR, "Wanted to contact authority '%s' for %s, but " "it's in our ExcludedNodes list and StrictNodes is set. " diff --git a/src/or/rendclient.c b/src/or/rendclient.c index b618d0f..5164559 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -948,7 +948,7 @@ rend_client_get_random_intro_impl(const rend_cache_entry_t *entry, intro->extend_info = extend_info_from_node(node); } /* Check if we should refuse to talk to this router. */ - if (options->ExcludeNodes && strict && + if (strict && routerset_contains_extendinfo(options->ExcludeNodes, intro->extend_info)) { n_excluded++; diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 4413ae9..47a9fc7 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1079,7 +1079,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, } /* Check if we'd refuse to talk to this router */ - if (options->ExcludeNodes && options->StrictNodes && + if (options->StrictNodes && routerset_contains_extendinfo(options->ExcludeNodes, extend_info)) { log_warn(LD_REND, "Client asked to rendezvous at a relay that we " "exclude, and StrictNodes is set. Refusing service."); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 15f643c..00557a2 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1132,7 +1132,7 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags) if ((type & MICRODESC_DIRINFO) && !is_trusted && !node->rs->version_supports_microdesc_cache) continue; - if (try_excluding && options->ExcludeNodes && + if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, status, country)) { ++n_excluded; @@ -1237,7 +1237,7 @@ router_pick_trusteddirserver_impl(dirinfo_type_t type, int flags, continue; if (requireother && me && router_digest_is_me(d->digest)) continue; - if (try_excluding && options->ExcludeNodes && + if (try_excluding && routerset_contains_routerstatus(options->ExcludeNodes, &d->fake_status, -1)) { ++n_excluded; @@ -5567,7 +5567,8 @@ routerset_contains(const routerset_t *set, const tor_addr_t *addr, const char *nickname, const char *id_digest, country_t country) { - if (!set || !set->list) return 0; + if (!set || !set->list) + return 0; if (nickname && strmap_get_lc(set->names, nickname)) return 4; if (id_digest && digestmap_get(set->digests, id_digest))

1 0

[tor/master] Merge branch 'bug2797'
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 3799ce7970a5d1fe21ce2921c763f06e4369cfee Merge: 7dcd105 64c8e8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 09:48:38 2011 -0400 Merge branch 'bug2797' src/or/circuitbuild.c | 6 ++---- src/or/connection_edge.c | 3 +-- src/or/directory.c | 2 +- src/or/rendclient.c | 2 +- src/or/rendservice.c | 2 +- src/or/routerlist.c | 7 ++++--- 6 files changed, 10 insertions(+), 12 deletions(-)

1 0

[metrics-web/master] Show possible censorship events in user graphs.
by karsten＠torproject.org 11 Jul '11

11 Jul '11

commit ca34678f08780173a2e6736acf48db80e5903f3a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 11 13:24:33 2011 +0200 Show possible censorship events in user graphs. --- rserve/graphs.R | 23 ++++++++++++++++++- .../ernie/web/GraphParameterChecker.java | 23 +++++++++++++++++++- web/WEB-INF/users.jsp | 5 ++++ 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index cff39a2..c6ba4fd 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -600,7 +600,7 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) } -plot_direct_users <- function(start, end, country, path, dpi) { +plot_direct_users <- function(start, end, country, events, path, dpi) { drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, r, bwp, brn, bwn, brp, bwr, brr ", @@ -630,7 +630,25 @@ plot_direct_users <- function(start, end, country, path, dpi) { date_breaks <- date_breaks( as.numeric(max(as.Date(u$date, "%Y-%m-%d")) - min(as.Date(u$date, "%Y-%m-%d")))) - ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) + + plot <- ggplot(u, aes(x = as.Date(date, "%Y-%m-%d"), y = users)) + if (events == "on" & country != "all") { + r <- read.csv( + "/srv/metrics.torproject.org/web/direct-users-ranges.csv", + stringsAsFactors = FALSE) + r <- r[r$date >= start & r$date <= end & r$country == country, + c("date", "minusers", "maxusers")] + r <- cast(rbind(melt(u, id.vars = "date"), melt(r, id.vars = "date"))) + upturns <- r[r$users > r$maxusers, 1:2] + downturns <- r[r$users < r$minusers, 1:2] + plot <- plot + + geom_ribbon(data = r, aes(ymin = minusers, ymax = maxusers), + fill = "gray") + + geom_point(data = upturns, aes(x = date, y = users), size = 5, + colour = "dodgerblue2") + + geom_point(data = downturns, aes(x = date, y = users), size = 5, + colour = "firebrick2") + } + plot <- plot + geom_line(size = 1) + scale_x_date(name = paste("\nThe Tor Project - ", "https://metrics.torproject.org/", sep = ""), @@ -639,6 +657,7 @@ plot_direct_users <- function(start, end, country, path, dpi) { scale_y_continuous(name = "", limits = c(0, max(u$users, na.rm = TRUE)), formatter = formatter) + opts(title = title) + print(plot) ggsave(filename = path, width = 8, height = 5, dpi = as.numeric(dpi)) } diff --git a/src/org/torproject/ernie/web/GraphParameterChecker.java b/src/org/torproject/ernie/web/GraphParameterChecker.java index 95e4cf0..7349bf9 100644 --- a/src/org/torproject/ernie/web/GraphParameterChecker.java +++ b/src/org/torproject/ernie/web/GraphParameterChecker.java @@ -50,7 +50,7 @@ public class GraphParameterChecker { this.availableGraphs.put("bwhist-flags", "start,end,filename,dpi"); this.availableGraphs.put("dirbytes", "start,end,filename,dpi"); this.availableGraphs.put("direct-users", - "start,end,country,filename,dpi"); + "start,end,country,events,filename,dpi"); this.availableGraphs.put("bridge-users", "start,end,country,filename,dpi"); this.availableGraphs.put("gettor", "start,end,bundle,filename,dpi"); @@ -70,6 +70,7 @@ public class GraphParameterChecker { sb.append("," + country[0]); } this.knownParameterValues.put("country", sb.toString()); + this.knownParameterValues.put("events", "on,off"); this.knownParameterValues.put("bundle", "all,en,zh_CN,fa"); this.knownParameterValues.put("source", "all,siv,moria,torperf"); this.knownParameterValues.put("filesize", "50kb,1mb,5mb"); @@ -197,6 +198,26 @@ public class GraphParameterChecker { recognizedGraphParameters.put("country", countryParameters); } + /* Parse whether the estimated min/max range shall be displayed if + * supported by the graph type. This parameter can either be "on" or + * "off," where "off" is the default. */ + if (supportedGraphParameters.contains("events")) { + String[] eventsParameter = (String[]) requestParameters.get( + "events"); + List<String> knownRanges = Arrays.asList( + this.knownParameterValues.get("events").split(",")); + if (eventsParameter != null) { + if (eventsParameter.length != 1 || + eventsParameter[0].length() == 0 || + !knownRanges.contains(eventsParameter[0])) { + return null; + } + } else { + eventsParameter = new String[] { "off" }; + } + recognizedGraphParameters.put("events", eventsParameter); + } + /* Parse GetTor bundle if supported by the graph type. Only a single * bundle can be passed. If no bundle is passed, use "all" as * default. */ diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index 60be8ab..814c15c 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -43,6 +43,11 @@ based on the requests seen by a few dozen directory mirrors. </c:forEach> </select> + Show possible censorship events if available (BETA) + <input type="checkbox" name="events" value="on" + <c:if test="${direct_users_events[0] eq 'on'}"> checked</c:if> + ></input> + Resolution: <select name="dpi"> <option value="72"<c:if test="${direct_users_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> <option value="150"<c:if test="${direct_users_dpi[0] eq '150'}"> selected</c:if>>Print low - 1200x750</option>

1 0

[metrics-tasks/master] Export min/max ranges of daily user numbers (#2718).
by karsten＠torproject.org 11 Jul '11

11 Jul '11

commit 9f401d1782ea8b16ad01ed35309d8c8404e26670 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 11 13:14:01 2011 +0200 Export min/max ranges of daily user numbers (#2718). --- task-2718/detector.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/task-2718/detector.py b/task-2718/detector.py index 0370d02..716bbdf 100644 --- a/task-2718/detector.py +++ b/task-2718/detector.py @@ -290,6 +290,25 @@ def plot_all(tss, minx, maxx, INTERV, DAYS=None, rdir="img"): plot_target(tss, c,xtitle, minx, maxx, DAYS, INTERV) summary_file.close() +def write_all(tss, minc, maxc, INTERVAL=7): + ranges_file = file("direct-users-ranges.csv", "w") + ranges_file.write("date,country,minusers,maxusers\n") + exclude = set(["all", "??", "date"]) + for c in tss.country_codes: + if c in exclude: + continue + print ".", + series = tss.get_country_series(c) + for i, v in enumerate(series): + if i > 0 and i - INTERVAL >= 0 and series[i] != None and series[i-INTERVAL] != None and series[i-INTERVAL] != 0 and minc[i]!= None and maxc[i]!= None: + minv = minc[i] * poisson.ppf(1-0.9999, series[i-INTERVAL]) + maxv = maxc[i] * poisson.ppf(0.9999, series[i-INTERVAL]) + if not minv < maxv: + print minv, maxv, series[i-INTERVAL], minc[i], maxc[i] + assert minv < maxv + ranges_file.write("%s,%s,%s,%s\n" % (tss.all_dates[i], c, minv, maxv)) + ranges_file.close() + def main(): # Change these to customize script CSV_FILE = "direct-users.csv" @@ -301,6 +320,7 @@ def main(): l = tss.get_largest_locations(50) minx, maxx = make_tendencies_minmax(l, INTERV) plot_all(tss, minx, maxx, INTERV, DAYS, rdir=GRAPH_DIR) + write_all(tss, minx, maxx, INTERV) if __name__ == "__main__": main()

1 0