[tor-commits] [tor/master] conn: Use connection_ap_mark_as_waiting_for_renddesc()

[nickm at torproject.org]

commit 00b59d92817f34c60fe9bc1f8b72b6e81ae1c431
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Dec 4 14:09:15 2018 -0500

    conn: Use connection_ap_mark_as_waiting_for_renddesc()
    
    Use the helper function connection_ap_mark_as_waiting_for_renddesc()
    introduced in previous commit everywhere in the code where an AP connection
    state is transitionned to AP_CONN_STATE_RENDDESC_WAIT.
    
    Part of #28669
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/core/or/circuituse.c      | 3 +--
 src/feature/hs/hs_client.c    | 3 +--
 src/feature/rend/rendclient.c | 6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
index 088358a4d..7ea37fb3b 100644
--- a/src/core/or/circuituse.c
+++ b/src/core/or/circuituse.c
@@ -2377,8 +2377,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn,
         } else {
           hs_client_refetch_hsdesc(&edge_conn->hs_ident->identity_pk);
         }
-        connection_ap_mark_as_non_pending_circuit(conn);
-        ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_RENDDESC_WAIT;
+        connection_ap_mark_as_waiting_for_renddesc(conn);
         return 0;
       }
       log_info(LD_REND,"Chose %s as intro point for '%s'.",
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
index dfad216ab..43e5b80e5 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -142,8 +142,7 @@ flag_all_conn_wait_desc(const ed25519_public_key_t *service_identity_pk)
     if (edge_conn->hs_ident &&
         ed25519_pubkey_eq(&edge_conn->hs_ident->identity_pk,
                           service_identity_pk)) {
-      connection_ap_mark_as_non_pending_circuit(TO_ENTRY_CONN(conn));
-      conn->state = AP_CONN_STATE_RENDDESC_WAIT;
+      connection_ap_mark_as_waiting_for_renddesc(TO_ENTRY_CONN(conn));
     }
   } SMARTLIST_FOREACH_END(conn);
 
diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c
index 10b67ceda..6ecb3eb3c 100644
--- a/src/feature/rend/rendclient.c
+++ b/src/feature/rend/rendclient.c
@@ -150,8 +150,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
 
       while ((conn = connection_get_by_type_state_rendquery(CONN_TYPE_AP,
                        AP_CONN_STATE_CIRCUIT_WAIT, onion_address))) {
-        connection_ap_mark_as_non_pending_circuit(TO_ENTRY_CONN(conn));
-        conn->state = AP_CONN_STATE_RENDDESC_WAIT;
+        connection_ap_mark_as_waiting_for_renddesc(TO_ENTRY_CONN(conn));
       }
     }
 
@@ -864,8 +863,7 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro,
     while ((conn = connection_get_by_type_state_rendquery(CONN_TYPE_AP,
                                    AP_CONN_STATE_CIRCUIT_WAIT,
                                    onion_address))) {
-      connection_ap_mark_as_non_pending_circuit(TO_ENTRY_CONN(conn));
-      conn->state = AP_CONN_STATE_RENDDESC_WAIT;
+      connection_ap_mark_as_waiting_for_renddesc(TO_ENTRY_CONN(conn));
     }
 
     return 0;