Commit b705cfa0 authored by George Kadianakis's avatar George Kadianakis
Browse files

Merge remote-tracking branch 'tor-gitlab/mr/111'

parents b46942d3 dcf5753a

changes/ticket18106

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Code simplification and refactoring:

    - Rename "fascist_firewall_*" identifiers to "reachable_addr_*" instead,

      for consistency with other code. Closes ticket 18106.

src/app/config/or_options_st.h

+2 −2
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ struct or_options_t { 
  int ClientUseIPv4;

  /** If true, clients may connect over IPv6. If false, they will avoid

   * connecting over IPv4. We enforce this for OR and Dir connections.

   * Use fascist_firewall_use_ipv6() instead of accessing this value

   * Use reachable_addr_use_ipv6() instead of accessing this value

   * directly. */

  int ClientUseIPv6;

  /** If true, prefer an IPv6 OR port over an IPv4 one for entry node
@@ -678,7 +678,7 @@ struct or_options_t { 
  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

   * clients prefer IPv4. Use fascist_firewall_prefer_ipv6_dirport() instead of

   * clients prefer IPv4. Use reachable_addr_prefer_ipv6_dirport() instead of

   * accessing this value directly.  */

  int ClientPreferIPv6DirPort;

src/core/mainloop/connection.c

+6 −6
Original line number Diff line number Diff line
@@ -2246,11 +2246,11 @@ connection_connect_log_client_use_ip_version(const connection_t *conn) 
    return;

  }



  const int must_ipv4 = !fascist_firewall_use_ipv6(options);

  const int must_ipv4 = !reachable_addr_use_ipv6(options);

  const int must_ipv6 = (options->ClientUseIPv4 == 0);

  const int pref_ipv6 = (conn->type == CONN_TYPE_OR

                         ? fascist_firewall_prefer_ipv6_orport(options)

                         : fascist_firewall_prefer_ipv6_dirport(options));

                         ? reachable_addr_prefer_ipv6_orport(options)

                         : reachable_addr_prefer_ipv6_dirport(options));

  tor_addr_t real_addr;

  tor_addr_copy(&real_addr, &conn->addr);
@@ -2275,7 +2275,7 @@ connection_connect_log_client_use_ip_version(const connection_t *conn) 
    return;

  }



  if (fascist_firewall_use_ipv6(options)) {

  if (reachable_addr_use_ipv6(options)) {

    log_info(LD_NET, "Our outgoing connection is using IPv%d.",

             tor_addr_family(&real_addr) == AF_INET6 ? 6 : 4);

  }
@@ -2285,13 +2285,13 @@ connection_connect_log_client_use_ip_version(const connection_t *conn) 
      || (pref_ipv6 && tor_addr_family(&real_addr) == AF_INET)) {

    log_info(LD_NET, "Outgoing connection to %s doesn't satisfy "

             "ClientPreferIPv6%sPort %d, with ClientUseIPv4 %d, and "

             "fascist_firewall_use_ipv6 %d (ClientUseIPv6 %d and UseBridges "

             "reachable_addr_use_ipv6 %d (ClientUseIPv6 %d and UseBridges "

             "%d).",

             fmt_addr(&real_addr),

             conn->type == CONN_TYPE_OR ? "OR" : "Dir",

             conn->type == CONN_TYPE_OR ? options->ClientPreferIPv6ORPort

                                        : options->ClientPreferIPv6DirPort,

             options->ClientUseIPv4, fascist_firewall_use_ipv6(options),

             options->ClientUseIPv4, reachable_addr_use_ipv6(options),

             options->ClientUseIPv6, options->UseBridges);

  }

}

src/core/or/extendinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ extend_info_from_node(const node_t *node, int for_direct_connect) 


  /* Choose a preferred address first, but fall back to an allowed address. */

  if (for_direct_connect)

    fascist_firewall_choose_address_node(node, FIREWALL_OR_CONNECTION, 0, &ap);

    reachable_addr_choose_from_node(node, FIREWALL_OR_CONNECTION, 0, &ap);

  else {

    node_get_prim_orport(node, &ap);

  }

src/core/or/policies.c

+70 −70

File changed.

Preview size limit exceeded, changes collapsed.