commit cdc5debfde33d196be84863818d7dbaceab2a829 Author: John Brooks john.brooks@dereferenced.net Date: Tue Jul 14 02:22:23 2015 -0400

Rename ambiguous introduction point functions

Task #15824 --- src/or/circuituse.c | 2 +- src/or/rendcommon.c | 2 +- src/or/rendservice.c | 7 ++++--- src/or/rendservice.h | 7 ++++--- 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 572a4f3..05e6736 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1128,7 +1128,7 @@ circuit_build_needed_circs(time_t now) /* make sure any hidden services have enough intro points * HS intro point streams only require an internal circuit */ if (router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN) - rend_services_introduce(); + rend_consider_services_intro_points();

circuit_expire_old_circs_as_needed(now);

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 411a87c..22599e9 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -787,7 +787,7 @@ rend_process_relay_cell(circuit_t *circ, const crypt_path_t *layer_hint, break; case RELAY_COMMAND_INTRODUCE2: if (origin_circ) - r = rend_service_introduce(origin_circ,payload,length); + r = rend_service_receive_introduction(origin_circ,payload,length); break; case RELAY_COMMAND_INTRODUCE_ACK: if (origin_circ) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index f4fb860..6c5ca49 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1437,8 +1437,9 @@ rend_check_authorization(rend_service_t *service, * rendezvous point. */ int -rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, - size_t request_len) +rend_service_receive_introduction(origin_circuit_t *circuit, + const uint8_t *request, + size_t request_len) { /* Global status stuff */ int status = 0, result; @@ -3523,7 +3524,7 @@ rend_service_desc_has_uploaded(const rend_data_t *rend_data) * This is called once a second by the main loop. */ void -rend_services_introduce(void) +rend_consider_services_intro_points(void) { int i; time_t now; diff --git a/src/or/rendservice.h b/src/or/rendservice.h index 35a0bb2..37d9da4 100644 --- a/src/or/rendservice.h +++ b/src/or/rendservice.h @@ -70,7 +70,7 @@ int rend_config_services(const or_options_t *options, int validate_only); int rend_service_load_all_keys(void); void rend_services_add_filenames_to_lists(smartlist_t *open_lst, smartlist_t *stat_lst); -void rend_services_introduce(void); +void rend_consider_services_intro_points(void); void rend_consider_services_upload(time_t now); void rend_hsdir_routers_changed(void); void rend_consider_descriptor_republication(void); @@ -80,8 +80,9 @@ int rend_service_intro_established(origin_circuit_t *circuit, const uint8_t *request, size_t request_len); void rend_service_rendezvous_has_opened(origin_circuit_t *circuit); -int rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, - size_t request_len); +int rend_service_receive_introduction(origin_circuit_t *circuit, + const uint8_t *request, + size_t request_len); int rend_service_decrypt_intro(rend_intro_cell_t *request, crypto_pk_t *key, char **err_msg_out);