- tor-commits - lists.torproject.org

[tor/master] Limit the number of different handshake reasons to report
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit b25ca8af06532d3847ce11040f970a1c001c1ad8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 28 14:23:28 2011 -0400 Limit the number of different handshake reasons to report If connections failed in more than 10 different states, let's just report the top ten states. --- src/or/connection_or.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 85df78b..b5cd68a 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -222,6 +222,9 @@ broken_state_count_compare(const void **a_ptr, const void **b_ptr) } /** DOCDOC */ +#define MAX_REASONS_TO_REPORT 10 + +/** DOCDOC */ void connection_or_report_broken_states(int severity, int domain) { @@ -242,9 +245,12 @@ connection_or_report_broken_states(int severity, int domain) smartlist_sort(items, broken_state_count_compare); - log(severity, domain, "%d connections have failed:", total); + log(severity, domain, "%d connections have failed%s", total, + smartlist_len(items) > MAX_REASONS_TO_REPORT ? ". Top reasons:" : ":"); SMARTLIST_FOREACH_BEGIN(items, const broken_state_count_t *, c) { + if (c_sl_idx > MAX_REASONS_TO_REPORT) + break; log(severity, domain, " %d connections died in state %s", (int)c->count, c->state); } SMARTLIST_FOREACH_END(c);

1 0

[tor/master] Report the states of failed TLS connections from bootstrap_problem
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit b0de8560f6f7b54c363226c11d277b6b08b1cbc7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 28 14:29:29 2011 -0400 Report the states of failed TLS connections from bootstrap_problem --- changes/feature3116 | 5 +++++ src/or/control.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/changes/feature3116 b/changes/feature3116 new file mode 100644 index 0000000..386790c --- /dev/null +++ b/changes/feature3116 @@ -0,0 +1,5 @@ + o Major features: + - While we're trying to bootstrap, record how many TLS connections + fail in each state, and report which states saw the most failures + in response to any bootstrap failures. This feature may speed up + diagnosis of censorship events. diff --git a/src/or/control.c b/src/or/control.c index 6ea9dbe..fa0c6cf 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -18,6 +18,7 @@ #include "config.h" #include "connection.h" #include "connection_edge.h" +#include "connection_or.h" #include "control.h" #include "directory.h" #include "dirserv.h" @@ -4268,6 +4269,7 @@ control_event_bootstrap_problem(const char *warn, int reason) const char *tag, *summary; char buf[BOOTSTRAP_MSG_LEN]; const char *recommendation = "ignore"; + int severity; /* bootstrap_percent must not be in "undefined" state here. */ tor_assert(status >= 0); @@ -4292,12 +4294,17 @@ control_event_bootstrap_problem(const char *warn, int reason) status--; /* find a recognized status string based on current progress */ status = bootstrap_percent; /* set status back to the actual number */ - log_fn(!strcmp(recommendation, "warn") ? LOG_WARN : LOG_INFO, + severity = !strcmp(recommendation, "warn") ? LOG_WARN : LOG_INFO; + + log_fn(severity, LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; " "count %d; recommendation %s)", status, summary, warn, orconn_end_reason_to_control_string(reason), bootstrap_problems, recommendation); + + connection_or_report_broken_states(severity, LD_HANDSHAKE); + tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\" WARNING=\"%s\" REASON=%s " "COUNT=%d RECOMMENDATION=%s",

1 0

[tor/master] Clear broken connection map on successful bootstrap
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit e253e9577fb7d76bd534b343f0f63559b9a47b4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 28 15:10:38 2011 -0400 Clear broken connection map on successful bootstrap --- src/or/circuitbuild.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index fa7519d..6a411d1 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2117,6 +2117,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) "Looks like client functionality is working."); control_event_bootstrap(BOOTSTRAP_STATUS_DONE, 0); control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED"); + clear_broken_connection_map(); if (server_mode(options) && !check_whether_orport_reachable()) { inform_testing_reachability(); consider_testing_reachability(1, 1);

1 0

[tor/master] Document feature3116 fns and improve output
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 3f97c665aa8b0fee06b22160e3c10ef7d896618d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 28 15:06:56 2011 -0400 Document feature3116 fns and improve output - We were reporting the _bottom_ N failing states, not the top N. - With bufferevents enabled, we logged all TLS states as being "in bufferevent", which isn't actually informative. - When we had nothing to report, we reported nothing too loudly. - Also, we needed documentation. --- src/common/tortls.c | 13 ++++++++----- src/or/connection_or.c | 34 +++++++++++++++++++++------------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 8db47a6..a208bc7 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -222,7 +222,8 @@ ssl_state_to_string(int ssl_state) return buf; } -/** DOCDOC 3116 */ +/** Write a description of the current state of tls into the + * sz-byte buffer at buf. */ void tor_tls_get_state_description(tor_tls_t *tls, char *buf, size_t sz) { @@ -236,21 +237,23 @@ tor_tls_get_state_description(tor_tls_t *tls, char *buf, size_t sz) ssl_state = ssl_state_to_string(tls->ssl->state); switch (tls->state) { -#define CASE(st) case TOR_TLS_ST_##st: tortls_state = #st ; break +#define CASE(st) case TOR_TLS_ST_##st: tortls_state = " in "#st ; break CASE(HANDSHAKE); CASE(OPEN); CASE(GOTCLOSE); CASE(SENTCLOSE); CASE(CLOSED); CASE(RENEGOTIATE); - CASE(BUFFEREVENT); #undef CASE + case TOR_TLS_ST_BUFFEREVENT: + tortls_state = ""; + break; default: - tortls_state = "unknown"; + tortls_state = " in unknown TLS state"; break; } - tor_snprintf(buf, sz, "%s in %s", ssl_state, tortls_state); + tor_snprintf(buf, sz, "%s%s", ssl_state, tortls_state); } void diff --git a/src/or/connection_or.c b/src/or/connection_or.c index b5cd68a..e755c7e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -152,10 +152,13 @@ connection_or_set_identity_digest(or_connection_t *conn, const char *digest) /**************************************************************/ -/** DOCDOC */ +/** Map from a string describing what a non-open OR connection was doing when + * failed, to an intptr_t describing the count of connections that failed that + * way. Note that the count is stored _as_ the pointer. + */ static strmap_t *broken_connection_counts; -/** DOCDOC */ +/** Record that an OR connection failed in state. */ static void note_broken_connection(const char *state) { @@ -171,7 +174,7 @@ note_broken_connection(const char *state) strmap_set(broken_connection_counts, state, ptr); } -/** DOCDOC */ +/** Forget all recorded states for failed connections. */ void clear_broken_connection_map(void) { @@ -180,7 +183,10 @@ clear_broken_connection_map(void) broken_connection_counts = NULL; } -/** DOCDOC */ +/** Write a detailed description the state of orconn into the + * buflen-byte buffer at buf. This description includes not + * only the OR-conn level state but also the TLS state. It's useful for + * diagnosing broken handshakes. */ static void connection_or_get_state_description(or_connection_t *orconn, char *buf, size_t buflen) @@ -197,7 +203,8 @@ connection_or_get_state_description(or_connection_t *orconn, tor_snprintf(buf, buflen, "%s with SSL state %s", conn_state, tls_state); } -/** DOCDOC */ +/** Record the current state of orconn as the state of a broken + * connection. */ static void connection_or_note_state_when_broken(or_connection_t *orconn) { @@ -207,34 +214,35 @@ connection_or_note_state_when_broken(or_connection_t *orconn) note_broken_connection(buf); } -/** DOCDOC */ +/** Helper type used to sort connection states and find the most frequent. */ typedef struct broken_state_count_t { intptr_t count; const char *state; } broken_state_count_t; -/** DOCDOC */ +/** Helper function used to sort broken_state_count_t by frequency. */ static int broken_state_count_compare(const void **a_ptr, const void **b_ptr) { const broken_state_count_t *a = *a_ptr, *b = *b_ptr; - return a->count - b->count; + return b->count - a->count; } -/** DOCDOC */ +/** Upper limit on the number of different states to report for connection + * failure. */ #define MAX_REASONS_TO_REPORT 10 -/** DOCDOC */ +/** Report a list of the top states for failed OR connections at log level + * severity, in log domain domain. */ void connection_or_report_broken_states(int severity, int domain) { int total = 0; smartlist_t *items; - if (!broken_connection_counts) { - log(severity, domain, "No broken connections reported"); + if (!broken_connection_counts) return; - } + items = smartlist_create(); STRMAP_FOREACH(broken_connection_counts, state, void *, countptr) { broken_state_count_t *c = tor_malloc(sizeof(broken_state_count_t));

1 0

[tor/master] Disable recording new broken conns when we have bootstrapped
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 2a594fcde94ada2ef38d33d306b7df189a5e495c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 16:10:24 2011 -0400 Disable recording new broken conns when we have bootstrapped Rationale: right now there seems to be no way for our bootstrap status to dip under 100% once it has reached 100%. Thus, recording broken connections after that point is useless, and wastes memory. If at some point in the future we allow our bootstrap level to go backwards, then we should change this rule so that we disable recording broken connection states _as long as_ the bootstrap status is 100%. --- src/or/circuitbuild.c | 2 +- src/or/connection.c | 2 +- src/or/connection_or.c | 17 ++++++++++++++--- src/or/connection_or.h | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6a411d1..0e1dd52 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2117,7 +2117,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) "Looks like client functionality is working."); control_event_bootstrap(BOOTSTRAP_STATUS_DONE, 0); control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED"); - clear_broken_connection_map(); + clear_broken_connection_map(1); if (server_mode(options) && !check_whether_orport_reachable()) { inform_testing_reachability(); consider_testing_reachability(1, 1); diff --git a/src/or/connection.c b/src/or/connection.c index b0e0f84..d82a66e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -555,7 +555,7 @@ connection_free_all(void) connection_or_clear_identity_map(); /* Clear out our list of broken connections */ - clear_broken_connection_map(); + clear_broken_connection_map(0); SMARTLIST_FOREACH(conns, connection_t *, conn, _connection_free(conn)); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index e755c7e..94f8e22 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -158,12 +158,18 @@ connection_or_set_identity_digest(or_connection_t *conn, const char *digest) */ static strmap_t *broken_connection_counts; +/** If true, do not record information in broken_connection_counts. */ +static int disable_broken_connection_counts = 0; + /** Record that an OR connection failed in state. */ static void note_broken_connection(const char *state) { void *ptr; intptr_t val; + if (disable_broken_connection_counts) + return; + if (!broken_connection_counts) broken_connection_counts = strmap_new(); @@ -174,13 +180,16 @@ note_broken_connection(const char *state) strmap_set(broken_connection_counts, state, ptr); } -/** Forget all recorded states for failed connections. */ +/** Forget all recorded states for failed connections. If + * stop_recording is true, don't record any more. */ void -clear_broken_connection_map(void) +clear_broken_connection_map(int stop_recording) { if (broken_connection_counts) strmap_free(broken_connection_counts, NULL); broken_connection_counts = NULL; + if (stop_recording) + disable_broken_connection_counts = 1; } /** Write a detailed description the state of orconn into the @@ -209,6 +218,8 @@ static void connection_or_note_state_when_broken(or_connection_t *orconn) { char buf[256]; + if (disable_broken_connection_counts) + return; connection_or_get_state_description(orconn, buf, sizeof(buf)); log_info(LD_HANDSHAKE,"Connection died in state '%s'", buf); note_broken_connection(buf); @@ -240,7 +251,7 @@ connection_or_report_broken_states(int severity, int domain) int total = 0; smartlist_t *items; - if (!broken_connection_counts) + if (!broken_connection_counts || disable_broken_connection_counts) return; items = smartlist_create(); diff --git a/src/or/connection_or.h b/src/or/connection_or.h index abcfe83..072edbd 100644 --- a/src/or/connection_or.h +++ b/src/or/connection_or.h @@ -14,7 +14,7 @@ void connection_or_remove_from_identity_map(or_connection_t *conn); void connection_or_clear_identity_map(void); -void clear_broken_connection_map(void); +void clear_broken_connection_map(int disable); or_connection_t *connection_or_get_for_extend(const char *digest, const tor_addr_t *target_addr, const char **msg_out,

1 0

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

11 Jul '11

commit e97eb6f2546e6892e1ace8472f99ff20d10df995 Merge: a21c4c6 2a594fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 16:16:11 2011 -0400 Merge branch 'feature3116_squashed' changes/feature3116 | 5 + changes/split_about_to_close | 3 + src/common/tortls.c | 34 ++++++++ src/common/tortls.h | 1 + src/or/circuitbuild.c | 1 + src/or/connection.c | 109 +++----------------------- src/or/connection_edge.c | 65 +++++++++++++++ src/or/connection_edge.h | 3 + src/or/connection_or.c | 176 ++++++++++++++++++++++++++++++++++++++++++ src/or/connection_or.h | 4 + src/or/control.c | 9 ++- src/or/directory.c | 24 ++++++- src/or/directory.h | 2 +- 13 files changed, 334 insertions(+), 102 deletions(-)

1 0

[tor/master] typo in feature2841; spotted by asn
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit a21c4c657a1d06e2c4fc72a2f85400944d0e6460 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 16:12:35 2011 -0400 typo in feature2841; spotted by asn --- changes/feature2841 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/feature2841 b/changes/feature2841 index aededbe..c5da061 100644 --- a/changes/feature2841 +++ b/changes/feature2841 @@ -1,6 +1,6 @@ o Major features: - Tor clients using bridges can now be configured to use a separate 'transport' proxy for each bridge. This helps to resist - censorship by allowing bridges to use protocol obfuxcation + censorship by allowing bridges to use protocol obfuscation plugins. It implements part of proposal 180.

1 0

[tor/master] Changes file for feature2841.
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit f4ed42eadf6317cd25b071e55d88e96ce83dc9ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 16:01:45 2011 -0400 Changes file for feature2841. --- changes/feature2841 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/feature2841 b/changes/feature2841 new file mode 100644 index 0000000..aededbe --- /dev/null +++ b/changes/feature2841 @@ -0,0 +1,6 @@ + o Major features: + - Tor clients using bridges can now be configured to use a + separate 'transport' proxy for each bridge. This helps to resist + censorship by allowing bridges to use protocol obfuxcation + plugins. It implements part of proposal 180. +

1 0

[tor/master] Various small tweaks around config.c and or.h
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 5a05deb574a7178e752ce22d754d0d6fc1fa2141 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 21 18:49:04 2011 +0200 Various small tweaks around config.c and or.h --- src/or/config.c | 37 +++++++++++-------------------------- src/or/or.h | 2 +- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index a78252c..c414981 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1208,8 +1208,8 @@ options_act(or_options_t *old_options) if (consider_adding_dir_authorities(options, old_options) < 0) return -1; + clear_transport_list(); if (options->ClientTransportPlugin) { - clear_transport_list(); for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { if (parse_client_transport_line(cl->value, 0)<0) { log_warn(LD_BUG, @@ -1232,14 +1232,6 @@ 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) { - assert(!server_mode(options)); - 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!"); @@ -3566,15 +3558,9 @@ options_validate(or_options_t *old_options, or_options_t *options, } } - /* 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))) + /* Check if more than one proxy type has been enabled. */ + if (!!options->Socks4Proxy + !!options->Socks5Proxy + + !!options->HTTPSProxy + !!options->ClientTransportPlugin > 1) REJECT("You have configured more than one proxy types. " "(Socks4Proxy|Socks5Proxy|HTTPSProxy|ClientTransportPlugin)"); @@ -4593,7 +4579,7 @@ 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; @@ -4654,13 +4640,12 @@ parse_bridge_line(const char *line, int validate_only, } if (!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"); - - if (bridge_add_from_config(&addr, port, - fingerprint ? digest : NULL,transport_name) < 0) - goto err; + log_debug(LD_DIR, "Bridge at %s:%d (transport: %s) (%s)", + fmt_addr(&addr), (int)port, + transport_name ? transport_name : "no transport", + fingerprint ? fingerprint : "no key listed"); + bridge_add_from_config(&addr, port, + fingerprint ? digest : NULL,transport_name); } r = 0; diff --git a/src/or/or.h b/src/or/or.h index f713db7..72d311b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -234,7 +234,7 @@ typedef enum { #define PROXY_PLUGGABLE 4 /* Proxy client handshake states */ -/* We use a proxy but we haven't even connected to it yet. */ +/* 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

1 0

[tor/master] Trivial code tweaks and documentation updates.
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 36468ec44b6dc3443b0142de83a100e2a853acf8 Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Jun 28 05:43:40 2011 +0200 Trivial code tweaks and documentation updates. --- src/or/circuitbuild.c | 15 ++++++++------- src/or/config.c | 6 +++--- src/or/connection.c | 26 ++++++++++++++++---------- src/or/main.c | 2 +- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index b1f967b..7857eda 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4565,7 +4565,7 @@ clear_bridge_list(void) smartlist_clear(bridge_list); } -/** Free the transport_t transport. */ +/** Free the bridge bridge. */ static void bridge_free(bridge_info_t *bridge) { @@ -4590,7 +4590,7 @@ clear_transport_list(void) smartlist_clear(transport_list); } -/** Free the transport_t transport. */ +/** Free the pluggable transport struct transport. */ static void transport_free(transport_t *transport) { @@ -4639,8 +4639,8 @@ transport_add_from_config(const tor_addr_t *addr, uint16_t port, 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(); @@ -4662,13 +4662,14 @@ validate_pluggable_transports_config(void) /* Skip bridges without transports. */ if (!b->transport_name) continue; - /* See if the user has Bridges that specify nonexistent + /* See if the user has Bridges that specify nonexistent pluggable transports. We should warn the user in such case, since it's probably misconfiguration. */ if (!transport_get_by_name(b->transport_name)) log_warn(LD_CONFIG, "You have a Bridge line using the %s " "pluggable transport, but there doesn't seem to be a " - "corresponding ClientTransportPlugin line.", b->transport_name); + "corresponding ClientTransportPlugin line.", + b->transport_name); } SMARTLIST_FOREACH_END(b); } } @@ -4812,7 +4813,7 @@ find_bridge_by_digest(const char *digest) /** If addr and port match the address and port of a * bridge of ours that uses pluggable transports, place it's transport * in transport. - * + * * Return: * 0: if transport was found successfully. * 1: if addr:port did not match a bridge, @@ -4820,7 +4821,7 @@ find_bridge_by_digest(const char *digest) * -1: if we should be using a transport, but the transport could not be found. */ int -find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, +find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, transport_t **transport) { if (!bridge_list) diff --git a/src/or/config.c b/src/or/config.c index 41142b6..12320e0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4680,8 +4680,7 @@ parse_client_transport_line(const char *line, int validate_only) SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); if (smartlist_len(items) < 3) { - log_warn(LD_CONFIG, "parse_client_transport_line(): " - "Too few arguments on ClientTransportPlugin line."); + log_warn(LD_CONFIG, "Too few arguments on ClientTransportPlugin line."); goto err; } @@ -4696,7 +4695,8 @@ parse_client_transport_line(const char *line, int validate_only) else if (!strcmp(socks_ver_str,"socks5")) socks_ver = PROXY_SOCKS5; else { - log_warn(LD_CONFIG, "Strange transport proxy type."); + log_warn(LD_CONFIG, "Strange ClientTransportPlugin proxy type '%s'.", + socks_ver_str); goto err; } diff --git a/src/or/connection.c b/src/or/connection.c index bfc901f..e086588 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4101,11 +4101,14 @@ 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 0 if we were successfull, 1 if we are not using - * a proxy, -1 if we are using a proxy but his addrport could not be +/** Fills addr and port with the details of the global + * proxy server we are using. + * conn contains the connection we are using the proxy for. + * + * Returns: + * 0: if we were successfull + * 1: if we are not using a proxy + * -1: if we are using a proxy but its addrport could not be * found. */ int get_proxy_addrport(tor_addr_t *addr, uint16_t *port, @@ -4131,19 +4134,22 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int r; r = find_transport_by_bridge_addrport(&conn->addr, conn->port, &transport); if (r == 0) { /* transport found */ + tor_assert(transport); tor_addr_copy(addr, &transport->addr); *port = transport->port; + goto done; + } else { + return r; } - return r; } return 1; - done: + done: /* proxy found */ return 0; } -/** Returns the proxy type used by tor. */ +/** Returns the global proxy type used by tor. */ static int get_proxy_type(void) { @@ -4170,7 +4176,7 @@ log_failed_proxy_connection(connection_t *conn) uint16_t proxy_port; if (get_proxy_addrport(&proxy_addr, &proxy_port, conn) != 0) - return; /* if we have no proxy set up leave this function. */ + 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. " @@ -4188,7 +4194,7 @@ proxy_type_to_string(int proxy_type) 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 */ + case PROXY_NONE: return "NULL"; default: tor_assert(0); } } diff --git a/src/or/main.c b/src/or/main.c index f456b03..4d43267 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -760,7 +760,7 @@ 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. */ + proxy. We should warn the user about this. */ if (conn->proxy_state == PROXY_INFANT) log_failed_proxy_connection(conn);

1 0