nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-11 05:03:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace several C identifiers.

Browse Source 
This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \
        client_or_conn_should_skip_reachable_address_check router_or_conn_should_skip_reachable_address_check \
        client_dir_conn_should_skip_reachable_address_check router_dir_conn_should_skip_reachable_address_check
This commit is contained in:
teor 2020-05-07 20:17:57 +10:00
parent 74902c8aca
commit e1eecac888
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/feature/nodelist/node_select.c
View File

@ -321,10 +321,10 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags,
overloaded_direct = smartlist_new(); overloaded_direct = smartlist_new();
overloaded_tunnel = smartlist_new(); overloaded_tunnel = smartlist_new();
const int skip_or_fw = client_or_conn_should_skip_reachable_address_check( const int skip_or_fw = router_or_conn_should_skip_reachable_address_check(
options, options,
try_ip_pref); try_ip_pref);
const int skip_dir_fw = client_dir_conn_should_skip_reachable_address_check( const int skip_dir_fw = router_dir_conn_should_skip_reachable_address_check(
options, options,
try_ip_pref); try_ip_pref);
const int must_have_or = dirclient_must_use_begindir(options); const int must_have_or = dirclient_must_use_begindir(options);
@ -1124,10 +1124,10 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist,
overloaded_direct = smartlist_new(); overloaded_direct = smartlist_new();
overloaded_tunnel = smartlist_new(); overloaded_tunnel = smartlist_new();
const int skip_or_fw = client_or_conn_should_skip_reachable_address_check( const int skip_or_fw = router_or_conn_should_skip_reachable_address_check(
options, options,
try_ip_pref); try_ip_pref);
const int skip_dir_fw = client_dir_conn_should_skip_reachable_address_check( const int skip_dir_fw = router_dir_conn_should_skip_reachable_address_check(
options, options,
try_ip_pref); try_ip_pref);
const int must_have_or = dirclient_must_use_begindir(options); const int must_have_or = dirclient_must_use_begindir(options);

6
src/feature/nodelist/routerlist.c
View File

@ -476,7 +476,7 @@ router_reload_router_list(void)
* Finally, return true if ReachableAddresses is set. * Finally, return true if ReachableAddresses is set.
*/ */
int int
client_or_conn_should_skip_reachable_address_check( router_or_conn_should_skip_reachable_address_check(
const or_options_t *options, const or_options_t *options,
int try_ip_pref) int try_ip_pref)
{ {
@ -492,7 +492,7 @@ client_or_conn_should_skip_reachable_address_check(
* This function is obsolete, because clients only use ORPorts. * This function is obsolete, because clients only use ORPorts.
*/ */
int int
client_dir_conn_should_skip_reachable_address_check( router_dir_conn_should_skip_reachable_address_check(
const or_options_t *options, const or_options_t *options,
int try_ip_pref) int try_ip_pref)
{ {
@ -520,7 +520,7 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, int need_uptime,
int need_desc, int pref_addr, int need_desc, int pref_addr,
int direct_conn) int direct_conn)
{ {
const int check_reach = !client_or_conn_should_skip_reachable_address_check( const int check_reach = !router_or_conn_should_skip_reachable_address_check(
get_options(), get_options(),
pref_addr); pref_addr);
/* XXXX MOVE */ /* XXXX MOVE */

4
src/feature/nodelist/routerlist.h
View File

@ -50,10 +50,10 @@ typedef enum was_router_added_t {
int router_reload_router_list(void); int router_reload_router_list(void);
int client_or_conn_should_skip_reachable_address_check( int router_or_conn_should_skip_reachable_address_check(
const or_options_t *options, const or_options_t *options,
int try_ip_pref); int try_ip_pref);
int client_dir_conn_should_skip_reachable_address_check( int router_dir_conn_should_skip_reachable_address_check(
const or_options_t *options, const or_options_t *options,
int try_ip_pref); int try_ip_pref);
void router_reset_status_download_failures(void); void router_reset_status_download_failures(void);

2
src/feature/relay/selftest.c
View File

@ -154,7 +154,7 @@ extend_info_from_router(const routerinfo_t *r, int family)
/* Relays always assume that the first hop is reachable. They ignore /* Relays always assume that the first hop is reachable. They ignore
* ReachableAddresses. */ * ReachableAddresses. */
tor_assert_nonfatal(client_or_conn_should_skip_reachable_address_check( tor_assert_nonfatal(router_or_conn_should_skip_reachable_address_check(
get_options(), 0)); get_options(), 0));
const ed25519_public_key_t *ed_id_key; const ed25519_public_key_t *ed_id_key;