tor-commits July 2011

tor-commits@lists.torproject.org

16 participants
868 discussions

[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] 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] We now warn the user if a proxy server is not up when we try to connect with it.
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit a79bea40d84fd369ef4df950765afc4c635f9b31 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 14 02:51:59 2011 +0200 We now warn the user if a proxy server is not up when we try to connect with it. --- src/or/config.c | 13 +++++++++++-- src/or/connection.c | 1 + src/or/connection_or.c | 11 +++++------ src/or/main.c | 10 ++++++++++ src/or/or.h | 25 ++++++++++++++++++------- 5 files changed, 45 insertions(+), 15 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index b659d9b..4770287 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3565,8 +3565,17 @@ options_validate(or_options_t *old_options, or_options_t *options, } } - if (options->Socks4Proxy && options->Socks5Proxy) - REJECT("You cannot specify both Socks4Proxy and SOCKS5Proxy"); + /* Check if more than one proxy type has been enabled. This looks REALLY ugly! */ + if ((options->Socks4Proxy && (options->Socks5Proxy || options->HTTPSProxy + || options->ClientTransportPlugin)) || + (options->Socks5Proxy && (options->Socks4Proxy || options->HTTPSProxy + || options->ClientTransportPlugin)) || + (options->HTTPSProxy && (options->Socks4Proxy || options->Socks5Proxy + || options->ClientTransportPlugin)) || + (options->ClientTransportPlugin && (options->Socks4Proxy + || options->Socks5Proxy || options->HTTPSProxy))) + REJECT("You have configured more than one proxy types. " + "(Socks4Proxy|Socks5Proxy|HTTPSProxy|ClientTransportPlugin)"); if (options->Socks5ProxyUsername) { size_t len; diff --git a/src/or/connection.c b/src/or/connection.c index 81f0cdf..ae69502 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1461,6 +1461,7 @@ connection_proxy_state_to_string(int state) static const char *unknown = "???"; static const char *states[] = { "PROXY_NONE", + "PROXY_INFANT", "PROXY_HTTPS_WANT_CONNECT_OK", "PROXY_SOCKS4_WANT_CONNECT_OK", "PROXY_SOCKS5_WANT_AUTH_METHOD_NONE", diff --git a/src/or/connection_or.c b/src/or/connection_or.c index cca7c9f..b72cd77 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -837,7 +837,6 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, or_connection_t *conn; or_options_t *options = get_options(); int socket_error = 0; - int using_proxy = 0; tor_addr_t addr; tor_assert(_addr); @@ -858,15 +857,15 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, /* use a proxy server if available */ if (options->HTTPSProxy) { - using_proxy = 1; + conn->_base.proxy_state = PROXY_INFANT; tor_addr_copy(&addr, &options->HTTPSProxyAddr); port = options->HTTPSProxyPort; } else if (options->Socks4Proxy) { - using_proxy = 1; + conn->_base.proxy_state = PROXY_INFANT; tor_addr_copy(&addr, &options->Socks4ProxyAddr); port = options->Socks4ProxyPort; } else if (options->Socks5Proxy) { - using_proxy = 1; + conn->_base.proxy_state = PROXY_INFANT; tor_addr_copy(&addr, &options->Socks5ProxyAddr); port = options->Socks5ProxyPort; } else if (options->ClientTransportPlugin) { @@ -874,7 +873,7 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, transport = find_transport_by_bridge_addrport(&addr, port); if (transport) { log_debug(LD_GENERAL, "Found transport. Setting up proxying!"); - using_proxy = 1; + conn->_base.proxy_state = PROXY_INFANT; tor_addr_copy(&addr, &transport->addr); port = transport->port; } @@ -885,7 +884,7 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, case -1: /* If the connection failed immediately, and we're using * a proxy, our proxy is down. Don't blame the Tor server. */ - if (!using_proxy) + if (conn->_base.proxy_state == PROXY_INFANT) entry_guard_register_connect_status(conn->identity_digest, 0, 1, time(NULL)); connection_or_connect_failed(conn, diff --git a/src/or/main.c b/src/or/main.c index bb56be7..09d35ed 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -757,6 +757,16 @@ conn_close_if_marked(int i) #endif log_debug(LD_NET,"Cleaning up connection (fd %d).",conn->s); + + /* 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_HAS_BUFFEREVENT(conn, goto unlink); if ((SOCKET_OK(conn->s) || conn->linked_conn) && connection_wants_to_flush(conn)) { diff --git a/src/or/or.h b/src/or/or.h index 8cc2af2..6f056b2 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -232,13 +232,24 @@ typedef enum { #define PROXY_SOCKS5 3 /* Proxy client handshake states */ -#define PROXY_HTTPS_WANT_CONNECT_OK 1 -#define PROXY_SOCKS4_WANT_CONNECT_OK 2 -#define PROXY_SOCKS5_WANT_AUTH_METHOD_NONE 3 -#define PROXY_SOCKS5_WANT_AUTH_METHOD_RFC1929 4 -#define PROXY_SOCKS5_WANT_AUTH_RFC1929_OK 5 -#define PROXY_SOCKS5_WANT_CONNECT_OK 6 -#define PROXY_CONNECTED 7 +/* We use a proxy but we haven't even connected to it yet. */ +#define PROXY_INFANT 1 +/* We use an HTTP proxy and we've sent the CONNECT command. */ +#define PROXY_HTTPS_WANT_CONNECT_OK 2 +/* We use a SOCKS4 proxy and we've sent the CONNECT command. */ +#define PROXY_SOCKS4_WANT_CONNECT_OK 3 +/* We use a SOCKS5 proxy and we try to negotiate without + any authentication . */ +#define PROXY_SOCKS5_WANT_AUTH_METHOD_NONE 4 +/* We use a SOCKS5 proxy and we try to negotiate with + Username/Password authentication . */ +#define PROXY_SOCKS5_WANT_AUTH_METHOD_RFC1929 5 +/* We use a SOCKS5 proxy and we just sent our credentials. */ +#define PROXY_SOCKS5_WANT_AUTH_RFC1929_OK 6 +/* We use a SOCKS5 proxy and we just sent our CONNECT command. */ +#define PROXY_SOCKS5_WANT_CONNECT_OK 7 +/* We use a proxy and we CONNECTed successfully!. */ +#define PROXY_CONNECTED 8 /** True iff x is an edge connection. */ #define CONN_IS_EDGE(x) \

1 0

[tor/master] We can now connect using transports as well!
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 29203b7f3f6d07dec1cede65f118aa450ac7712d Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Jun 12 00:14:11 2011 +0200 We can now connect using transports as well! --- src/or/circuitbuild.c | 21 +++++++++++++++++++++ src/or/circuitbuild.h | 3 +++ src/or/connection_or.c | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+), 0 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c07e890..21018dc 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -100,6 +100,7 @@ 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); /** * This function decides if CBT learning should be disabled. It returns @@ -4803,6 +4804,26 @@ find_bridge_by_digest(const char *digest) return NULL; } +/** If addr and port match one of our known bridges, + * returns it's transport protocol if it has one, else returns NULL. + */ +transport_info_t * +find_bridge_transport_by_addrport(const tor_addr_t *addr, uint16_t port) +{ + 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; + } else /* bridge found, but it had no transport */ + return NULL; + } + } SMARTLIST_FOREACH_END(bridge); + return NULL; +} + /** We need to ask bridge for its server descriptor. */ static void launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index eb6fdba..047de11 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -148,5 +148,8 @@ void clear_transport_list(void); int match_bridges_with_transports(void); void transport_add_from_config(const tor_addr_t *addr, uint16_t port, const char *name, int socks_ver); +transport_info_t * +find_bridge_transport_by_addrport(const tor_addr_t *addr, uint16_t port); + #endif diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 73aad7e..7cfe2e7 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -335,6 +335,14 @@ connection_or_finished_connecting(or_connection_t *or_conn) proxy_type = PROXY_SOCKS4; else if (get_options()->Socks5Proxy) proxy_type = PROXY_SOCKS5; + else if (get_options()->UseBridges) { + transport_info_t *transport; + transport = find_bridge_transport_by_addrport(&conn->addr,conn->port); + if (transport) { /* this bridge supports transports. use proxy. */ + log_warn(LD_GENERAL, "Setting up pluggable transport plugin proxy type!\n"); + proxy_type = transport->socks_version; + } + } if (proxy_type != PROXY_NONE) { /* start proxy handshake */ @@ -861,6 +869,16 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, using_proxy = 1; tor_addr_copy(&addr, &options->Socks5ProxyAddr); port = options->Socks5ProxyPort; + } else if (options->ClientTransportPlugin) { + transport_info_t *transport; + transport = find_bridge_transport_by_addrport(&addr, port); + if (transport) { + log_warn(LD_GENERAL, "Our bridge uses a pluggable transport plugin. " + "Setting up proxying!"); + using_proxy = 1; + tor_addr_copy(&addr, &transport->addr); + port = transport->port; + } } switch (connection_connect(TO_CONN(conn), conn->_base.address,

1 0

[tor/master] Various trivial changes.
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 00ec4b2c002928f1a901950e2cc851578f295b1b Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Jun 12 16:41:32 2011 +0200 Various trivial changes. * Improved function documentation. * Renamed find_bridge_transport_by_addrport() to find_transport_by_bridge_addrport(). * Sanitized log severities we use. * Ran check-spaces. --- src/or/circuitbuild.c | 34 +++++++++++++++++++--------------- src/or/circuitbuild.h | 8 ++------ src/or/config.c | 44 +++++++++++++++++++++++++++----------------- src/or/connection_or.c | 11 +++++------ src/or/or.h | 3 ++- 5 files changed, 55 insertions(+), 45 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 21018dc..4dcc685 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4514,7 +4514,7 @@ typedef struct { 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 + Free'd when we match the bridge with a transport at match_bridges_with_transports(). */ char *transport_name_config; @@ -4603,8 +4603,7 @@ transport_add_from_config(const tor_addr_t *addr, uint16_t port, tor_addr_copy(&t->addr, addr); t->port = port; - /** check strdup return */ - t->name = strdup(name); + t->name = tor_strdup(name); t->socks_version = socks_ver; if (!transport_list) transport_list = smartlist_create(); @@ -4620,7 +4619,7 @@ transport_add_from_config(const tor_addr_t *addr, uint16_t port, int match_bridges_with_transports(void) { - /* Used to check if a transport was finally found for a bridge */ + /* Used to check if a transport was finally found for a bridge */ int found_match=0; /* Number of matches. */ int n_matches=0; @@ -4629,16 +4628,16 @@ match_bridges_with_transports(void) tor_assert(transport_list); tor_assert(bridge_list); - + /* Iterate bridges */ - SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, b) + 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) + 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. */ @@ -4647,28 +4646,29 @@ match_bridges_with_transports(void) n_matches++; b->transport = t; tor_free(b->transport_name_config); - log_warn(LD_CONFIG, "Matched transport '%s'", t->name); + log_warn(LD_CONFIG, "Matched transport '%s'", t->name); continue; } } 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 see if there were transports - that didn't get matched to a bridge. */ + /* 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 and we only " + log_warn(LD_CONFIG, "You have %d transports but we only " "managed to match %d of them!\n", n_transports, n_matches); return -1; } 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). @@ -4748,7 +4748,10 @@ learned_router_identity(const tor_addr_t *addr, uint16_t port, /** Remember a new bridge at addr:port. If digest * 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. */ + * 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. + */ void bridge_add_from_config(const tor_addr_t *addr, uint16_t port, const char *digest, const char *transport_name) @@ -4805,11 +4808,12 @@ find_bridge_by_digest(const char *digest) } /** If addr and port match one of our known bridges, - * returns it's transport protocol if it has one, else returns NULL. + * returns its transport protocol if it has one, else returns NULL. */ transport_info_t * -find_bridge_transport_by_addrport(const tor_addr_t *addr, uint16_t port) +find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port) { + assert(bridge_list); SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, bridge) { if (tor_addr_eq(&bridge->addr, addr) && diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 047de11..c1833d2 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -17,13 +17,10 @@ typedef struct { /* SOCKS version */ int socks_version; - /* Name of pluggable transport protocol */ char *name; - /* Address of proxy */ tor_addr_t addr; - /* Port of proxy */ uint16_t port; } transport_info_t; @@ -86,7 +83,7 @@ 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, - const char *digest, + const char *digest, const char *transport_name); void retry_bridge_descriptor_fetch_directly(const char *digest); void fetch_bridge_descriptors(or_options_t *options, time_t now); @@ -143,13 +140,12 @@ 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); void transport_add_from_config(const tor_addr_t *addr, uint16_t port, const char *name, int socks_ver); transport_info_t * -find_bridge_transport_by_addrport(const tor_addr_t *addr, uint16_t port); +find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port); #endif diff --git a/src/or/config.c b/src/or/config.c index 39d7f5b..b659d9b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -205,7 +205,7 @@ static config_var_t _option_vars[] = { V(ClientDNSRejectInternalAddresses, BOOL,"1"), V(ClientOnly, BOOL, "0"), V(ClientRejectInternalAddresses, BOOL, "1"), - VAR("ClientTransportPlugin", LINELIST, ClientTransportPlugin, NULL), + VAR("ClientTransportPlugin", LINELIST, ClientTransportPlugin, NULL), V(ConsensusParams, STRING, NULL), V(ConnLimit, UINT, "1000"), V(ConnDirectionStatistics, BOOL, "0"), @@ -571,7 +571,7 @@ 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_transport_line(const char *line, int validate_only); +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, int validate_only); @@ -1210,7 +1210,7 @@ options_act(or_options_t *old_options) if (options->ClientTransportPlugin) { clear_transport_list(); for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { - if (parse_transport_line(cl->value, 0)<0) { + if (parse_client_transport_line(cl->value, 0)<0) { log_warn(LD_BUG, "Previously validated ClientTransportPlugin line " "could not be added!"); @@ -1218,7 +1218,7 @@ options_act(or_options_t *old_options) } } } - + if (options->Bridges) { mark_bridge_list(); for (cl = options->Bridges; cl; cl = cl->next) { @@ -1234,6 +1234,7 @@ options_act(or_options_t *old_options) /** Okay, we have Bridges and we have ClientTransportPlugins. Let's match them together. */ if (options->Bridges && options->ClientTransportPlugin) { + assert(!server_mode(options)); if (match_bridges_with_transports() < 0) return -1; } @@ -3688,8 +3689,11 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->ClientTransportPlugin) { if (!options->Bridges) REJECT("ClientTransportPlugin found without any bridges."); + if (server_mode(options)) + REJECT("ClientTransportPlugin found but we are a server."); + for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { - if (parse_transport_line(cl->value, 1)<0) + if (parse_client_transport_line(cl->value, 1)<0) REJECT("Transport line did not parse. See logs for details."); } } @@ -4633,10 +4637,10 @@ parse_bridge_line(const char *line, int validate_only) } if (!validate_only) { - log_warn(LD_DIR, "Bridge at %s:%d with transport %s (%s)", + 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, + bridge_add_from_config(&addr, port, fingerprint ? digest : NULL, transport_name); } @@ -4655,8 +4659,14 @@ parse_bridge_line(const char *line, int validate_only) return r; } +/** Read the contents of a ClientTransportPlugin line from + * line. Return 0 if the line is well-formed, and -1 if it + * isn't. If validate_only is 0, and the line is well-formed, + * then add the transport described in the line to our internal + * transport list. +*/ static int -parse_transport_line(const char *line, int validate_only) +parse_client_transport_line(const char *line, int validate_only) { smartlist_t *items = NULL; int r; @@ -4665,24 +4675,24 @@ parse_transport_line(const char *line, int validate_only) char *addrport=NULL; int socks_ver; tor_addr_t addr; - uint16_t port = 0; + uint16_t port = 0; items = smartlist_create(); smartlist_split_string(items, line, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); - + if (smartlist_len(items) < 3) { - log_warn(LD_CONFIG, "parse_transport_line(): " + log_warn(LD_CONFIG, "parse_client_transport_line(): " "Too few arguments on ClientTransportPlugin line."); goto err; } - + name = smartlist_get(items, 0); smartlist_del_keeporder(items, 0); - + socks_ver_str = smartlist_get(items, 0); smartlist_del_keeporder(items, 0); - + if (!strcmp(socks_ver_str,"socks4")) socks_ver = PROXY_SOCKS4; else if (!strcmp(socks_ver_str,"socks5")) @@ -4706,9 +4716,9 @@ parse_transport_line(const char *line, int validate_only) "Transport address '%s' has no port.", addrport); goto err; } - + if (!validate_only) { - log_warn(LD_DIR, "Transport %s at %s:%d", name, + 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); @@ -4727,7 +4737,7 @@ parse_transport_line(const char *line, int validate_only) tor_free(name); tor_free(addrport); return r; -} +} /** Read the contents of a DirServer line from line. If * validate_only is 0, and the line is well-formed, and it diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 7cfe2e7..cca7c9f 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -335,11 +335,11 @@ connection_or_finished_connecting(or_connection_t *or_conn) proxy_type = PROXY_SOCKS4; else if (get_options()->Socks5Proxy) proxy_type = PROXY_SOCKS5; - else if (get_options()->UseBridges) { + else if (get_options()->ClientTransportPlugin) { transport_info_t *transport; - transport = find_bridge_transport_by_addrport(&conn->addr,conn->port); + transport = find_transport_by_bridge_addrport(&conn->addr,conn->port); if (transport) { /* this bridge supports transports. use proxy. */ - log_warn(LD_GENERAL, "Setting up pluggable transport plugin proxy type!\n"); + log_debug(LD_GENERAL, "Found transport. Setting proxy type!\n"); proxy_type = transport->socks_version; } } @@ -871,10 +871,9 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, port = options->Socks5ProxyPort; } else if (options->ClientTransportPlugin) { transport_info_t *transport; - transport = find_bridge_transport_by_addrport(&addr, port); + transport = find_transport_by_bridge_addrport(&addr, port); if (transport) { - log_warn(LD_GENERAL, "Our bridge uses a pluggable transport plugin. " - "Setting up proxying!"); + log_debug(LD_GENERAL, "Found transport. Setting up proxying!"); using_proxy = 1; tor_addr_copy(&addr, &transport->addr); port = transport->port; diff --git a/src/or/or.h b/src/or/or.h index 062352a..8cc2af2 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2660,7 +2660,8 @@ typedef struct { config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ - config_line_t *ClientTransportPlugin; /**< List of client transport plugins. */ + config_line_t *ClientTransportPlugin; /**< List of client + transport plugins. */ int BridgeRelay; /**< Boolean: are we acting as a bridge relay? We make * this explicit so we can change how we behave in the

1 0

[tor/master] We can now match our transports with our bridges.
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit e09f302589dc3e46edccf366595392f2dd9b43e3 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Jun 11 23:20:39 2011 +0200 We can now match our transports with our bridges. --- src/or/circuitbuild.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++- src/or/circuitbuild.h | 24 ++++++++++- src/or/config.c | 14 +++++- 3 files changed, 150 insertions(+), 5 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 68ca569..c07e890 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4511,6 +4511,15 @@ typedef struct { /** 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; @@ -4557,6 +4566,109 @@ clear_bridge_list(void) smartlist_clear(bridge_list); } +/** 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. */ +void +clear_transport_list(void) +{ + if (!transport_list) + transport_list = smartlist_create(); + SMARTLIST_FOREACH(transport_list, transport_info_t *, t, transport_free(t)); + smartlist_clear(transport_list); +} + +/** + Free the transport_info_t transport. +*/ +static void +transport_free(transport_info_t *transport) +{ + 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. +*/ +void +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)); + + tor_addr_copy(&t->addr, addr); + t->port = port; + /** check strdup return */ + t->name = strdup(name); + t->socks_version = socks_ver; + if (!transport_list) + transport_list = smartlist_create(); + + smartlist_add(transport_list, t); +} + +/** + 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; + tor_free(b->transport_name_config); + log_warn(LD_CONFIG, "Matched transport '%s'", t->name); + continue; + } + } SMARTLIST_FOREACH_END(t); + if (!found_match) { + log_warn(LD_CONFIG, "Couldn't find transport " + "match for %s!\n", b->transport_name_config); + return -1; + } + } SMARTLIST_FOREACH_END(b); + + /* count number of transports to see if there were transports + that didn't get matched to a bridge. */ + SMARTLIST_FOREACH(transport_list, transport_info_t *, t, n_transports++); + if (n_transports != n_matches) { + log_warn(LD_CONFIG, "You have %d transports and we only " + "managed to match %d of them!\n", n_transports, n_matches); + return -1; + } + + 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. */ @@ -4638,7 +4750,7 @@ learned_router_identity(const tor_addr_t *addr, uint16_t port, * bridge in our list, unmark it, and don't actually add anything new. */ void bridge_add_from_config(const tor_addr_t *addr, uint16_t port, - const char *digest) + const char *digest, const char *transport_name) { bridge_info_t *b; @@ -4652,6 +4764,8 @@ 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) + b->transport_name_config = strdup(transport_name); b->fetch_status.schedule = DL_SCHED_BRIDGE; if (!bridge_list) bridge_list = smartlist_create(); @@ -4994,6 +5108,7 @@ entry_guards_free_all(void) entry_guards = NULL; } clear_bridge_list(); + clear_transport_list(); smartlist_free(bridge_list); bridge_list = NULL; } diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index b1eb5a6..eb6fdba 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -12,6 +12,22 @@ #ifndef _TOR_CIRCUITBUILD_H #define _TOR_CIRCUITBUILD_H +/** + Represents a pluggable transport proxy used by a bridge. */ +typedef struct { + /* SOCKS version */ + int socks_version; + + /* Name of pluggable transport protocol */ + char *name; + + /* Address of proxy */ + tor_addr_t addr; + + /* Port of proxy */ + uint16_t port; +} transport_info_t; + char *circuit_list_path(origin_circuit_t *circ, int verbose); char *circuit_list_path_for_controller(origin_circuit_t *circ); void circuit_log_path(int severity, unsigned int domain, @@ -70,7 +86,8 @@ 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, - const char *digest); + const char *digest, + const char *transport_name); void retry_bridge_descriptor_fetch_directly(const char *digest); void fetch_bridge_descriptors(or_options_t *options, time_t now); void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); @@ -126,5 +143,10 @@ 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); +void transport_add_from_config(const tor_addr_t *addr, uint16_t port, + const char *name, int socks_ver); #endif diff --git a/src/or/config.c b/src/or/config.c index a1960dd..39d7f5b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1208,6 +1208,7 @@ options_act(or_options_t *old_options) return -1; if (options->ClientTransportPlugin) { + clear_transport_list(); for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { if (parse_transport_line(cl->value, 0)<0) { log_warn(LD_BUG, @@ -1230,6 +1231,13 @@ options_act(or_options_t *old_options) sweep_bridge_list(); } + /** Okay, we have Bridges and we have ClientTransportPlugins. Let's + match them together. */ + if (options->Bridges && options->ClientTransportPlugin) { + if (match_bridges_with_transports() < 0) + return -1; + } + if (running_tor && rend_config_services(options, 0)<0) { log_warn(LD_BUG, "Previously validated hidden services line could not be added!"); @@ -4629,7 +4637,7 @@ parse_bridge_line(const char *line, int validate_only) fmt_addr(&addr), (int)port, transport_name, fingerprint ? fingerprint : "no key listed"); bridge_add_from_config(&addr, port, - fingerprint ? digest : NULL/*, transport_name*/); + fingerprint ? digest : NULL, transport_name); } r = 0; @@ -4702,8 +4710,8 @@ parse_transport_line(const char *line, int validate_only) if (!validate_only) { log_warn(LD_DIR, "Transport %s at %s:%d", name, fmt_addr(&addr), (int)port); - /* transport_add_from_config(&addr, port, - fingerprint ? digest : NULL, transport); */ + transport_add_from_config(&addr, port, name, + socks_ver); } r = 0;

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] 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

[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

[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

← Newer
1
...
61
62
63
64
65
66
67
...
87
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2011