diff options
author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-02-20 20:04:01 +1100 |
---|---|---|
committer | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-02-20 23:40:37 +1100 |
commit | c281c0365482891d6c3e71f85b2a6615faa5990b (patch) | |
tree | c18111633dc6aabfb73226fb3aeda858a32b0b15 /src/or/policies.h | |
parent | 4afb107278f528b9002415709d7a0003106ff70c (diff) | |
download | tor-c281c0365482891d6c3e71f85b2a6615faa5990b.tar.gz tor-c281c0365482891d6c3e71f85b2a6615faa5990b.zip |
If both IPv4 and IPv6 addresses could be used, choose one correctly
If there is a node, use node_ipv6_or/dir_preferred().
If there is no node, use fascist_firewall_prefer_ipv6_or/dirport().
Diffstat (limited to 'src/or/policies.h')
-rw-r--r-- | src/or/policies.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/policies.h b/src/or/policies.h index 8b330eb807..757d2f31df 100644 --- a/src/or/policies.h +++ b/src/or/policies.h @@ -38,7 +38,7 @@ int fascist_firewall_prefer_ipv6_dirport(const or_options_t *options); int fascist_firewall_allows_address_addr(const tor_addr_t *addr, uint16_t port, firewall_connection_t fw_connection, - int pref_only); + int pref_only, int pref_ipv6); int fascist_firewall_allows_rs(const routerstatus_t *rs, firewall_connection_t fw_connection, @@ -58,7 +58,7 @@ int fascist_firewall_choose_address_node(const node_t *node, int pref_only, tor_addr_port_t* ap); int fascist_firewall_choose_address_dir_server(const dir_server_t *ds, firewall_connection_t fw_connection, - int pref_only, tor_addr_port_t* ap); + int pref_only, tor_addr_port_t* ap); int dir_policy_permits_address(const tor_addr_t *addr); int socks_policy_permits_address(const tor_addr_t *addr); @@ -134,7 +134,7 @@ STATIC const tor_addr_port_t * fascist_firewall_choose_address( const tor_addr_port_t *b, int want_a, firewall_connection_t fw_connection, - int pref_only); + int pref_only, int pref_ipv6); #endif |