Commit 838d4dee authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

make check-spaces

parent 2b5ff525

src/or/entrynodes.c

+3 −2
Original line number Diff line number Diff line
@@ -2124,8 +2124,9 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) 
   * it. If we  */

  if (!fascist_firewall_allows_address_addr(&bridge->addr, bridge->port,

                                            FIREWALL_OR_CONNECTION, 0)) {

    log_notice(LD_CONFIG, "Tried to fetch a descriptor directly from a bridge, "

               "but that bridge is not reachable through our firewall.");

    log_notice(LD_CONFIG, "Tried to fetch a descriptor directly from a "

               "bridge, but that bridge is not reachable through our "

               "firewall.");

    return;

  }

src/or/or.h

+2 −2
Original line number Diff line number Diff line
@@ -4092,8 +4092,8 @@ typedef struct { 
  int ClientUseIPv6;

  /** If true, prefer an IPv6 OR port over an IPv4 one for entry node

   * connections. If auto, bridge clients prefer IPv6, and other clients

   * prefer IPv4. Use fascist_firewall_prefer_ipv6_orport() instead of accessing

   * this value directly. */

   * prefer IPv4. Use fascist_firewall_prefer_ipv6_orport() instead of

   * accessing this value directly. */

  int ClientPreferIPv6ORPort;

  /** If true, prefer an IPv6 directory port over an IPv4 one for direct

   * directory connections. If auto, bridge clients prefer IPv6, and other

src/or/policies.c

+8 −7
Original line number Diff line number Diff line
@@ -421,7 +421,8 @@ fascist_firewall_allows_address(const tor_addr_t *addr, 


/** Is this client configured to use IPv6?

 */

int fascist_firewall_use_ipv6(const or_options_t *options)

int

fascist_firewall_use_ipv6(const or_options_t *options)

{

  /* Clients use IPv6 if it's set, or they use bridges, or they don't use

   * IPv4 */

src/test/test_policy.c

+0 −1
Original line number Diff line number Diff line
@@ -1546,7 +1546,6 @@ test_policies_fascist_firewall_choose_address(void *arg) 
                                            FIREWALL_DIR_CONNECTION, 1)

            == &ipv6_dir_ap);





  /* In the default configuration (Auto / IPv6 off), bridge clients should

   * still use IPv6, and only prefer it for bridges configured with an IPv6

   * address, regardless of ClientUseIPv6. */