- tor-commits - lists.torproject.org

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