Make bridge clients prefer the configured bridge address

When ClientPreferIPv6ORPort is auto, bridges prefer the configured
bridge ORPort address. Otherwise, they use the value of the option.
Other clients prefer IPv4 ORPorts if ClientPreferIPv6ORPort is auto.

When ClientPreferIPv6DirPort is auto, all clients prefer IPv4 DirPorts.

1 files changed, 7 insertions, 11 deletions

diff --git a/src/or/policies.c b/src/or/policies.c
index 734558d836..e2cece56e4 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -458,6 +458,13 @@ fascist_firewall_prefer_ipv6_impl(const or_options_t *options)
 int
 fascist_firewall_prefer_ipv6_orport(const or_options_t *options)
 {
+  /* node->ipv6_preferred is set from fascist_firewall_prefer_ipv6_orport()
+   * each time the consensus is loaded.
+   * If our preferences change, we will only reset ipv6_preferred on the node
+   * when the next consensus is loaded. But the consensus is realoded when the
+   * configuration changes after a HUP. So as long as the result of this
+   * function only depends on Tor's options, everything should work ok.
+   */
   int pref_ipv6 = fascist_firewall_prefer_ipv6_impl(options);
 
   if (pref_ipv6 >= 0) {
@@ -469,11 +476,6 @@ fascist_firewall_prefer_ipv6_orport(const or_options_t *options)
     return 1;
   }
 
-  /* For bridge clients, ClientPreferIPv6ORPort auto means "prefer IPv6". */
-  if (options->UseBridges && options->ClientPreferIPv6ORPort != 0) {
-    return 1;
-  }
-
   return 0;
 }
 
@@ -493,12 +495,6 @@ fascist_firewall_prefer_ipv6_dirport(const or_options_t *options)
     return 1;
   }
 
-  /* For bridge clients, ClientPreferIPv6ORPort auto means "prefer IPv6".
-   * XX/teor - do bridge clients ever use a DirPort? */
-  if (options->UseBridges && options->ClientPreferIPv6DirPort != 0) {
-    return 1;
-  }
-
   return 0;
 }