nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make some fascist_firewall_choose_address* functions static

Browse Source
This commit is contained in:
teor (Tim Wilson-Brown) 2016-02-20 20:09:07 +11:00
parent a4eddfff66
commit a4853f1bc1
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/policies.c
View File

@ -540,7 +540,7 @@ fascist_firewall_allows_address_addr(const tor_addr_t *addr, uint16_t port,
* If pref_only, return false if addr is not in the client's preferred address * If pref_only, return false if addr is not in the client's preferred address
* family. * family.
*/ */
int static int
fascist_firewall_allows_address_ap(const tor_addr_port_t *ap, fascist_firewall_allows_address_ap(const tor_addr_port_t *ap,
firewall_connection_t fw_connection, firewall_connection_t fw_connection,
int pref_only) int pref_only)
@ -556,7 +556,7 @@ fascist_firewall_allows_address_ap(const tor_addr_port_t *ap,
* fw_connection. * fw_connection.
* If pref_only, return false if addr is not in the client's preferred address * If pref_only, return false if addr is not in the client's preferred address
* family. */ * family. */
int static int
fascist_firewall_allows_address_ipv4h(uint32_t ipv4h_or_addr, fascist_firewall_allows_address_ipv4h(uint32_t ipv4h_or_addr,
uint16_t ipv4_or_port, uint16_t ipv4_or_port,
firewall_connection_t fw_connection, firewall_connection_t fw_connection,
@ -784,7 +784,7 @@ fascist_firewall_choose_address_impl(const tor_addr_port_t *a,
* choose one based on want_a and return it. * choose one based on want_a and return it.
* - Otherwise, return whichever is preferred. * - Otherwise, return whichever is preferred.
* Otherwise, return NULL. */ * Otherwise, return NULL. */
const tor_addr_port_t * STATIC const tor_addr_port_t *
fascist_firewall_choose_address(const tor_addr_port_t *a, fascist_firewall_choose_address(const tor_addr_port_t *a,
const tor_addr_port_t *b, const tor_addr_port_t *b,
int want_a, int want_a,

24
src/or/policies.h
View File

@ -35,16 +35,11 @@ int fascist_firewall_use_ipv6(const or_options_t *options);
int fascist_firewall_prefer_ipv6_orport(const or_options_t *options); int fascist_firewall_prefer_ipv6_orport(const or_options_t *options);
int fascist_firewall_prefer_ipv6_dirport(const or_options_t *options); 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, int fascist_firewall_allows_address_addr(const tor_addr_t *addr,
uint16_t port,
firewall_connection_t fw_connection, firewall_connection_t fw_connection,
int pref_only); int pref_only);
int fascist_firewall_allows_address_ap(const tor_addr_port_t *ap,
firewall_connection_t fw_connection,
int pref_only);
int fascist_firewall_allows_address_ipv4h(uint32_t ipv4h_or_addr,
uint16_t ipv4_or_port,
firewall_connection_t fw_connection,
int pref_only);
int fascist_firewall_allows_rs(const routerstatus_t *rs, int fascist_firewall_allows_rs(const routerstatus_t *rs,
firewall_connection_t fw_connection, firewall_connection_t fw_connection,
int pref_only); int pref_only);
@ -55,12 +50,6 @@ int fascist_firewall_allows_dir_server(const dir_server_t *ds,
firewall_connection_t fw_connection, firewall_connection_t fw_connection,
int pref_only); int pref_only);
const tor_addr_port_t * fascist_firewall_choose_address(
const tor_addr_port_t *a,
const tor_addr_port_t *b,
int want_a,
firewall_connection_t fw_connection,
int pref_only);
int fascist_firewall_choose_address_rs(const routerstatus_t *rs, int fascist_firewall_choose_address_rs(const routerstatus_t *rs,
firewall_connection_t fw_connection, firewall_connection_t fw_connection,
int pref_only, tor_addr_port_t* ap); int pref_only, tor_addr_port_t* ap);
@ -140,6 +129,13 @@ STATIC int fascist_firewall_allows_address(const tor_addr_t *addr,
uint16_t port, uint16_t port,
smartlist_t *firewall_policy, smartlist_t *firewall_policy,
int pref_only, int pref_ipv6); int pref_only, int pref_ipv6);
STATIC const tor_addr_port_t * fascist_firewall_choose_address(
const tor_addr_port_t *a,
const tor_addr_port_t *b,
int want_a,
firewall_connection_t fw_connection,
int pref_only);
#endif #endif
#endif #endif