mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 05:03:43 +01:00
Merge remote-tracking branch 'dgoulet/ticket33796_044_01' into maint-0.4.4
This commit is contained in:
commit
8dd89e4330
7
changes/ticket33796
Normal file
7
changes/ticket33796
Normal file
@ -0,0 +1,7 @@
|
||||
o Removed features (IPv6, revert):
|
||||
- Revert the client port prefer IPv6 feature because it breaks the
|
||||
torsocks use case. The SOCKS resolve command is lacking a mechanism to
|
||||
ask for a specific address family (v4 or v6) thus prioritizing IPv6 when
|
||||
an IPv4 address is asked on the resolve SOCKS interface resulting in a
|
||||
failure. Tor Browser explicitly set PreferIPv6 so this should not affect
|
||||
the majority of our users. Closes ticket 33796; bugfix on 0.4.4.1-alpha.
|
@ -1492,16 +1492,14 @@ The following options are useful only for clients (that is, if
|
||||
Other recognized __flags__ for a SocksPort are:
|
||||
**NoIPv4Traffic**;;
|
||||
Tell exits to not connect to IPv4 addresses in response to SOCKS
|
||||
requests on this connection. (Allowing IPv4 is the default.)
|
||||
**NoIPv6Traffic**;;
|
||||
Tell exits to not connect to IPv6 addresses in response to SOCKS
|
||||
requests on this connection. This option is only relevant when SOCKS5
|
||||
is in use, because SOCKS4 can't handle IPv6. (Allowing IPv6 is the
|
||||
default.)
|
||||
**NoPreferIPv6**;;
|
||||
requests on this connection.
|
||||
**IPv6Traffic**;;
|
||||
Tell exits to allow IPv6 addresses in response to SOCKS requests on
|
||||
this connection, so long as SOCKS5 is in use. (SOCKS4 can't handle
|
||||
IPv6.)
|
||||
**PreferIPv6**;;
|
||||
Tells exits that, if a host has both an IPv4 and an IPv6 address,
|
||||
we would prefer to connect to it via IPv4. (IPv6 is the default in
|
||||
recent versions of Tor.)
|
||||
we would prefer to connect to it via IPv6. (IPv4 is the default.)
|
||||
**NoDNSRequest**;;
|
||||
Do not ask exits to resolve DNS addresses in SOCKS5 requests. Tor will
|
||||
connect to IPv4 addresses, IPv6 addresses (if IPv6Traffic is set) and
|
||||
|
@ -5610,7 +5610,7 @@ port_cfg_new(size_t namelen)
|
||||
/* entry_cfg flags */
|
||||
cfg->entry_cfg.ipv4_traffic = 1;
|
||||
cfg->entry_cfg.ipv6_traffic = 1;
|
||||
cfg->entry_cfg.prefer_ipv6 = 1;
|
||||
cfg->entry_cfg.prefer_ipv6 = 0;
|
||||
cfg->entry_cfg.dns_request = 1;
|
||||
cfg->entry_cfg.onion_traffic = 1;
|
||||
cfg->entry_cfg.prefer_ipv6_virtaddr = 1;
|
||||
|
@ -4160,8 +4160,6 @@ test_config_parse_port_config__ports__ports_given(void *data)
|
||||
/* Test entry port defaults as initialised in port_parse_config */
|
||||
tt_int_op(port_cfg->entry_cfg.dns_request, OP_EQ, 1);
|
||||
tt_int_op(port_cfg->entry_cfg.ipv4_traffic, OP_EQ, 1);
|
||||
tt_int_op(port_cfg->entry_cfg.ipv6_traffic, OP_EQ, 1);
|
||||
tt_int_op(port_cfg->entry_cfg.prefer_ipv6, OP_EQ, 1);
|
||||
tt_int_op(port_cfg->entry_cfg.onion_traffic, OP_EQ, 1);
|
||||
tt_int_op(port_cfg->entry_cfg.cache_ipv4_answers, OP_EQ, 0);
|
||||
tt_int_op(port_cfg->entry_cfg.prefer_ipv6_virtaddr, OP_EQ, 1);
|
||||
|
Loading…
Reference in New Issue
Block a user