November 2011 - tor-commits - lists.torproject.org

[tor/master] Use correct address family where necessary for bridges on IPv6.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 529820f8baeaccc6efffde1d9b241eb9f11ce82f Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu Nov 24 19:01:56 2011 +0100 Use correct address family where necessary for bridges on IPv6. --- src/or/connection.c | 5 +++-- src/or/connection_edge.c | 4 ++-- src/or/connection_or.c | 2 +- src/or/directory.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index af8663e..7b95aca 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -880,7 +880,8 @@ connection_create_listener(const struct sockaddr *listensockaddr, return NULL; } - if (listensockaddr->sa_family == AF_INET) { + if (listensockaddr->sa_family == AF_INET || + listensockaddr->sa_family == AF_INET6) { int is_tcp = (type != CONN_TYPE_AP_DNS_LISTENER); if (is_tcp) start_reading = 1; @@ -890,7 +891,7 @@ connection_create_listener(const struct sockaddr *listensockaddr, log_notice(LD_NET, "Opening %s on %s:%d", conn_type_to_string(type), fmt_addr(&addr), usePort); - s = tor_open_socket(PF_INET, + s = tor_open_socket(tor_addr_family(&addr), is_tcp ? SOCK_STREAM : SOCK_DGRAM, is_tcp ? IPPROTO_TCP: IPPROTO_UDP); if (!SOCKET_OK(s)) { diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index efaad79..ad0e8c5 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2593,7 +2593,7 @@ connection_ap_make_link(connection_t *partner, want_onehop ? "direct" : "anonymized", safe_str_client(address), port); - conn = entry_connection_new(CONN_TYPE_AP, AF_INET); + conn = entry_connection_new(CONN_TYPE_AP, tor_addr_family(&partner->addr)); base_conn = ENTRY_TO_CONN(conn); base_conn->linked = 1; /* so that we can add it safely below. */ @@ -3199,7 +3199,7 @@ connection_exit_connect_dir(edge_connection_t *exitconn) exitconn->_base.state = EXIT_CONN_STATE_OPEN; - dirconn = dir_connection_new(AF_INET); + dirconn = dir_connection_new(tor_addr_family(&exitconn->_base.addr)); tor_addr_copy(&dirconn->_base.addr, &exitconn->_base.addr); dirconn->_base.port = 0; diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 771e889..24878bf 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1036,7 +1036,7 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port, return NULL; } - conn = or_connection_new(AF_INET); + conn = or_connection_new(tor_addr_family(&addr)); /* set up conn so it's got all the data we need to remember */ connection_or_init_conn_from_address(conn, &addr, port, id_digest, 1); diff --git a/src/or/directory.c b/src/or/directory.c index 43bef5c..65d8d95 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -919,7 +919,7 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, return; } - conn = dir_connection_new(AF_INET); + conn = dir_connection_new(tor_addr_family(&addr)); /* set up conn so it's got all the data we need to remember */ tor_addr_copy(&conn->_base.addr, &addr);

1 0

[tor/master] Use the preferred address and port when initiating a connection.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit f89c6196797a6a4b485b3a5eb8788e36eacd9819 Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu Nov 24 18:59:24 2011 +0100 Use the preferred address and port when initiating a connection. This is not as conservative as we could do it, f.ex. by looking at the connection and only do this for connections to bridges. A non-bridge should never have anything else than its primary IPv4 address set though, so I think this is safe. --- src/or/connection_or.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 6990952..771e889 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -648,8 +648,9 @@ connection_or_init_conn_from_address(or_connection_t *conn, tor_addr_copy(&conn->real_addr, addr); if (r) { tor_addr_t node_addr; - node_get_addr(r, &node_addr); - /* XXXX proposal 118 will make this more complex. */ + node_get_pref_addr(r, &node_addr); + /* XXXX proposal 186 is making this more complex. For now, a conn + is canonical when it uses the _preferred_ address. */ if (tor_addr_eq(&conn->_base.addr, &node_addr)) conn->is_canonical = 1; if (!started_here) { @@ -664,7 +665,7 @@ connection_or_init_conn_from_address(or_connection_t *conn, * log the "right" port too, so we know if it's moria1 or moria2. */ tor_addr_copy(&conn->_base.addr, &node_addr); - conn->_base.port = node_get_orport(r); + conn->_base.port = node_get_pref_orport(r); } conn->nickname = tor_strdup(node_get_nickname(r)); tor_free(conn->_base.address);

1 0

[tor/master] Merge node_get_{prim, pref, pref_ipv6}_addr with their _orport counterparts.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 2376a6ade4c5258da5512885eba28e3e0461f2a8 Author: Linus Nordberg <linus(a)nordberg.se> Date: Mon Nov 28 12:15:58 2011 +0100 Merge node_get_{prim,pref,pref_ipv6}_addr with their _orport counterparts. This keeps the IP address and TCP for a given OR port together, reducing the risk of using an address for one address family with a port of another. Make node_get_addr() a wrapper function for compatibility. --- src/or/connection_or.c | 12 +++--- src/or/nodelist.c | 87 ++++++++++++++++-------------------------------- src/or/nodelist.h | 15 +++----- 3 files changed, 41 insertions(+), 73 deletions(-) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 24878bf..470f6d2 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -647,11 +647,11 @@ connection_or_init_conn_from_address(or_connection_t *conn, tor_addr_copy(&conn->_base.addr, addr); tor_addr_copy(&conn->real_addr, addr); if (r) { - tor_addr_t node_addr; - node_get_pref_addr(r, &node_addr); + tor_addr_port_t node_ap; + node_get_pref_orport(r, &node_ap); /* XXXX proposal 186 is making this more complex. For now, a conn is canonical when it uses the _preferred_ address. */ - if (tor_addr_eq(&conn->_base.addr, &node_addr)) + if (tor_addr_eq(&conn->_base.addr, &node_ap.addr)) conn->is_canonical = 1; if (!started_here) { /* Override the addr/port, so our log messages will make sense. @@ -664,12 +664,12 @@ connection_or_init_conn_from_address(or_connection_t *conn, * right IP address and port 56244, that wouldn't be as helpful. now we * log the "right" port too, so we know if it's moria1 or moria2. */ - tor_addr_copy(&conn->_base.addr, &node_addr); - conn->_base.port = node_get_pref_orport(r); + tor_addr_copy(&conn->_base.addr, &node_ap.addr); + conn->_base.port = node_ap.port; } conn->nickname = tor_strdup(node_get_nickname(r)); tor_free(conn->_base.address); - conn->_base.address = tor_dup_addr(&node_addr); + conn->_base.address = tor_dup_addr(&node_ap.addr); } else { const char *n; /* If we're an authoritative directory server, we may know a diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 08dcde6..493c03f 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -682,19 +682,30 @@ node_get_all_orports(const node_t *node) return sl; } -/** Copy the primary, IPv4, address for node into - * *addr_out. */ +/** Copy the primary (IPv4) OR port (IP address and TCP port) for + * node into *ap_out. */ void -node_get_prim_addr(const node_t *node, tor_addr_t *addr_out) +node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { - router_get_prim_addr_port(node->ri, addr_out, NULL); + router_get_prim_addr_port(node->ri, &ap_out->addr, &ap_out->port); } else if (node->rs) { - tor_addr_from_ipv4h(addr_out, node->rs->addr); + tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); + ap_out->port = node->rs->or_port; } } +/** Wrapper around node_get_prim_orport for backward + compatibility. */ +void +node_get_addr(const node_t *node, tor_addr_t *addr_out) +{ + tor_addr_port_t ap; + node_get_prim_orport(node, &ap); + tor_addr_copy(addr_out, &ap.addr); +} + /** Return the host-order IPv4 address for node, or 0 if it doesn't * seem to have one. */ uint32_t @@ -708,40 +719,34 @@ node_get_prim_addr_ipv4h(const node_t *node) return 0; } -/** Return 1 if we prefer the IPv6 address of node, else 0. */ -static int -node_ipv6_preferred(const node_t *node) -{ - if (node->ri != NULL) - return router_ipv6_preferred(node->ri); - return 0; -} - -/** Copy the preferred address for node into - * addr_out. */ +/** Copy the preferred OR port (IP address and TCP port) for + * node into ap_out. */ void -node_get_pref_addr(const node_t *node, tor_addr_t *addr_out) +node_get_pref_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { - router_get_pref_addr_port(node->ri, addr_out, NULL); + router_get_pref_addr_port(node->ri, &ap_out->addr, &ap_out->port); } else if (node->rs) { /* No IPv6 in routerstatus_t yet. XXXprop186 ok for private bridges but needs fixing */ - tor_addr_from_ipv4h(addr_out, node->rs->addr); + tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); + ap_out->port = node->rs->or_port; } } -/** Copy the preferred IPv6 address for node into - * *addr_out. */ +/** Copy the preferred IPv6 OR port (address and TCP port) for + * node into *ap_out. */ void -node_get_pref_ipv6_addr(const node_t *node, tor_addr_t *addr_out) +node_get_pref_ipv6_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { - tor_addr_copy(addr_out, &node->ri->ipv6_addr); + tor_addr_copy(&ap_out->addr, &node->ri->ipv6_addr); + ap_out->port = node->ri->ipv6_orport; } else if (node->rs) { /* No IPv6 in routerstatus_t yet. XXXprop186 ok for private bridges but needs fixing */ - tor_addr_make_unspec(addr_out); + tor_addr_make_unspec(&ap_out->addr); + ap_out->port = 0; } } @@ -772,40 +777,6 @@ node_get_declared_uptime(const node_t *node) return -1; } -/** Return node's declared primary (IPv4) or_port. */ -uint16_t -node_get_prim_orport(const node_t *node) -{ - if (node->ri) - return node->ri->or_port; - else if (node->rs) - return node->rs->or_port; - else - return 0; -} - -/** Return node's preferred or_port. */ -uint16_t -node_get_pref_orport(const node_t *node) -{ - if (node_ipv6_preferred(node)) - return node_get_pref_ipv6_orport(node); - else - return node_get_prim_orport(node); -} - -/** Return node's preferred IPv6 or_port. */ -uint16_t -node_get_pref_ipv6_orport(const node_t *node) -{ - if (node->ri) - return node->ri->ipv6_orport; - else if (node->rs) - return 0; /* No IPv6 in routerstatus_t yet. */ - else - return 0; -} - /** Return node's platform string, or NULL if we don't know it. */ const char * node_get_platform(const node_t *node) diff --git a/src/or/nodelist.h b/src/or/nodelist.h index 70c76d6..1b7549d 100644 --- a/src/or/nodelist.h +++ b/src/or/nodelist.h @@ -38,14 +38,12 @@ int node_get_purpose(const node_t *node); int node_is_me(const node_t *node); int node_exit_policy_rejects_all(const node_t *node); smartlist_t *node_get_all_orports(const node_t *node); -void node_get_prim_addr(const node_t *node, tor_addr_t *addr_out); -void node_get_pref_addr(const node_t *node, tor_addr_t *addr_out); -void node_get_pref_ipv6_addr(const node_t *node, tor_addr_t *addr_out); +void node_get_prim_orport(const node_t *node, tor_addr_port_t *addr_port_out); +void node_get_pref_orport(const node_t *node, tor_addr_port_t *addr_port_out); +void node_get_pref_ipv6_orport(const node_t *node, + tor_addr_port_t *addr_port_out); uint32_t node_get_prim_addr_ipv4h(const node_t *node); int node_allows_single_hop_exits(const node_t *node); -uint16_t node_get_prim_orport(const node_t *node); -uint16_t node_get_pref_orport(const node_t *node); -uint16_t node_get_pref_ipv6_orport(const node_t *node); const char *node_get_nickname(const node_t *node); const char *node_get_platform(const node_t *node); void node_get_address_string(const node_t *node, char *cp, size_t len); @@ -55,10 +53,9 @@ const smartlist_t *node_get_declared_family(const node_t *node); smartlist_t *nodelist_get_list(void); -/* Temporary aliases during transition to multiple addresses. */ -#define node_get_addr(n,a) node_get_prim_addr((n),(a)) +/* Temporary during transition to multiple addresses. */ +void node_get_addr(const node_t *node, tor_addr_t *addr_out); #define node_get_addr_ipv4h(n) node_get_prim_addr_ipv4h((n)) -#define node_get_orport(n) node_get_prim_orport((n)) /* XXXX These need to move out of routerlist.c */ void nodelist_refresh_countries(void);

1 0

[tor/master] Make the router_get_*_orport interface consistent with node_*.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 39ec781b8fa164dd2b68cec349f2b38d81fa3cbb Author: Linus Nordberg <linus(a)nordberg.se> Date: Mon Nov 28 13:51:56 2011 +0100 Make the router_get_*_orport interface consistent with node_*. --- src/or/nodelist.c | 3 +-- src/or/router.c | 22 +++++++++++----------- src/or/router.h | 4 ++-- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 921ce1a..7d634a1 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -740,8 +740,7 @@ void node_get_pref_ipv6_addr(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { - tor_addr_copy(&ap_out->addr, &node->ri->ipv6_addr); - ap_out->port = node->ri->ipv6_orport; + router_get_pref_ipv6_orport(node->ri, ap_out); } else if (node->rs) { /* No IPv6 in routerstatus_t yet. XXXprop186 ok for private bridges but needs fixing */ diff --git a/src/or/router.c b/src/or/router.c index a0ae79a..6904e85 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2132,16 +2132,6 @@ router_get_prim_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) ap_out->port = router->or_port; } -/** Copy the alternative, presumably IPv6, OR port (IP address and TCP - * port) for router into *ap_out. */ -void -router_get_alt_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) -{ - tor_assert(ap_out != NULL); - tor_addr_copy(&ap_out->addr, &router->ipv6_addr); - ap_out->port = router->ipv6_orport; -} - /** Return 1 if we prefer the IPv6 address and OR TCP port of * router, else 0. * @@ -2162,11 +2152,21 @@ void router_get_pref_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) { if (router_ipv6_preferred(router)) - router_get_alt_orport(router, ap_out); + router_get_pref_ipv6_orport(router, ap_out); else router_get_prim_orport(router, ap_out); } +/** Copy the preferred IPv6 OR port (IP address and TCP port) for + * router into *ap_out. */ +void +router_get_pref_ipv6_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) +{ + tor_assert(ap_out != NULL); + tor_addr_copy(&ap_out->addr, &router->ipv6_addr); + ap_out->port = router->ipv6_orport; +} + /** Load the contents of filename, find the last line starting with * end_line, ensure that its timestamp is not more than 25 hours in * the past or more than 1 hour in the future with respect to now, diff --git a/src/or/router.h b/src/or/router.h index 6095d02..d426b25 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -87,10 +87,10 @@ int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, crypto_pk_env_t *ident_key); void router_get_prim_orport(const routerinfo_t *router, tor_addr_port_t *addr_port_out); -void router_get_alt_orport(const routerinfo_t *router, - tor_addr_port_t *addr_port_out); void router_get_pref_orport(const routerinfo_t *router, tor_addr_port_t *addr_port_out); +void router_get_pref_ipv6_orport(const routerinfo_t *router, + tor_addr_port_t *addr_port_out); int router_ipv6_preferred(const routerinfo_t *router); int extrainfo_dump_to_string(char **s, extrainfo_t *extrainfo, crypto_pk_env_t *ident_key);

1 0

[tor/master] Make router_get_{prim, alt, pref}_addr_port take tor_addr_port_t *.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 3b51b326e4fb71b7ec75c5c8ef5a4869f5c4acc1 Author: Linus Nordberg <linus(a)nordberg.se> Date: Mon Nov 28 13:47:12 2011 +0100 Make router_get_{prim,alt,pref}_addr_port take tor_addr_port_t *. Rename to *_orport for consistency with node_*. --- src/or/circuitbuild.c | 16 ++++++-------- src/or/nodelist.c | 6 ++-- src/or/router.c | 54 +++++++++++++++++++++--------------------------- src/or/router.h | 12 +++++----- 4 files changed, 40 insertions(+), 48 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 1283256..faf939e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3332,16 +3332,15 @@ extend_info_alloc(const char *nickname, const char *digest, extend_info_t * extend_info_from_router(const routerinfo_t *r, int for_direct_connect) { - tor_addr_t addr; - uint16_t port; + tor_addr_port_t ap; tor_assert(r); if (for_direct_connect) - router_get_pref_addr_port(r, &addr, &port); + router_get_pref_orport(r, &ap); else - router_get_prim_addr_port(r, &addr, &port); + router_get_prim_orport(r, &ap); return extend_info_alloc(r->nickname, r->cache_info.identity_digest, - r->onion_pkey, &addr, port); + r->onion_pkey, &ap.addr, ap.port); } /** Allocate and return a new extend_info that can be used to build a @@ -4855,11 +4854,10 @@ get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr, static bridge_info_t * get_configured_bridge_by_routerinfo(const routerinfo_t *ri) { - tor_addr_t addr; - uint16_t port; + tor_addr_port_t ap; - router_get_pref_addr_port(ri, &addr, &port); - return get_configured_bridge_by_addr_port_digest(&addr, port, + router_get_pref_orport(ri, &ap); + return get_configured_bridge_by_addr_port_digest(&ap.addr, ap.port, ri->cache_info.identity_digest); } diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 493c03f..921ce1a 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -688,7 +688,7 @@ void node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { - router_get_prim_addr_port(node->ri, &ap_out->addr, &ap_out->port); + router_get_prim_orport(node->ri, ap_out); } else if (node->rs) { tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); @@ -725,7 +725,7 @@ void node_get_pref_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { - router_get_pref_addr_port(node->ri, &ap_out->addr, &ap_out->port); + router_get_pref_orport(node->ri, ap_out); } else if (node->rs) { /* No IPv6 in routerstatus_t yet. XXXprop186 ok for private bridges but needs fixing */ @@ -737,7 +737,7 @@ node_get_pref_orport(const node_t *node, tor_addr_port_t *ap_out) /** Copy the preferred IPv6 OR port (address and TCP port) for * node into *ap_out. */ void -node_get_pref_ipv6_orport(const node_t *node, tor_addr_port_t *ap_out) +node_get_pref_ipv6_addr(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { tor_addr_copy(&ap_out->addr, &node->ri->ipv6_addr); diff --git a/src/or/router.c b/src/or/router.c index d021737..a0ae79a 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2122,37 +2122,33 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, } -/** Copy the primary, IPv4, address and port for router into - *addr_out and *port_out. */ +/** Copy the primary (IPv4) OR port (IP address and TCP port) for + * router into *ap_out. */ void -router_get_prim_addr_port(const routerinfo_t *router, tor_addr_t *addr_out, - uint16_t *port_out) +router_get_prim_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) { - if (addr_out != NULL) - tor_addr_from_ipv4h(addr_out, router->addr); - if (port_out != NULL) - *port_out = router->or_port; + tor_assert(ap_out != NULL); + tor_addr_from_ipv4h(&ap_out->addr, router->addr); + ap_out->port = router->or_port; } -/** Copy the alternative, presumably IPv6, address and port for - router into *addr_out and *port_out. */ +/** Copy the alternative, presumably IPv6, OR port (IP address and TCP + * port) for router into *ap_out. */ void -router_get_alt_addr_port(const routerinfo_t *router, - tor_addr_t *addr_out, - uint16_t *port_out) +router_get_alt_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) { - if (addr_out != NULL) - tor_addr_copy(addr_out, &router->ipv6_addr); - if (port_out != NULL) - *port_out = router->ipv6_orport; + tor_assert(ap_out != NULL); + tor_addr_copy(&ap_out->addr, &router->ipv6_addr); + ap_out->port = router->ipv6_orport; } -/** Return 1 if we prefer the IPv6 address of router, else 0. - - We prefer the IPv6 address if the router has one and - i) the routerinfo_t says so - or - ii) the router has no IPv4 address. */ +/** Return 1 if we prefer the IPv6 address and OR TCP port of + * router, else 0. + * + * We prefer the IPv6 address if the router has one and + * i) the routerinfo_t says so + * or + * ii) the router has no IPv4 address. */ int router_ipv6_preferred(const routerinfo_t *router) { @@ -2160,17 +2156,15 @@ router_ipv6_preferred(const routerinfo_t *router) && (router->ipv6_preferred || router->addr == 0)); } -/** Copy the preferred IP address and port for router into - *addr_out and *port_out . */ +/** Copy the preferred OR port (IP address and TCP port) for + * router into *addr_out. */ void -router_get_pref_addr_port(const routerinfo_t *router, - tor_addr_t *addr_out, - uint16_t *port_out) +router_get_pref_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) { if (router_ipv6_preferred(router)) - router_get_alt_addr_port(router, addr_out, port_out); + router_get_alt_orport(router, ap_out); else - router_get_prim_addr_port(router, addr_out, port_out); + router_get_prim_orport(router, ap_out); } /** Load the contents of filename, find the last line starting with diff --git a/src/or/router.h b/src/or/router.h index 4094b66..6095d02 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -85,12 +85,12 @@ int router_pick_published_address(const or_options_t *options, uint32_t *addr); int router_rebuild_descriptor(int force); int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, crypto_pk_env_t *ident_key); -void router_get_prim_addr_port(const routerinfo_t *router, tor_addr_t *addr_out, - uint16_t *port_out); -void router_get_alt_addr_port(const routerinfo_t *router, tor_addr_t *addr_out, - uint16_t *port_out); -void router_get_pref_addr_port(const routerinfo_t *router, tor_addr_t *addr_out, - uint16_t *port_out); +void router_get_prim_orport(const routerinfo_t *router, + tor_addr_port_t *addr_port_out); +void router_get_alt_orport(const routerinfo_t *router, + tor_addr_port_t *addr_port_out); +void router_get_pref_orport(const routerinfo_t *router, + tor_addr_port_t *addr_port_out); int router_ipv6_preferred(const routerinfo_t *router); int extrainfo_dump_to_string(char **s, extrainfo_t *extrainfo, crypto_pk_env_t *ident_key);

1 0

[tor/master] Whitespace changes.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 32d10bdfb3a55fe3752f85a7937e1f3f5c7e2c56 Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Nov 29 11:00:43 2011 +0100 Whitespace changes. --- src/or/circuitbuild.c | 8 ++++---- src/or/config.c | 8 ++++---- src/or/config.h | 3 ++- src/or/router.c | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index faf939e..6b7be66 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4858,7 +4858,7 @@ get_configured_bridge_by_routerinfo(const routerinfo_t *ri) router_get_pref_orport(ri, &ap); return get_configured_bridge_by_addr_port_digest(&ap.addr, ap.port, - ri->cache_info.identity_digest); + ri->cache_info.identity_digest); } /** Return 1 if ri is one of our known bridges, else 0. */ @@ -4872,7 +4872,7 @@ routerinfo_is_a_configured_bridge(const routerinfo_t *ri) int node_is_a_configured_bridge(const node_t *node) { - int retval = 0; /* Negative. */ + int retval = 0; /* Negative. */ smartlist_t *orports = NULL; if (!node) @@ -4884,13 +4884,13 @@ node_is_a_configured_bridge(const node_t *node) SMARTLIST_FOREACH_BEGIN(orports, tor_addr_port_t *, orport) { if (get_configured_bridge_by_addr_port_digest(&orport->addr, orport->port, - node->identity) != NULL) { + node->identity) != NULL) { retval = 1; goto out; } } SMARTLIST_FOREACH_END(orport); -out: + out: if (orports != NULL) { SMARTLIST_FOREACH(orports, tor_addr_port_t *, p, tor_free(p)); smartlist_free(orports); diff --git a/src/or/config.c b/src/or/config.c index c9320f4..40b6187 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5918,11 +5918,11 @@ get_first_advertised_port_by_type_af(int listener_type, int address_family) if (cfg->type == listener_type && !cfg->no_advertise && (tor_addr_family(&cfg->addr) == address_family || - tor_addr_family(&cfg->addr) == AF_UNSPEC)) { + tor_addr_family(&cfg->addr) == AF_UNSPEC)) { if (tor_addr_family(&cfg->addr) != AF_UNSPEC || - (address_family == AF_INET && !cfg->ipv6_only) || - (address_family == AF_INET6 && !cfg->ipv4_only)) { - return cfg->port; + (address_family == AF_INET && !cfg->ipv6_only) || + (address_family == AF_INET6 && !cfg->ipv4_only)) { + return cfg->port; } } } SMARTLIST_FOREACH_END(cfg); diff --git a/src/or/config.h b/src/or/config.h index cbba9e6..2d94192 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -65,7 +65,8 @@ int did_last_state_file_write_fail(void); int or_state_save(time_t now); const smartlist_t *get_configured_ports(void); -int get_first_advertised_port_by_type_af(int listener_type, int address_family); +int get_first_advertised_port_by_type_af(int listener_type, + int address_family); #define get_primary_or_port() \ (get_first_advertised_port_by_type_af(CONN_TYPE_OR_LISTENER, AF_INET)) #define get_primary_dir_port() \ diff --git a/src/or/router.c b/src/or/router.c index 6904e85..a08a200 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2121,7 +2121,6 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, return (int)written+1; } - /** Copy the primary (IPv4) OR port (IP address and TCP port) for * router into *ap_out. */ void @@ -2143,7 +2142,7 @@ int router_ipv6_preferred(const routerinfo_t *router) { return (!tor_addr_is_null(&router->ipv6_addr) - && (router->ipv6_preferred || router->addr == 0)); + && (router->ipv6_preferred || router->addr == 0)); } /** Copy the preferred OR port (IP address and TCP port) for @@ -2160,7 +2159,8 @@ router_get_pref_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) /** Copy the preferred IPv6 OR port (IP address and TCP port) for * router into *ap_out. */ void -router_get_pref_ipv6_orport(const routerinfo_t *router, tor_addr_port_t *ap_out) +router_get_pref_ipv6_orport(const routerinfo_t *router, + tor_addr_port_t *ap_out) { tor_assert(ap_out != NULL); tor_addr_copy(&ap_out->addr, &router->ipv6_addr);

1 0

[tor/master] Warn user about client ignoring non-preferred IP address for a bridge.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 1dca559db8525e18336144535de1d2b2e77a41b2 Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Nov 29 15:25:04 2011 +0100 Warn user about client ignoring non-preferred IP address for a bridge. --- src/or/circuitbuild.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6b7be66..7934a2e 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5183,6 +5183,20 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) protocol that the bridge address indicates. Last bridge descriptor handled wins. */ ri->ipv6_preferred = tor_addr_family(&bridge->addr) == AF_INET6; + + /* XXXipv6 we lack support for falling back to another address for + the same relay, warn the user */ + if (!tor_addr_is_null(&ri->ipv6_addr)) + { + tor_addr_port_t ap; + router_get_pref_orport(ri, &ap); + log_notice(LD_CONFIG, + "Bridge '%s' has both an IPv4 and an IPv6 address. " + "Will prefer using its %s address (%s:%d).", + ri->nickname, + ri->ipv6_preferred ? "IPv6" : "IPv4", + fmt_addr(&ap.addr), ap.port); + } } if (node->rs) { routerstatus_t *rs = node->rs;

1 0

[tor/master] Add changes file.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 192de441e01b6da013f573b46e066b380848873e Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Nov 29 15:39:22 2011 +0100 Add changes file. --- changes/bug3786 | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug3786 b/changes/bug3786 new file mode 100644 index 0000000..8e61ee0 --- /dev/null +++ b/changes/bug3786 @@ -0,0 +1,7 @@ + o Major features: + - Implement support for clients connecting to private bridges over + IPv6. Bridges still need at least one IPv4 address in order to + connect to other relays. Currently, adding Bridge lines with + both an IPv4 and an IPv6 address to the same bridge will most + probably result in the IPv6 address not being used. Implements + parts of proposal 186.

1 0

[tor/master] Rename one more recalcitrant function.
by nickm＠torproject.org 30 Nov '11

30 Nov '11

commit 5412b3728cc0af782650f38ddb8e1566443f882c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 30 12:01:16 2011 -0500 Rename one more recalcitrant function. --- src/or/nodelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 7d634a1..eafc9b8 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -737,7 +737,7 @@ node_get_pref_orport(const node_t *node, tor_addr_port_t *ap_out) /** Copy the preferred IPv6 OR port (address and TCP port) for * node into *ap_out. */ void -node_get_pref_ipv6_addr(const node_t *node, tor_addr_port_t *ap_out) +node_get_pref_ipv6_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { router_get_pref_ipv6_orport(node->ri, ap_out);

1 0

[tor/master] Merge branch 'ipv6_bridges_squashed'
by nickm＠torproject.org 30 Nov '11

30 Nov '11

1 0