Rename ambiguous introduction point functions

Task #15824

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 572a4f3ed83d8b58a9828e6ed84ebe88634b2aba..05e67361b8098424bdf6f20f8a6b55ec4af8fbf7 100644 (file)
--- 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 411a87c00428a06f02ebda120d20bef2605cd29b..22599e9830bb42f24e0654ac4e7de480081ba233 100644 (file)
--- 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 f4fb860078a5f60433bfc7712e3ec6778478f890..6c5ca49528273e337661f892be1b1dea0c43bcfb 100644 (file)
--- 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 35a0bb25e67cb125f5f63af2665cc9f7807fb2dd..37d9da4cb55c4392dcc0012a95cafb5fc92f1e9a 100644 (file)
--- 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);