tor-commits July 2011

tor-commits@lists.torproject.org

16 participants
868 discussions

[tor/master] Style and grammar tweaks on 2841 branch
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit ded6bbf70a3b63bb423b241c66684becefb1cff7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jul 2 23:23:07 2011 -0400 Style and grammar tweaks on 2841 branch --- src/or/circuitbuild.c | 71 ++++++++++++++++++++++-------------------------- src/or/circuitbuild.h | 8 +++--- src/or/config.c | 39 ++++++++++++-------------- 3 files changed, 55 insertions(+), 63 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index b00a35d..98d7ac3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4611,7 +4611,7 @@ transport_get_by_name(const char *name) if (!transport_list) return NULL; - SMARTLIST_FOREACH_BEGIN(transport_list, transport_t *, transport) { + SMARTLIST_FOREACH_BEGIN(transport_list, const transport_t *, transport) { if (!strcmp(transport->name, name)) return transport; } SMARTLIST_FOREACH_END(transport); @@ -4628,14 +4628,15 @@ int transport_add_from_config(const tor_addr_t *addr, uint16_t port, const char *name, int socks_ver) { - transport_t *t = tor_malloc_zero(sizeof(transport_t)); + transport_t *t; 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; + log_warn(LD_CONFIG, "More than one transport has '%s' as " + "its name.", name); + return -1; } + t = tor_malloc_zero(sizeof(transport_t)); tor_addr_copy(&t->addr, addr); t->port = port; t->name = tor_strdup(name); @@ -4646,10 +4647,6 @@ transport_add_from_config(const tor_addr_t *addr, uint16_t port, smartlist_add(transport_list, t); return 0; - - err: - tor_free(t); - return -1; } /** Warns the user of possible pluggable transport misconfiguration. */ @@ -4657,20 +4654,19 @@ void validate_pluggable_transports_config(void) { if (bridge_list) { - SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, b) - { - /* Skip bridges without transports. */ - if (!b->transport_name) - continue; - /* 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); - } SMARTLIST_FOREACH_END(b); + SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, b) { + /* Skip bridges without transports. */ + if (!b->transport_name) + continue; + /* 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); + } SMARTLIST_FOREACH_END(b); } } @@ -4811,7 +4807,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 + * bridge of ours that uses pluggable transports, place its transport * in transport. * * Return: @@ -4827,22 +4823,21 @@ find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, if (!bridge_list) return 1; - SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, bridge) - { - if (tor_addr_eq(&bridge->addr, addr) && - (bridge->port == port)) { /* bridge matched */ - if (bridge->transport_name) { /* it also uses pluggable transports */ - *transport = transport_get_by_name(bridge->transport_name); - if (*transport == NULL) { /* it uses pluggable transports, but - the transport could not be found! */ - return -1; - } - return 0; - } else { /* bridge matched, but it doesn't use transports. */ - break; + SMARTLIST_FOREACH_BEGIN(bridge_list, const bridge_info_t *, bridge) { + if (tor_addr_eq(&bridge->addr, addr) && + (bridge->port == port)) { /* bridge matched */ + if (bridge->transport_name) { /* it also uses pluggable transports */ + *transport = transport_get_by_name(bridge->transport_name); + if (*transport == NULL) { /* it uses pluggable transports, but + the transport could not be found! */ + return -1; } + return 0; + } else { /* bridge matched, but it doesn't use transports. */ + break; } - } SMARTLIST_FOREACH_END(bridge); + } + } SMARTLIST_FOREACH_END(bridge); return 1; } diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 54f8250..74715b7 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -14,13 +14,13 @@ /** Represents a pluggable transport proxy used by a bridge. */ typedef struct { - /* SOCKS version */ + /** SOCKS version: One of PROXY_SOCKS4, PROXY_SOCKS5. */ int socks_version; - /* Name of pluggable transport protocol */ + /** Name of pluggable transport protocol */ char *name; - /* Address of proxy */ + /** Address of proxy */ tor_addr_t addr; - /* Port of proxy */ + /** Port of proxy */ uint16_t port; } transport_t; diff --git a/src/or/config.c b/src/or/config.c index 9096839..e172f73 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), + V(ClientTransportPlugin, LINELIST, NULL), V(ConsensusParams, STRING, NULL), V(ConnLimit, UINT, "1000"), V(ConnDirectionStatistics, BOOL, "0"), @@ -3565,7 +3565,7 @@ options_validate(or_options_t *old_options, or_options_t *options, /* 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. " + REJECT("You have configured more than one proxy type. " "(Socks4Proxy|Socks5Proxy|HTTPSProxy|ClientTransportPlugin)"); if (options->Socks5ProxyUsername) { @@ -3686,18 +3686,14 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->UseBridges && !options->TunnelDirConns) REJECT("TunnelDirConns set to 0 only works with UseBridges set to 0"); - if (options->ClientTransportPlugin) { - for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { - if (parse_client_transport_line(cl->value, 1)<0) - REJECT("Transport line did not parse. See logs for details."); - } + for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { + if (parse_client_transport_line(cl->value, 1)<0) + REJECT("Transport line did not parse. See logs for details."); } - if (options->Bridges) { - for (cl = options->Bridges; cl; cl = cl->next) { - if (parse_bridge_line(cl->value, 1)<0) - REJECT("Bridge line did not parse. See logs for details."); - } + for (cl = options->Bridges; cl; cl = cl->next) { + if (parse_bridge_line(cl->value, 1)<0) + REJECT("Bridge line did not parse. See logs for details."); } if (options->ConstrainedSockets) { @@ -4605,8 +4601,9 @@ parse_bridge_line(const char *line, int validate_only) transport_name = field1; addrport = smartlist_get(items, 0); smartlist_del_keeporder(items, 0); - } else + } else { addrport = field1; + } if (tor_addr_port_parse(addrport, &addr, &port)<0) { log_warn(LD_CONFIG, "Error parsing Bridge address '%s'", addrport); @@ -4632,21 +4629,21 @@ parse_bridge_line(const char *line, int validate_only) } if (!validate_only) { - 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); + 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; goto done; - err: + err: r = -1; - done: + done: SMARTLIST_FOREACH(items, char*, s, tor_free(s)); smartlist_free(items); tor_free(addrport);

1 0

[tor/master] Simplify parse_client_transport_line
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit c0de533c56a02c5557236c5baac6b9d57133467f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jul 2 23:32:17 2011 -0400 Simplify parse_client_transport_line --- src/or/config.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index e172f73..a94abb0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4680,10 +4680,8 @@ parse_client_transport_line(const char *line, int validate_only) } name = smartlist_get(items, 0); - smartlist_del_keeporder(items, 0); - socks_ver_str = smartlist_get(items, 0); - smartlist_del_keeporder(items, 0); + socks_ver_str = smartlist_get(items, 1); if (!strcmp(socks_ver_str,"socks4")) socks_ver = PROXY_SOCKS4; @@ -4695,8 +4693,7 @@ parse_client_transport_line(const char *line, int validate_only) goto err; } - addrport = smartlist_get(items, 0); - smartlist_del_keeporder(items, 0); + addrport = smartlist_get(items, 2); if (tor_addr_port_parse(addrport, &addr, &port)<0) { log_warn(LD_CONFIG, "Error parsing transport " @@ -4714,8 +4711,7 @@ parse_client_transport_line(const char *line, int validate_only) log_debug(LD_DIR, "Transport %s found at %s:%d", name, fmt_addr(&addr), (int)port); - if (transport_add_from_config(&addr, port, name, - socks_ver) < 0) + if (transport_add_from_config(&addr, port, name, socks_ver) < 0) goto err; } @@ -4728,9 +4724,6 @@ parse_client_transport_line(const char *line, int validate_only) done: SMARTLIST_FOREACH(items, char*, s, tor_free(s)); smartlist_free(items); - tor_free(socks_ver_str); - tor_free(name); - tor_free(addrport); return r; }

1 0

[tor/master] Future-proof and user-proof parse_bridge_line
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 72125389979af60b659dc469159ea9be397a2ffa Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jul 2 23:38:00 2011 -0400 Future-proof and user-proof parse_bridge_line --- src/or/config.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index a94abb0..0082ff9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4597,8 +4597,13 @@ parse_bridge_line(const char *line, int validate_only) field1 = smartlist_get(items, 0); smartlist_del_keeporder(items, 0); - if (!strstr(field1, ".")) { /* new-style bridge line */ + if (!(strstr(field1, ".") || strstr(field1, ":"))) { + /* new-style bridge line */ transport_name = field1; + if (smartlist_len(items) < 1) { + log_warn(LD_CONFIG, "Too few items to Bridge line."); + goto err; + } addrport = smartlist_get(items, 0); smartlist_del_keeporder(items, 0); } else {

1 0

[tor/master] Merge remote-tracking branch 'public/bug2841'
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit e006aa5dfa3110648daa92bde27e8abc87db3c57 Merge: 6083276 6053e11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 15:57:12 2011 -0400 Merge remote-tracking branch 'public/bug2841' Conflicts: src/or/config.c src/or/circuitbuild.c | 200 ++++++++++++++++++++++++++++++++++++++++++----- src/or/circuitbuild.h | 22 +++++- src/or/config.c | 150 ++++++++++++++++++++++++++++++++---- src/or/connection.c | 101 ++++++++++++++++++++++++ src/or/connection.h | 3 + src/or/connection_or.c | 46 +++++------ src/or/main.c | 7 ++ src/or/or.h | 33 ++++++-- 8 files changed, 493 insertions(+), 69 deletions(-) diff --cc src/or/circuitbuild.h index caa8a67,74715b7..bb5c2eb --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@@ -70,9 -82,10 +82,10 @@@ int node_is_a_configured_bridge(const n 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 fetch_bridge_descriptors(const or_options_t *options, time_t now); void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); int any_bridge_descriptors_known(void); int any_pending_bridge_descriptor_fetches(void); diff --cc src/or/config.c index 4aabe6b,0082ff9..4a9d2c9 --- a/src/or/config.c +++ b/src/or/config.c @@@ -546,33 -547,31 +547,34 @@@ static char *get_windows_conf_root(void #endif static void config_line_append(config_line_t **lst, const char *key, const char *val); -static void option_clear(config_format_t *fmt, or_options_t *options, - config_var_t *var); -static void option_reset(config_format_t *fmt, or_options_t *options, - config_var_t *var, int use_defaults); -static void config_free(config_format_t *fmt, void *options); +static void option_clear(const config_format_t *fmt, or_options_t *options, + const config_var_t *var); +static void option_reset(const config_format_t *fmt, or_options_t *options, + const config_var_t *var, int use_defaults); +static void config_free(const config_format_t *fmt, void *options); static int config_lines_eq(config_line_t *a, config_line_t *b); -static int option_is_same(config_format_t *fmt, - or_options_t *o1, or_options_t *o2, +static int option_is_same(const config_format_t *fmt, + const or_options_t *o1, const or_options_t *o2, const char *name); -static or_options_t *options_dup(config_format_t *fmt, or_options_t *old); -static int options_validate(or_options_t *old_options, or_options_t *options, +static or_options_t *options_dup(const config_format_t *fmt, + const or_options_t *old); +static int options_validate(or_options_t *old_options, + or_options_t *options, int from_setconf, char **msg); -static int options_act_reversible(or_options_t *old_options, char **msg); -static int options_act(or_options_t *old_options); -static int options_transition_allowed(or_options_t *old, or_options_t *new, +static int options_act_reversible(const or_options_t *old_options, char **msg); +static int options_act(const or_options_t *old_options); +static int options_transition_allowed(const or_options_t *old, + const or_options_t *new, char **msg); -static int options_transition_affects_workers(or_options_t *old_options, - or_options_t *new_options); -static int options_transition_affects_descriptor(or_options_t *old_options, - or_options_t *new_options); +static int options_transition_affects_workers( + const or_options_t *old_options, const or_options_t *new_options); +static int options_transition_affects_descriptor( + const or_options_t *old_options, const or_options_t *new_options); static int check_nickname_list(const char *lst, const char *name, char **msg); -static void config_register_addressmaps(or_options_t *options); +static void config_register_addressmaps(const or_options_t *options); static int parse_bridge_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); @@@ -3676,15 -3683,17 +3698,19 @@@ options_validate(or_options_t *old_opti if (validate_dir_authorities(options, old_options) < 0) REJECT("Directory authority line did not parse. See logs for details."); + if (options->UseBridges && !options->Bridges) + REJECT("If you set UseBridges, you must specify at least one bridge."); if (options->UseBridges && !options->TunnelDirConns) - REJECT("TunnelDirConns set to 0 only works with UseBridges set to 0"); + REJECT("If you set UseBridges, you must set TunnelDirConns."); - if (options->Bridges) { - for (cl = options->Bridges; cl; cl = cl->next) { - if (parse_bridge_line(cl->value, 1)<0) - REJECT("Bridge line did not parse. See logs for details."); - } + + for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { + if (parse_client_transport_line(cl->value, 1)<0) + REJECT("Transport line did not parse. See logs for details."); + } + + for (cl = options->Bridges; cl; cl = cl->next) { + if (parse_bridge_line(cl->value, 1)<0) + REJECT("Bridge line did not parse. See logs for details."); } if (options->ConstrainedSockets) { diff --cc src/or/connection_or.c index 679500d,a02ec1e..5092f63 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@@ -828,11 -818,15 +819,15 @@@ connection_or_connect(const tor_addr_t const char *id_digest) { or_connection_t *conn; - or_options_t *options = get_options(); + const or_options_t *options = get_options(); int socket_error = 0; - int using_proxy = 0; tor_addr_t addr; + int r; + tor_addr_t proxy_addr; + uint16_t proxy_port; + int proxy_type; + tor_assert(_addr); tor_assert(id_digest); tor_addr_copy(&addr, _addr); diff --cc src/or/or.h index ff82446,d1817d4..2f960ca --- a/src/or/or.h +++ b/src/or/or.h @@@ -2651,9 -2662,23 +2667,12 @@@ typedef struct * when doing so. */ char *BridgePassword; - /** Whether we should start all circuits with a bridge. This is an - * "autobool": 1 means strictly yes, 0 means strictly no, and -1 means that - * we do iff any bridges are configured, we are not running a server and - * have not specified a list of entry nodes. Don't use this value directly; - * use UseBridges instead. */ - int UseBridges_; - /** Effective value of UseBridges. Will be set equally for UseBridges set to - * 1 or 0, but for 'auto' it will be set to 1 iff any bridges are - * configured, we are not running a server and have not specified a list of - * entry nodes. */ - int UseBridges; - + int UseBridges; /**< Boolean: should we start all circuits with a bridge? */ config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ + 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 * future. */

1 0

[tor/master] Fix compilation from 2841 branch
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 616d85fdd8fb27549ec0bba519bfba9384f33cc1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 11 15:59:03 2011 -0400 Fix compilation from 2841 branch --- src/or/connection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index dbe294a..5dbf052 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4139,7 +4139,7 @@ int get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, const connection_t *conn) { - or_options_t *options = get_options(); + const or_options_t *options = get_options(); if (options->HTTPSProxy) { tor_addr_copy(addr, &options->HTTPSProxyAddr); @@ -4179,7 +4179,7 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, static int get_proxy_type(void) { - or_options_t *options = get_options(); + const or_options_t *options = get_options(); if (options->HTTPSProxy) return PROXY_CONNECT;

1 0

[tor/master] Refactor the interfaces of transport/proxy lookup fns
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 6053e11ee6540750a68a7c59a1b91727f7e10952 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 3 00:13:41 2011 -0400 Refactor the interfaces of transport/proxy lookup fns Returning a tristate is needless here; we can just use the yielded transport/proxy_type field to tell whether there's a proxy, and have the return indicate success/failure. Also, store the proxy_type in the or_connection_t rather than letting it get out of sync if a configuration reload happens between launching the or_connection and deciding what to say with it. --- src/or/circuitbuild.c | 14 +++++++------- src/or/connection.c | 39 +++++++++++++++++++-------------------- src/or/connection.h | 4 ++-- src/or/connection_or.c | 39 +++++++++++---------------------------- src/or/or.h | 3 +++ 5 files changed, 42 insertions(+), 57 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 98d7ac3..aa0e996 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4810,18 +4810,17 @@ find_bridge_by_digest(const char *digest) * bridge of ours that uses pluggable transports, place its transport * in transport. * - * Return: - * 0: if transport was found successfully. - * 1: if addr:port did not match a bridge, - * or if matched bridge was not using transports. - * -1: if we should be using a transport, but the transport could not be found. + * Return 0 on success (found a transport, or found a bridge with no + * transport, or found no bridge); return -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, const transport_t **transport) { + *transport = NULL; if (!bridge_list) - return 1; + return 0; SMARTLIST_FOREACH_BEGIN(bridge_list, const bridge_info_t *, bridge) { if (tor_addr_eq(&bridge->addr, addr) && @@ -4839,7 +4838,8 @@ find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, } } SMARTLIST_FOREACH_END(bridge); - return 1; + *transport = NULL; + return 0; } /** We need to ask bridge for its server descriptor. */ diff --git a/src/or/connection.c b/src/or/connection.c index 05937ac..00f25e6 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4105,47 +4105,45 @@ assert_connection_ok(connection_t *conn, time_t now) * 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. */ + * Return 0 on success, -1 on failure. + */ int -get_proxy_addrport(tor_addr_t *addr, uint16_t *port, - connection_t *conn) +get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, + const connection_t *conn) { or_options_t *options = get_options(); if (options->HTTPSProxy) { tor_addr_copy(addr, &options->HTTPSProxyAddr); *port = options->HTTPSProxyPort; - goto done; + *proxy_type = PROXY_CONNECT; + return 0; } else if (options->Socks4Proxy) { tor_addr_copy(addr, &options->Socks4ProxyAddr); *port = options->Socks4ProxyPort; - goto done; + *proxy_type = PROXY_SOCKS4; + return 0; } else if (options->Socks5Proxy) { tor_addr_copy(addr, &options->Socks5ProxyAddr); *port = options->Socks5ProxyPort; - goto done; + *proxy_type = PROXY_SOCKS5; + return 0; } else if (options->ClientTransportPlugin || options->Bridges) { - const transport_t *transport=NULL; + const transport_t *transport = NULL; int r; r = find_transport_by_bridge_addrport(&conn->addr, conn->port, &transport); - if (r == 0) { /* transport found */ - tor_assert(transport); + if (r<0) + return -1; + if (transport) { /* transport found */ tor_addr_copy(addr, &transport->addr); *port = transport->port; - goto done; - } else { - return r; + *proxy_type = transport->socks_version; + return 0; } } - return 1; - - done: /* proxy found */ + *proxy_type = PROXY_NONE; return 0; } @@ -4174,8 +4172,9 @@ log_failed_proxy_connection(connection_t *conn) { tor_addr_t proxy_addr; uint16_t proxy_port; + int proxy_type; - if (get_proxy_addrport(&proxy_addr, &proxy_port, conn) != 0) + if (get_proxy_addrport(&proxy_addr, &proxy_port, &proxy_type, conn) != 0) return; /* if we have no proxy set up, leave this function. */ log_warn(LD_NET, diff --git a/src/or/connection.h b/src/or/connection.h index bf439b9..be3de88 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -58,8 +58,8 @@ 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(tor_addr_t *addr, - uint16_t *port, connection_t *conn); +int get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, + const connection_t *conn); 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 2de25f6..a02ec1e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -317,7 +317,7 @@ connection_or_finished_flushing(or_connection_t *conn) int connection_or_finished_connecting(or_connection_t *or_conn) { - int proxy_type; + const int proxy_type = or_conn->proxy_type; connection_t *conn; tor_assert(or_conn); conn = TO_CONN(or_conn); @@ -327,27 +327,6 @@ connection_or_finished_connecting(or_connection_t *or_conn) conn->address,conn->port); control_event_bootstrap(BOOTSTRAP_STATUS_HANDSHAKE, 0); - proxy_type = PROXY_NONE; - - if (get_options()->HTTPSProxy) - proxy_type = PROXY_CONNECT; - else if (get_options()->Socks4Proxy) - proxy_type = PROXY_SOCKS4; - else if (get_options()->Socks5Proxy) - proxy_type = PROXY_SOCKS5; - else if (get_options()->ClientTransportPlugin) { - const transport_t *transport=NULL; - int r; - r = find_transport_by_bridge_addrport(&conn->addr,conn->port,&transport); - if (r == 0) { - tor_assert(transport); - log_debug(LD_GENERAL, "Found transport. Setting proxy type!\n"); - proxy_type = transport->socks_version; - } else if (r == -1) { - return -1; - } - } - if (proxy_type != PROXY_NONE) { /* start proxy handshake */ if (connection_proxy_connect(conn, proxy_type) < 0) { @@ -846,6 +825,7 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, int r; tor_addr_t proxy_addr; uint16_t proxy_port; + int proxy_type; tor_assert(_addr); tor_assert(id_digest); @@ -864,12 +844,15 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, control_event_or_conn_status(conn, OR_CONN_EVENT_LAUNCHED, 0); /* If we are using a proxy server, find it and use it. */ - r = get_proxy_addrport(&proxy_addr, &proxy_port, TO_CONN(conn)); - if (r == 0) { /* proxy found. */ - tor_addr_copy(&addr, &proxy_addr); - port = proxy_port; - conn->_base.proxy_state = PROXY_INFANT; - } else if (r == -1) { /* proxy could not be found. */ + r = get_proxy_addrport(&proxy_addr, &proxy_port, &proxy_type, TO_CONN(conn)); + if (r == 0) { + conn->proxy_type = proxy_type; + if (proxy_type != PROXY_NONE) { + tor_addr_copy(&addr, &proxy_addr); + port = proxy_port; + conn->_base.proxy_state = PROXY_INFANT; + } + } else { log_warn(LD_GENERAL, "Tried to connect through proxy, but proxy address " "could not be found."); connection_free(TO_CONN(conn)); diff --git a/src/or/or.h b/src/or/or.h index 72d311b..d1817d4 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 +/* !!!! If there is ever a PROXY_* type over 2, we must grow the proxy_type + * field in or_connection_t */ /* pluggable transports proxy type */ #define PROXY_PLUGGABLE 4 @@ -1097,6 +1099,7 @@ typedef struct or_connection_t { * router itself has a problem. */ unsigned int is_bad_for_new_circs:1; + unsigned int proxy_type:2; /**< One of PROXY_NONE...PROXY_SOCKS5 */ uint8_t link_proto; /**< What protocol version are we using? 0 for * "none negotiated yet." */ circid_t next_circ_id; /**< Which circ_id do we try to use next on

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] ClientTransportPlugin parsing done.
by nickm＠torproject.org 11 Jul '11

11 Jul '11

commit 20c31c80fb7265e8987747b3cdba04f16c352b15 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Jun 11 17:08:31 2011 +0200 ClientTransportPlugin parsing done. --- src/or/config.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- src/or/or.h | 2 + 2 files changed, 118 insertions(+), 5 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index d663336..a1960dd 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -203,8 +203,9 @@ static config_var_t _option_vars[] = { V(CircuitStreamTimeout, INTERVAL, "0"), V(CircuitPriorityHalflife, DOUBLE, "-100.0"), /*negative:'Use default'*/ V(ClientDNSRejectInternalAddresses, BOOL,"1"), - V(ClientRejectInternalAddresses, BOOL, "1"), V(ClientOnly, BOOL, "0"), + V(ClientRejectInternalAddresses, BOOL, "1"), + VAR("ClientTransportPlugin", LINELIST, ClientTransportPlugin, NULL), V(ConsensusParams, STRING, NULL), V(ConnLimit, UINT, "1000"), V(ConnDirectionStatistics, BOOL, "0"), @@ -570,6 +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_dir_server_line(const char *line, dirinfo_type_t required_type, int validate_only); @@ -1205,6 +1207,17 @@ options_act(or_options_t *old_options) if (consider_adding_dir_authorities(options, old_options) < 0) return -1; + if (options->ClientTransportPlugin) { + for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { + if (parse_transport_line(cl->value, 0)<0) { + log_warn(LD_BUG, + "Previously validated ClientTransportPlugin line " + "could not be added!"); + return -1; + } + } + } + if (options->Bridges) { mark_bridge_list(); for (cl = options->Bridges; cl; cl = cl->next) { @@ -3663,6 +3676,16 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->UseBridges && !options->TunnelDirConns) REJECT("TunnelDirConns set to 0 only works with UseBridges set to 0"); + + if (options->ClientTransportPlugin) { + if (!options->Bridges) + REJECT("ClientTransportPlugin found without any bridges."); + for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { + if (parse_transport_line(cl->value, 1)<0) + REJECT("Transport line did not parse. See logs for details."); + } + } + if (options->Bridges) { for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 1)<0) @@ -4553,6 +4576,8 @@ parse_bridge_line(const char *line, int validate_only) smartlist_t *items = NULL; int r; char *addrport=NULL, *fingerprint=NULL; + char *transport_name=NULL; + char *field1=NULL; tor_addr_t addr; uint16_t port = 0; char digest[DIGEST_LEN]; @@ -4564,8 +4589,18 @@ parse_bridge_line(const char *line, int validate_only) log_warn(LD_CONFIG, "Too few arguments to Bridge line."); goto err; } - addrport = smartlist_get(items, 0); + + /* field1 is either a transport name or addrport */ + field1 = smartlist_get(items, 0); smartlist_del_keeporder(items, 0); + + if (!strstr(field1, ".")) { /* new-style bridge line */ + transport_name = field1; + addrport = smartlist_get(items, 0); + smartlist_del_keeporder(items, 0); + } else + addrport = field1; + if (tor_addr_port_parse(addrport, &addr, &port)<0) { log_warn(LD_CONFIG, "Error parsing Bridge address '%s'", addrport); goto err; @@ -4590,10 +4625,11 @@ parse_bridge_line(const char *line, int validate_only) } if (!validate_only) { - log_debug(LD_DIR, "Bridge at %s:%d (%s)", fmt_addr(&addr), - (int)port, + log_warn(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); + bridge_add_from_config(&addr, port, + fingerprint ? digest : NULL/*, transport_name*/); } r = 0; @@ -4607,9 +4643,84 @@ parse_bridge_line(const char *line, int validate_only) smartlist_free(items); tor_free(addrport); tor_free(fingerprint); + tor_free(transport_name); return r; } +static int +parse_transport_line(const char *line, int validate_only) +{ + smartlist_t *items = NULL; + int r; + char *socks_ver_str=NULL; + char *name=NULL; + char *addrport=NULL; + int socks_ver; + tor_addr_t addr; + 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(): " + "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")) + socks_ver = PROXY_SOCKS5; + else { + log_warn(LD_CONFIG, "Strange transport proxy type."); + goto err; + } + + addrport = smartlist_get(items, 0); + smartlist_del_keeporder(items, 0); + + if (tor_addr_port_parse(addrport, &addr, &port)<0) { + log_warn(LD_CONFIG, "Error parsing transport " + "address '%s'", addrport); + goto err; + } + + if (!port) { + log_warn(LD_CONFIG, + "Transport address '%s' has no port.", addrport); + goto err; + } + + 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); */ + } + + r = 0; + goto done; + + err: + r = -1; + + done: + SMARTLIST_FOREACH(items, char*, s, tor_free(s)); + smartlist_free(items); + tor_free(socks_ver_str); + 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 * shares any bits with required_type or required_type diff --git a/src/or/or.h b/src/or/or.h index b4000ad..062352a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2660,6 +2660,8 @@ typedef struct { config_line_t *Bridges; /**< List of bootstrap bridge addresses. */ + 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 * future. */

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2011