Commit 4a8cf178 authored by David Goulet's avatar David Goulet 🤘 Committed by Nick Mathewson
Browse files

hs: Rename num_rend_services()



Renamed to rend_num_services() so it is consistent with the legacy naming.
Signed-off-by: David Goulet's avatarDavid Goulet <dgoulet@torproject.org>
parent a6b6227b
......@@ -1115,7 +1115,7 @@ needs_exit_circuits(time_t now, int *needs_uptime, int *needs_capacity)
STATIC int
needs_hs_server_circuits(int num_uptime_internal)
{
return (num_rend_services() &&
return (rend_num_services() &&
num_uptime_internal < SUFFICIENT_UPTIME_INTERNAL_HS_SERVERS &&
router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN);
}
......
......@@ -1864,7 +1864,7 @@ run_build_circuit_event(time_t now)
}
/* Run v2 check. */
if (num_rend_services() > 0) {
if (rend_num_services() > 0) {
rend_consider_services_intro_points(now);
}
......@@ -2074,7 +2074,7 @@ run_upload_descriptor_event(time_t now)
{
/* v2 services use the same function for descriptor creation and upload so
* we do everything here because the intro circuits were checked before. */
if (num_rend_services() > 0) {
if (rend_num_services() > 0) {
rend_consider_services_upload(now);
rend_consider_descriptor_republication();
}
......@@ -2605,7 +2605,7 @@ int
hs_service_load_all_keys(void)
{
/* Load v2 service keys if we have v2. */
if (num_rend_services() != 0) {
if (rend_num_services() != 0) {
if (rend_service_load_all_keys(NULL) < 0) {
goto err;
}
......
......@@ -148,7 +148,7 @@ rend_service_escaped_dir(const struct rend_service_t *s)
/** Return the number of rendezvous services we have configured. */
int
num_rend_services(void)
rend_num_services(void)
{
if (!rend_service_list)
return 0;
......
......@@ -135,7 +135,7 @@ STATIC void rend_service_prune_list_impl_(void);
#endif /* RENDSERVICE_PRIVATE */
int num_rend_services(void);
int rend_num_services(void);
int rend_config_service(const config_line_t *line_,
const or_options_t *options,
hs_service_config_t *config);
......
......@@ -453,7 +453,7 @@ test_staging_service_v3(void *arg)
/* Ok, we have a service in our map! Registration went well. */
tt_int_op(get_hs_service_staging_list_size(), OP_EQ, 1);
/* Make sure we don't have a magic v2 service out of this. */
tt_int_op(num_rend_services(), OP_EQ, 0);
tt_int_op(rend_num_services(), OP_EQ, 0);
done:
hs_free_all();
......
......@@ -279,7 +279,7 @@ test_load_keys(void *arg)
tt_int_op(ret, OP_EQ, 0);
/* This one should now be registered into the v2 list. */
tt_int_op(get_hs_service_staging_list_size(), OP_EQ, 0);
tt_int_op(num_rend_services(), OP_EQ, 1);
tt_int_op(rend_num_services(), OP_EQ, 1);
/* v3 service. */
tor_asprintf(&conf, conf_fmt, hsdir_v3, HS_VERSION_THREE);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment