Commit f9de0aff authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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
parent 5c5fb0fc

src/core/or/circuitbuild.c

+1 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ circuit_build_no_more_hops(origin_circuit_t *circ) 
    control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED");

    clear_broken_connection_map(1);

    if (server_mode(options) &&

        !router_should_skip_orport_reachability_check(options)) {

        !router_all_orports_seem_reachable(options)) {

      inform_testing_reachability();

      router_do_reachability_checks(1, 1);

    }

src/core/or/circuituse.c

+2 −2
Original line number Diff line number Diff line
@@ -1642,7 +1642,7 @@ static void 
circuit_testing_opened(origin_circuit_t *circ)

{

  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,

     * 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
@@ -1661,7 +1661,7 @@ circuit_testing_failed(origin_circuit_t *circ, int at_last_hop) 
{

  const or_options_t *options = get_options();

  if (server_mode(options) &&

      router_should_skip_orport_reachability_check(options))

      router_all_orports_seem_reachable(options))

    return;



  log_info(LD_GENERAL,

src/feature/control/control_getinfo.c

+2 −2
Original line number Diff line number Diff line
@@ -1279,7 +1279,7 @@ getinfo_helper_events(control_connection_t *control_conn, 
                           ? "1" : "0");

    } else if (!strcmp(question, "status/reachability-succeeded/or")) {

      *answer = tor_strdup(

                    router_should_skip_orport_reachability_check(options) ?

                    router_all_orports_seem_reachable(options) ?

                    "1" : "0");

    } else if (!strcmp(question, "status/reachability-succeeded/dir")) {

      *answer = tor_strdup(
@@ -1288,7 +1288,7 @@ getinfo_helper_events(control_connection_t *control_conn, 
    } else if (!strcmp(question, "status/reachability-succeeded")) {

      tor_asprintf(

          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);

    } else if (!strcmp(question, "status/bootstrap-phase")) {

      *answer = control_event_boot_last_msg();

src/feature/relay/router.c

+1 −1
Original line number Diff line number Diff line
@@ -1363,7 +1363,7 @@ decide_if_publishable_server(void) 
    return 1;

  if (!router_get_advertised_or_port(options))

    return 0;

  if (!router_should_skip_orport_reachability_check(options))

  if (!router_all_orports_seem_reachable(options))

    return 0;

  if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) {

    /* All set: there are no exits in the consensus (maybe this is a tiny

src/feature/relay/selftest.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ ready_to_publish(const or_options_t *options) 
{

  return options->PublishServerDescriptor_ != NO_DIRINFO &&

    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