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

Rename ambiguous introduction point functions

Browse Source 
Task #15824
This commit is contained in:
John Brooks 2015-07-14 02:22:23 -04:00
parent b06759edfd
commit cdc5debfde
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/circuituse.c
View File

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

2
src/or/rendcommon.c
View File

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

7
src/or/rendservice.c
View File

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

7
src/or/rendservice.h
View File

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