diff options
| author | teor <teor@torproject.org> | 2020-04-09 11:05:59 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-09 11:05:59 +1000 |
| commit | f6efb3a184341b5b46c8a565e2ec297d2846e45c (patch) | |
| tree | e9363be3e341a319853c2d78890a8f2f19bfc929 /src | |
| parent | 2d6f00e45b3003337242704e0fde2d2adbaa6cf5 (diff) | |
| parent | cd2121a1262c2d51b8b9174933db5c985f0ccc55 (diff) | |
| download | tor-f6efb3a184341b5b46c8a565e2ec297d2846e45c.tar.gz tor-f6efb3a184341b5b46c8a565e2ec297d2846e45c.zip | |
Merge branch 'pr1854_squashed' into maint-0.4.3
Squashed PR 1854, and fixed a minor typo (IPv4 -> IPv6).
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/config/config.c | 4 | ||||
| -rw-r--r-- | src/test/test_config.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index bbf984ad08..c7ac9d6315 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -5886,7 +5886,7 @@ port_cfg_new(size_t namelen) port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t) + namelen + 1); 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; @@ -6134,7 +6134,7 @@ port_parse_config(smartlist_t *out, /* This must be kept in sync with port_cfg_new's defaults */ int no_listen = 0, no_advertise = 0, all_addrs = 0, bind_ipv4_only = 0, bind_ipv6_only = 0, - ipv4_traffic = 1, ipv6_traffic = 1, prefer_ipv6 = 1, dns_request = 1, + ipv4_traffic = 1, ipv6_traffic = 1, prefer_ipv6 = 0, dns_request = 1, onion_traffic = 1, cache_ipv4 = 0, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, diff --git a/src/test/test_config.c b/src/test/test_config.c index ee277104fb..7b9812f550 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -4159,7 +4159,7 @@ test_config_parse_port_config__ports__ports_given(void *data) 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.prefer_ipv6, OP_EQ, 0); 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); |