- tor-commits - lists.torproject.org

[tor/master] Per-listener option to prefer IPv6 automaps when possible.
by nickm＠torproject.org 17 Dec '12

17 Dec '12

commit 8d080d0b01f61c282ca8843801f2ebc8ae98c764 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 25 14:51:36 2012 -0500 Per-listener option to prefer IPv6 automaps when possible. --- src/or/config.c | 9 ++++++++- src/or/connection.c | 3 +++ src/or/connection_edge.c | 10 ++++++++-- src/or/or.h | 3 +++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 60028f2..1df10e1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4605,6 +4605,7 @@ port_cfg_new(void) port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t)); cfg->ipv4_traffic = 1; cfg->cache_ipv4_answers = 1; + cfg->prefer_ipv6_virtaddr = 1; return cfg; } @@ -4789,6 +4790,7 @@ parse_port_config(smartlist_t *out, cfg->no_listen = 1; cfg->bind_ipv4_only = 1; cfg->ipv4_traffic = 1; + cfg->prefer_ipv6_virtaddr = 1; smartlist_add(out, cfg); } @@ -4853,7 +4855,8 @@ parse_port_config(smartlist_t *out, bind_ipv4_only = 0, bind_ipv6_only = 0, ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, cache_ipv4 = 1, use_cached_ipv4 = 0, - cache_ipv6 = 0, use_cached_ipv6 = 0; + cache_ipv6 = 0, use_cached_ipv6 = 0, + prefer_ipv6_automap = 1; smartlist_split_string(elts, ports->value, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); @@ -5008,6 +5011,9 @@ parse_port_config(smartlist_t *out, } else if (!strcasecmp(elt, "UseDNSCache")) { use_cached_ipv4 = use_cached_ipv6 = ! no; continue; + } else if (!strcasecmp(elt, "PreferIPv6Automap")) { + prefer_ipv6_automap = ! no; + continue; } if (!strcasecmpend(elt, "s")) @@ -5066,6 +5072,7 @@ parse_port_config(smartlist_t *out, cfg->cache_ipv6_answers = cache_ipv6; cfg->use_cached_ipv4_answers = use_cached_ipv4; cfg->use_cached_ipv6_answers = use_cached_ipv6; + cfg->prefer_ipv6_virtaddr = prefer_ipv6_automap; smartlist_add(out, cfg); } diff --git a/src/or/connection.c b/src/or/connection.c index 1395d3e..740462e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1134,6 +1134,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, lis_conn->cache_ipv6_answers = port_cfg->cache_ipv6_answers; lis_conn->use_cached_ipv4_answers = port_cfg->use_cached_ipv4_answers; lis_conn->use_cached_ipv6_answers = port_cfg->use_cached_ipv6_answers; + lis_conn->prefer_ipv6_virtaddr = port_cfg->prefer_ipv6_virtaddr; if (connection_add(conn) < 0) { /* no space, forget it */ log_warn(LD_NET,"connection_add for listener failed. Giving up."); @@ -1376,6 +1377,8 @@ connection_init_accepted_conn(connection_t *conn, listener->use_cached_ipv4_answers; TO_ENTRY_CONN(conn)->use_cached_ipv6_answers = listener->use_cached_ipv6_answers; + TO_ENTRY_CONN(conn)->prefer_ipv6_virtaddr = + listener->prefer_ipv6_virtaddr; switch (TO_CONN(listener)->type) { case CONN_TYPE_AP_LISTENER: diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 9608026..28c9e09 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -932,9 +932,15 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, automap = addressmap_address_should_automap(socks->address, options); if (automap) { const char *new_addr; - /*XXXX IPv6 Sometimes this should be RESOLVED_TYPE_IPV6 */ + int addr_type = RESOLVED_TYPE_IPV4; + if (conn->socks_request->socks_version != 4) { + if (!conn->ipv4_traffic_ok || + (conn->ipv6_traffic_ok && conn->prefer_ipv6_traffic) || + conn->prefer_ipv6_virtaddr) + addr_type = RESOLVED_TYPE_IPV6; + } new_addr = addressmap_register_virtual_address( - RESOLVED_TYPE_IPV4, tor_strdup(socks->address)); + addr_type, tor_strdup(socks->address)); if (! new_addr) { log_warn(LD_APP, "Unable to automap address %s", escaped_safe_str(socks->address)); diff --git a/src/or/or.h b/src/or/or.h index 5b60193..17cd99b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1242,6 +1242,7 @@ typedef struct listener_connection_t { unsigned int cache_ipv6_answers : 1; unsigned int use_cached_ipv4_answers : 1; unsigned int use_cached_ipv6_answers : 1; + unsigned int prefer_ipv6_virtaddr : 1; } listener_connection_t; @@ -1556,6 +1557,7 @@ typedef struct entry_connection_t { unsigned int cache_ipv6_answers : 1; unsigned int use_cached_ipv4_answers : 1; unsigned int use_cached_ipv6_answers : 1; + unsigned int prefer_ipv6_virtaddr : 1; } entry_connection_t; @@ -3107,6 +3109,7 @@ typedef struct port_cfg_t { unsigned int cache_ipv6_answers : 1; unsigned int use_cached_ipv4_answers : 1; unsigned int use_cached_ipv6_answers : 1; + unsigned int prefer_ipv6_virtaddr : 1; /* Unix sockets only: */ /** Path for an AF_UNIX address */

1 0

[tor/master] Drop the maximum attempts to get a virtual address to 1000.
by nickm＠torproject.org 17 Dec '12

17 Dec '12

commit 4a07ea4a8c41c55ef4d8341ddf67601d3f09711a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 25 17:19:25 2012 -0500 Drop the maximum attempts to get a virtual address to 1000. This is good enough to give P_success >= 999,999,999/1,000,000,000 so long as the address space is less than 97.95 full. It'd be ridiculous for that to happen for IPv6, and usome reasonable assumptions, it would also be pretty silly for IPv4. --- changes/ipv6_automap | 7 +++++++ src/or/addressmap.c | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/changes/ipv6_automap b/changes/ipv6_automap index 150349c..1b44585 100644 --- a/changes/ipv6_automap +++ b/changes/ipv6_automap @@ -10,3 +10,10 @@ - AutomapHostsOnResolve responses are now randomized, to avoid annoying situations where Tor is restarted and applications connect to the wrong addresses. + + - We never try more than 1000 times to pick a virtual address + when AutomapHostsOnResolve is set. That's good enough so long + as we aren't close to handing out our entire virtual address + space; if you're getting there, it's best to switch to IPv6 + virtual addresses anyway. + diff --git a/src/or/addressmap.c b/src/or/addressmap.c index e1efbf4..f4c3129 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -863,9 +863,13 @@ addressmap_get_virtual_address(int type) const virtual_addr_conf_t *conf = ipv6 ? &virtaddr_conf_ipv6 : &virtaddr_conf_ipv4; - // This is an imperfect estimate of how many addresses are available, but - // that's ok. We also don't try every one. - uint32_t attempts = ipv6 ? UINT32_MAX : (1u << (32- conf->bits)); + /* Don't try more than 1000 times. This gives us P < 1e-9 for + * failing to get a good address so long as the address space is + * less than ~97.95% full. That's always going to be true under + * sensible circumstances for an IPv6 /10, and it's going to be + * true for an IPv4 /10 as long as we've handed out less than + * 4.08 million addresses. */ + uint32_t attempts = 1000; tor_addr_t addr;

1 0

[tor/master] Merge branch 'ticket7570_7571'
by nickm＠torproject.org 17 Dec '12

17 Dec '12

commit 9b9cc6774fe81e5bf68293308f713d19816ff6da Merge: 3874e74 4a07ea4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 17 15:49:09 2012 -0500 Merge branch 'ticket7570_7571' Conflicts: src/or/routerlist.c changes/ipv6_automap | 19 +++ changes/prop205-simplified | 25 ++++ doc/tor.1.txt | 52 +++++++-- src/or/addressmap.c | 274 ++++++++++++++++++++++++++++++-------------- src/or/addressmap.h | 26 ++++- src/or/config.c | 77 ++++++++++--- src/or/connection.c | 14 +++ src/or/connection_edge.c | 46 +++++--- src/or/control.c | 9 +- src/or/or.h | 64 ++++++++++- src/or/relay.c | 22 +++-- src/test/test_addr.c | 71 ++++++++++++ src/test/test_config.c | 7 + 13 files changed, 559 insertions(+), 147 deletions(-)

1 0

[tor/master] Describe IPv6 automap changes
by nickm＠torproject.org 17 Dec '12

17 Dec '12

commit 40a9842090fbf3ecbc155e5be11e200c9aef1a08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 25 16:43:32 2012 -0500 Describe IPv6 automap changes --- changes/ipv6_automap | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/changes/ipv6_automap b/changes/ipv6_automap new file mode 100644 index 0000000..150349c --- /dev/null +++ b/changes/ipv6_automap @@ -0,0 +1,12 @@ + o Minor features: + + - AutomapHostsOnResolve now support IPv6 addresses. By default, we + prefer to hand out virtual IPv6 addresses, since there are more of + them and we can't run out. To override this behavior and make + IPv4 addresses preferred, set NoPreferIPv6Automap on whatever + SOCKSPort or DNSPort you're using for resolving. Implements + ticket #7571. + + - AutomapHostsOnResolve responses are now randomized, to avoid + annoying situations where Tor is restarted and applications + connect to the wrong addresses.

1 0

[tor/master] Document PreferIPv6Automap in the manpage
by nickm＠torproject.org 17 Dec '12

17 Dec '12

commit c1226cf4f90b6b4a0b13b3eaf1c62ca98874ccf7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 25 15:33:07 2012 -0500 Document PreferIPv6Automap in the manpage --- doc/tor.1.txt | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ec350ba..85b7f4c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -955,6 +955,11 @@ The following options are useful only for clients (that is, if **UseDNSCache**;; Tells the client to use any cached DNS answers we have when making requests via this connection. + **PreferIPv6Automap**;; + When serving a hostname lookup request on this port that + should get automapped (according to AutomapHostsOnResove), + if we could return either an IPv4 or an IPv6 answer, prefer + an IPv6 answer. (On by default.) **SOCKSListenAddress** __IP__[:__PORT__]:: Bind to this address to listen for connections from Socks-speaking

1 0

[tor/master] Add missing doxygen for DNS and automap code
by nickm＠torproject.org 17 Dec '12

17 Dec '12

commit 4ded40b0cadda803c2f1dc17f90f83f64d479392 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 25 15:12:44 2012 -0500 Add missing doxygen for DNS and automap code --- src/or/or.h | 41 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 17cd99b..3a8e50c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1225,7 +1225,7 @@ typedef struct listener_connection_t { uint8_t isolation_flags; /**@}*/ - /** For a SOCKS listener, these fields describe whether we should + /** For a SOCKS listeners, these fields describe whether we should * allow IPv4 and IPv6 addresses from our exit nodes, respectively. * * @{ @@ -1237,11 +1237,22 @@ typedef struct listener_connection_t { * addresses? */ unsigned int socks_prefer_ipv6 : 1; - /*DOCDOC*/ + /** For a socks listener: should we cache IPv4/IPv6 DNS information that + * exit nodes tell us? + * + * @{ */ unsigned int cache_ipv4_answers : 1; unsigned int cache_ipv6_answers : 1; + /** @} */ + /** For a socks listeners: if we find an answer in our client-side DNS cache, + * should we use it? + * + * @{ */ unsigned int use_cached_ipv4_answers : 1; unsigned int use_cached_ipv6_answers : 1; + /** @} */ + /** For socks listeners: When we can automap an address to IPv4 or IPv6, + * do we prefer IPv6? */ unsigned int prefer_ipv6_virtaddr : 1; } listener_connection_t; @@ -1552,11 +1563,22 @@ typedef struct entry_connection_t { /** Should we say we prefer IPv6 traffic? */ unsigned int prefer_ipv6_traffic : 1; - /* DOCDOC*/ + /** For a socks listener: should we cache IPv4/IPv6 DNS information that + * exit nodes tell us? + * + * @{ */ unsigned int cache_ipv4_answers : 1; unsigned int cache_ipv6_answers : 1; + /** @} */ + /** For a socks listeners: if we find an answer in our client-side DNS cache, + * should we use it? + * + * @{ */ unsigned int use_cached_ipv4_answers : 1; unsigned int use_cached_ipv6_answers : 1; + /** @} */ + /** For socks listeners: When we can automap an address to IPv4 or IPv6, + * do we prefer IPv6? */ unsigned int prefer_ipv6_virtaddr : 1; } entry_connection_t; @@ -3104,11 +3126,22 @@ typedef struct port_cfg_t { unsigned int ipv6_traffic : 1; unsigned int prefer_ipv6 : 1; - /* DOCDOC */ + /** For a socks listener: should we cache IPv4/IPv6 DNS information that + * exit nodes tell us? + * + * @{ */ unsigned int cache_ipv4_answers : 1; unsigned int cache_ipv6_answers : 1; + /** @} */ + /** For a socks listeners: if we find an answer in our client-side DNS cache, + * should we use it? + * + * @{ */ unsigned int use_cached_ipv4_answers : 1; unsigned int use_cached_ipv6_answers : 1; + /** @} */ + /** For socks listeners: When we can automap an address to IPv4 or IPv6, + * do we prefer IPv6? */ unsigned int prefer_ipv6_virtaddr : 1; /* Unix sockets only: */

1 0

[tor/master] Implement option to turn off DNS cache use on a client port
by nickm＠torproject.org 17 Dec '12

17 Dec '12

commit f33487668f16dbd7f95eaf8644865c28e1dd7036 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 25 13:45:36 2012 -0500 Implement option to turn off DNS cache use on a client port (This is part 2 of making DNS cache use enabled/disabled on a per-client port basis. This implements the CacheIPv[46]DNS options, but not the UseCachedIPv[46] ones.) --- src/or/addressmap.c | 27 +++++++++++++++++++++++++-- src/or/addressmap.h | 7 +++++-- src/or/connection_edge.c | 15 +++++++++++++-- src/or/relay.c | 15 +++++++++++---- src/test/test_config.c | 7 +++++++ 5 files changed, 61 insertions(+), 10 deletions(-) diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 8145a14..a77e199 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -335,7 +335,9 @@ addressmap_match_superdomains(char *address) * was a .exit. */ int -addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, +addressmap_rewrite(char *address, size_t maxlen, + unsigned flags, + time_t *expires_out, addressmap_entry_source_t *exit_source_out) { addressmap_entry_t *ent; @@ -368,6 +370,16 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, goto done; } + if (ent && ent->source == ADDRMAPSRC_DNS) { + sa_family_t f; + tor_addr_t tmp; + f = tor_addr_parse(&tmp, ent->new_address); + if (f == AF_INET && !(flags & AMR_FLAG_USE_IPV4_DNS)) + goto done; + else if (f == AF_INET6 && !(flags & AMR_FLAG_USE_IPV6_DNS)) + goto done; + } + if (ent->dst_wildcard && !exact_match) { strlcat(address, ".", maxlen); strlcat(address, ent->new_address, maxlen); @@ -409,11 +421,22 @@ addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, * *<b>expires_out</b> to the expiry time of the result, or to <b>time_max</b> * if the result does not expire. */ int -addressmap_rewrite_reverse(char *address, size_t maxlen, time_t *expires_out) +addressmap_rewrite_reverse(char *address, size_t maxlen, unsigned flags, + time_t *expires_out) { char *s, *cp; addressmap_entry_t *ent; int r = 0; + { + sa_family_t f; + tor_addr_t tmp; + f = tor_addr_parse(&tmp, address); + if (f == AF_INET && !(flags & AMR_FLAG_USE_IPV4_DNS)) + return 0; + else if (f == AF_INET6 && !(flags & AMR_FLAG_USE_IPV6_DNS)) + return 0; + } + tor_asprintf(&s, "REVERSE[%s]", address); ent = strmap_get(addressmap, s); if (ent) { diff --git a/src/or/addressmap.h b/src/or/addressmap.h index 9b07341..54b3e0a 100644 --- a/src/or/addressmap.h +++ b/src/or/addressmap.h @@ -14,9 +14,12 @@ void addressmap_clean(time_t now); void addressmap_clear_configured(void); void addressmap_clear_transient(void); void addressmap_free_all(void); -int addressmap_rewrite(char *address, size_t maxlen, time_t *expires_out, +#define AMR_FLAG_USE_IPV4_DNS (1u<<0) +#define AMR_FLAG_USE_IPV6_DNS (1u<<1) +int addressmap_rewrite(char *address, size_t maxlen, unsigned flags, + time_t *expires_out, addressmap_entry_source_t *exit_source_out); -int addressmap_rewrite_reverse(char *address, size_t maxlen, +int addressmap_rewrite_reverse(char *address, size_t maxlen, unsigned flags, time_t *expires_out); int addressmap_have_mapping(const char *address, int update_timeout); diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 95088c7..091c145 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -952,8 +952,14 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, } if (socks->command == SOCKS_COMMAND_RESOLVE_PTR) { + unsigned rewrite_flags = 0; + if (conn->use_cached_ipv4_answers) + rewrite_flags |= AMR_FLAG_USE_IPV4_DNS; + if (conn->use_cached_ipv6_answers) + rewrite_flags |= AMR_FLAG_USE_IPV6_DNS; + if (addressmap_rewrite_reverse(socks->address, sizeof(socks->address), - &map_expires)) { + rewrite_flags, &map_expires)) { char *result = tor_strdup(socks->address); /* remember _what_ is supposed to have been resolved. */ tor_snprintf(socks->address, sizeof(socks->address), "REVERSE[%s]", @@ -984,8 +990,13 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, } } else if (!automap) { /* For address map controls, remap the address. */ + unsigned rewrite_flags = 0; + if (conn->use_cached_ipv4_answers) + rewrite_flags |= AMR_FLAG_USE_IPV4_DNS; + if (conn->use_cached_ipv6_answers) + rewrite_flags |= AMR_FLAG_USE_IPV6_DNS; if (addressmap_rewrite(socks->address, sizeof(socks->address), - &map_expires, &exit_source)) { + rewrite_flags, &map_expires, &exit_source)) { control_event_stream_status(conn, STREAM_EVENT_REMAP, REMAP_STREAM_SOURCE_CACHE); } diff --git a/src/or/relay.c b/src/or/relay.c index 7f49299..608b5fa 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -758,10 +758,17 @@ connection_ap_process_end_not_open( policies_set_node_exitpolicy_to_reject_all(exitrouter); } /* rewrite it to an IP if we learned one. */ - if (addressmap_rewrite(conn->socks_request->address, - sizeof(conn->socks_request->address), - NULL, NULL)) { - control_event_stream_status(conn, STREAM_EVENT_REMAP, 0); + { + unsigned rewrite_flags = 0; + if (conn->use_cached_ipv4_answers) + rewrite_flags |= AMR_FLAG_USE_IPV4_DNS; + if (conn->use_cached_ipv6_answers) + rewrite_flags |= AMR_FLAG_USE_IPV6_DNS; + if (addressmap_rewrite(conn->socks_request->address, + sizeof(conn->socks_request->address), + rewrite_flags, NULL, NULL)) { + control_event_stream_status(conn, STREAM_EVENT_REMAP, 0); + } } if (conn->chosen_exit_optional || conn->chosen_exit_retries) { diff --git a/src/test/test_config.c b/src/test/test_config.c index e04b9df..9f6b260 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -42,6 +42,11 @@ test_config_addressmap(void *arg) config_get_lines(buf, &(get_options_mutable()->AddressMap), 0); config_register_addressmaps(get_options()); +/* Use old interface for now, so we don't need to rewrite the unit tests */ +#define addressmap_rewrite(a,s,eo,ao) \ + addressmap_rewrite((a),(s),AMR_FLAG_USE_IPV4_DNS|AMR_FLAG_USE_IPV6_DNS, \ + (eo),(ao)) + /* MapAddress .invalidwildcard.com .torserver.exit - no match */ strlcpy(address, "www.invalidwildcard.com", sizeof(address)); test_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL)); @@ -158,6 +163,8 @@ test_config_addressmap(void *arg) strlcpy(address, "www.torproject.org", sizeof(address)); test_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL)); +#undef addressmap_rewrite + done: ; }

1 0

[tor/master] Add options to turn DNS cache use on or off per client port.
by nickm＠torproject.org 17 Dec '12

17 Dec '12

commit d3e9e03cacda3d99f3c585fd7bc00b3dd2390d61 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 25 13:18:26 2012 -0500 Add options to turn DNS cache use on or off per client port. (This is part 1 of making DNS cache use enabled/disabled on a per-client port basis. These options are shuffled around correctly, but don't do anything yet.) --- src/or/config.c | 29 ++++++++++++++++++++++++++++- src/or/connection.c | 11 +++++++++++ src/or/or.h | 20 ++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index e91d244..d0d0049 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4790,6 +4790,7 @@ parse_port_config(smartlist_t *out, cfg->isolation_flags = ISO_DEFAULT; cfg->no_advertise = 1; cfg->ipv4_traffic = 1; + cfg->cache_ipv4_answers = cfg->use_cached_ipv4_answers = 1; smartlist_add(out, cfg); } } @@ -4814,6 +4815,7 @@ parse_port_config(smartlist_t *out, cfg->session_group = SESSION_GROUP_UNSET; cfg->isolation_flags = ISO_DEFAULT; cfg->ipv4_traffic = 1; + cfg->cache_ipv4_answers = cfg->use_cached_ipv4_answers = 1; smartlist_add(out, cfg); } return 0; @@ -4834,7 +4836,9 @@ parse_port_config(smartlist_t *out, int ok; int no_listen = 0, no_advertise = 0, all_addrs = 0, bind_ipv4_only = 0, bind_ipv6_only = 0, - ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0; + ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, + cache_ipv4 = 1, use_cached_ipv4 = 1, + cache_ipv6 = 0, use_cached_ipv6 = 0; smartlist_split_string(elts, ports->value, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); @@ -4971,6 +4975,25 @@ parse_port_config(smartlist_t *out, continue; } } + if (!strcasecmp(elt, "CacheIPv4DNS")) { + cache_ipv4 = ! no; + continue; + } else if (!strcasecmp(elt, "CacheIPv6DNS")) { + cache_ipv6 = ! no; + continue; + } else if (!strcasecmp(elt, "CacheDNS")) { + cache_ipv4 = cache_ipv6 = ! no; + continue; + } else if (!strcasecmp(elt, "UseIPv4Cache")) { + use_cached_ipv4 = ! no; + continue; + } else if (!strcasecmp(elt, "UseIPv6Cache")) { + use_cached_ipv6 = ! no; + continue; + } else if (!strcasecmp(elt, "UseDNSCache")) { + use_cached_ipv4 = use_cached_ipv6 = ! no; + continue; + } if (!strcasecmpend(elt, "s")) elt[strlen(elt)-1] = '\0'; /* kill plurals. */ @@ -5024,6 +5047,10 @@ parse_port_config(smartlist_t *out, cfg->ipv4_traffic = ipv4_traffic; cfg->ipv6_traffic = ipv6_traffic; cfg->prefer_ipv6 = prefer_ipv6; + cfg->cache_ipv4_answers = cache_ipv4; + cfg->cache_ipv6_answers = cache_ipv6; + cfg->use_cached_ipv4_answers = use_cached_ipv4; + cfg->use_cached_ipv6_answers = use_cached_ipv6; smartlist_add(out, cfg); } diff --git a/src/or/connection.c b/src/or/connection.c index 223bbd9..1395d3e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1130,6 +1130,10 @@ connection_listener_new(const struct sockaddr *listensockaddr, lis_conn->socks_ipv4_traffic = 1; lis_conn->socks_ipv6_traffic = 1; } + lis_conn->cache_ipv4_answers = port_cfg->cache_ipv4_answers; + lis_conn->cache_ipv6_answers = port_cfg->cache_ipv6_answers; + lis_conn->use_cached_ipv4_answers = port_cfg->use_cached_ipv4_answers; + lis_conn->use_cached_ipv6_answers = port_cfg->use_cached_ipv6_answers; if (connection_add(conn) < 0) { /* no space, forget it */ log_warn(LD_NET,"connection_add for listener failed. Giving up."); @@ -1366,6 +1370,13 @@ connection_init_accepted_conn(connection_t *conn, TO_ENTRY_CONN(conn)->ipv4_traffic_ok = listener->socks_ipv4_traffic; TO_ENTRY_CONN(conn)->ipv6_traffic_ok = listener->socks_ipv6_traffic; TO_ENTRY_CONN(conn)->prefer_ipv6_traffic = listener->socks_prefer_ipv6; + TO_ENTRY_CONN(conn)->cache_ipv4_answers = listener->cache_ipv4_answers; + TO_ENTRY_CONN(conn)->cache_ipv6_answers = listener->cache_ipv6_answers; + TO_ENTRY_CONN(conn)->use_cached_ipv4_answers = + listener->use_cached_ipv4_answers; + TO_ENTRY_CONN(conn)->use_cached_ipv6_answers = + listener->use_cached_ipv6_answers; + switch (TO_CONN(listener)->type) { case CONN_TYPE_AP_LISTENER: conn->state = AP_CONN_STATE_SOCKS_WAIT; diff --git a/src/or/or.h b/src/or/or.h index 06a74f6..a2c4122 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1237,6 +1237,12 @@ typedef struct listener_connection_t { * addresses? */ unsigned int socks_prefer_ipv6 : 1; + /*DOCDOC*/ + unsigned int cache_ipv4_answers : 1; + unsigned int cache_ipv6_answers : 1; + unsigned int use_cached_ipv4_answers : 1; + unsigned int use_cached_ipv6_answers : 1; + } listener_connection_t; /** Minimum length of the random part of an AUTH_CHALLENGE cell. */ @@ -1545,6 +1551,12 @@ typedef struct entry_connection_t { /** Should we say we prefer IPv6 traffic? */ unsigned int prefer_ipv6_traffic : 1; + /* DOCDOC*/ + unsigned int cache_ipv4_answers : 1; + unsigned int cache_ipv6_answers : 1; + unsigned int use_cached_ipv4_answers : 1; + unsigned int use_cached_ipv6_answers : 1; + } entry_connection_t; /** Subtype of connection_t for an "directory connection" -- that is, an HTTP @@ -3084,10 +3096,18 @@ typedef struct port_cfg_t { unsigned int all_addrs : 1; unsigned int bind_ipv4_only : 1; unsigned int bind_ipv6_only : 1; + + /* Client port types only: */ unsigned int ipv4_traffic : 1; unsigned int ipv6_traffic : 1; unsigned int prefer_ipv6 : 1; + /* DOCDOC */ + unsigned int cache_ipv4_answers : 1; + unsigned int cache_ipv6_answers : 1; + unsigned int use_cached_ipv4_answers : 1; + unsigned int use_cached_ipv6_answers : 1; + /* Unix sockets only: */ /** Path for an AF_UNIX address */ char unix_addr[FLEXIBLE_ARRAY_MEMBER];

1 0

[tor/master] Oops; make DNSPort configuration take address family options
by nickm＠torproject.org 17 Dec '12

17 Dec '12

commit 44a9a47706f4dbca2386b0d5cc5cd3aea5781d59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 25 13:24:37 2012 -0500 Oops; make DNSPort configuration take address family options --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index acfe2c4..e91d244 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5125,7 +5125,7 @@ parse_ports(or_options_t *options, int validate_only, options->DNSPort_lines, options->DNSListenAddress, "DNS", CONN_TYPE_AP_DNS_LISTENER, "127.0.0.1", 0, - CL_PORT_WARN_NONLOCAL) < 0) { + CL_PORT_WARN_NONLOCAL|CL_PORT_TAKES_HOSTNAMES) < 0) { *msg = tor_strdup("Invalid DNSPort/DNSListenAddress configuration"); goto err; }

1 0

[tor/master] Oops: make the check for not adding ip->ip DNS maps correct
by nickm＠torproject.org 17 Dec '12

17 Dec '12

commit 32219d83134c861abad5a7d37f93f3ec4b492398 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 25 13:38:27 2012 -0500 Oops: make the check for not adding ip->ip DNS maps correct --- src/or/addressmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 98448eb..8145a14 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -629,7 +629,7 @@ client_dns_set_addressmap(origin_circuit_t *on_circ, tor_assert(address); tor_assert(val); - if (tor_addr_parse(&addr_tmp, address) == 0) + if (tor_addr_parse(&addr_tmp, address) >= 0) return; /* If address was an IP address already, don't add a mapping. */ /* XXXXX For now, don't cache IPv6 addresses. */

1 0