mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-14 07:03:44 +01:00
Rename router_should_skip_orport_reachability_check.
This was supposed to happen in #40012, but the command line was wrong. This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ router_should_skip_orport_reachability_check router_all_orports_seem_reachable
This commit is contained in:
parent
5c5fb0fcca
commit
f9de0affd3
@ -1055,7 +1055,7 @@ circuit_build_no_more_hops(origin_circuit_t *circ)
|
|||||||
control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED");
|
control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED");
|
||||||
clear_broken_connection_map(1);
|
clear_broken_connection_map(1);
|
||||||
if (server_mode(options) &&
|
if (server_mode(options) &&
|
||||||
!router_should_skip_orport_reachability_check(options)) {
|
!router_all_orports_seem_reachable(options)) {
|
||||||
inform_testing_reachability();
|
inform_testing_reachability();
|
||||||
router_do_reachability_checks(1, 1);
|
router_do_reachability_checks(1, 1);
|
||||||
}
|
}
|
||||||
|
@ -1642,7 +1642,7 @@ static void
|
|||||||
circuit_testing_opened(origin_circuit_t *circ)
|
circuit_testing_opened(origin_circuit_t *circ)
|
||||||
{
|
{
|
||||||
if (have_performed_bandwidth_test ||
|
if (have_performed_bandwidth_test ||
|
||||||
!router_should_skip_orport_reachability_check(get_options())) {
|
!router_all_orports_seem_reachable(get_options())) {
|
||||||
/* either we've already done everything we want with testing circuits,
|
/* either we've already done everything we want with testing circuits,
|
||||||
* or this testing circuit became open due to a fluke, e.g. we picked
|
* or this testing circuit became open due to a fluke, e.g. we picked
|
||||||
* a last hop where we already had the connection open due to an
|
* a last hop where we already had the connection open due to an
|
||||||
@ -1661,7 +1661,7 @@ circuit_testing_failed(origin_circuit_t *circ, int at_last_hop)
|
|||||||
{
|
{
|
||||||
const or_options_t *options = get_options();
|
const or_options_t *options = get_options();
|
||||||
if (server_mode(options) &&
|
if (server_mode(options) &&
|
||||||
router_should_skip_orport_reachability_check(options))
|
router_all_orports_seem_reachable(options))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
log_info(LD_GENERAL,
|
log_info(LD_GENERAL,
|
||||||
|
@ -1279,7 +1279,7 @@ getinfo_helper_events(control_connection_t *control_conn,
|
|||||||
? "1" : "0");
|
? "1" : "0");
|
||||||
} else if (!strcmp(question, "status/reachability-succeeded/or")) {
|
} else if (!strcmp(question, "status/reachability-succeeded/or")) {
|
||||||
*answer = tor_strdup(
|
*answer = tor_strdup(
|
||||||
router_should_skip_orport_reachability_check(options) ?
|
router_all_orports_seem_reachable(options) ?
|
||||||
"1" : "0");
|
"1" : "0");
|
||||||
} else if (!strcmp(question, "status/reachability-succeeded/dir")) {
|
} else if (!strcmp(question, "status/reachability-succeeded/dir")) {
|
||||||
*answer = tor_strdup(
|
*answer = tor_strdup(
|
||||||
@ -1288,7 +1288,7 @@ getinfo_helper_events(control_connection_t *control_conn,
|
|||||||
} else if (!strcmp(question, "status/reachability-succeeded")) {
|
} else if (!strcmp(question, "status/reachability-succeeded")) {
|
||||||
tor_asprintf(
|
tor_asprintf(
|
||||||
answer, "OR=%d DIR=%d",
|
answer, "OR=%d DIR=%d",
|
||||||
router_should_skip_orport_reachability_check(options) ? 1 : 0,
|
router_all_orports_seem_reachable(options) ? 1 : 0,
|
||||||
router_dirport_seems_reachable(options) ? 1 : 0);
|
router_dirport_seems_reachable(options) ? 1 : 0);
|
||||||
} else if (!strcmp(question, "status/bootstrap-phase")) {
|
} else if (!strcmp(question, "status/bootstrap-phase")) {
|
||||||
*answer = control_event_boot_last_msg();
|
*answer = control_event_boot_last_msg();
|
||||||
|
@ -1363,7 +1363,7 @@ decide_if_publishable_server(void)
|
|||||||
return 1;
|
return 1;
|
||||||
if (!router_get_advertised_or_port(options))
|
if (!router_get_advertised_or_port(options))
|
||||||
return 0;
|
return 0;
|
||||||
if (!router_should_skip_orport_reachability_check(options))
|
if (!router_all_orports_seem_reachable(options))
|
||||||
return 0;
|
return 0;
|
||||||
if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) {
|
if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) {
|
||||||
/* All set: there are no exits in the consensus (maybe this is a tiny
|
/* All set: there are no exits in the consensus (maybe this is a tiny
|
||||||
|
@ -408,7 +408,7 @@ ready_to_publish(const or_options_t *options)
|
|||||||
{
|
{
|
||||||
return options->PublishServerDescriptor_ != NO_DIRINFO &&
|
return options->PublishServerDescriptor_ != NO_DIRINFO &&
|
||||||
router_dirport_seems_reachable(options) &&
|
router_dirport_seems_reachable(options) &&
|
||||||
router_should_skip_orport_reachability_check(options);
|
router_all_orports_seem_reachable(options);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Annotate that we found our ORPort reachable with a given address
|
/** Annotate that we found our ORPort reachable with a given address
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
#ifdef HAVE_MODULE_RELAY
|
#ifdef HAVE_MODULE_RELAY
|
||||||
|
|
||||||
struct or_options_t;
|
struct or_options_t;
|
||||||
#define router_should_skip_orport_reachability_check(opts) \
|
#define router_all_orports_seem_reachable(opts) \
|
||||||
router_orport_seems_reachable((opts),0)
|
router_orport_seems_reachable((opts),0)
|
||||||
int router_orport_seems_reachable(
|
int router_orport_seems_reachable(
|
||||||
const struct or_options_t *options,
|
const struct or_options_t *options,
|
||||||
@ -34,7 +34,7 @@ void router_reset_reachability(void);
|
|||||||
|
|
||||||
#else /* !defined(HAVE_MODULE_RELAY) */
|
#else /* !defined(HAVE_MODULE_RELAY) */
|
||||||
|
|
||||||
#define router_should_skip_orport_reachability_check(opts) \
|
#define router_all_orports_seem_reachable(opts) \
|
||||||
((void)(opts), 0)
|
((void)(opts), 0)
|
||||||
#define router_orport_seems_reachable(opts, fam) \
|
#define router_orport_seems_reachable(opts, fam) \
|
||||||
((void)(opts), (void)(fam), 0)
|
((void)(opts), (void)(fam), 0)
|
||||||
|
@ -270,7 +270,7 @@ rep_hist_circbuilding_dormant(time_t now)
|
|||||||
|
|
||||||
/* see if we'll still need to build testing circuits */
|
/* see if we'll still need to build testing circuits */
|
||||||
if (server_mode(options) &&
|
if (server_mode(options) &&
|
||||||
(!router_should_skip_orport_reachability_check(options) ||
|
(!router_all_orports_seem_reachable(options) ||
|
||||||
!circuit_enough_testing_circs()))
|
!circuit_enough_testing_circs()))
|
||||||
return 0;
|
return 0;
|
||||||
if (!router_dirport_seems_reachable(options))
|
if (!router_dirport_seems_reachable(options))
|
||||||
|
Loading…
Reference in New Issue
Block a user