hs-v2: Removal of service and relay support

This is unfortunately massive but both functionalities were extremely
intertwined and it would have required us to actually change the HSv2 code in
order to be able to split this into multiple commits.

After this commit, there are still artefacts of v2 in the code but there is no
more support for service, intro point and HSDir.

The v2 support for rendezvous circuit is still available since that code is
the same for the v3 and we will leave it in so if a client is able to
rendezvous on v2 then it can still transfer traffic. Once the entire network
has moved away from v2, we can remove v2 rendezvous point support.

Related to #40266

Signed-off-by: David Goulet <dgoulet@torproject.org>

1 files changed, 8 insertions, 39 deletions

diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
index 26c4711a5b..b00d24407a 100644
--- a/src/core/or/circuituse.c
+++ b/src/core/or/circuituse.c
@@ -58,8 +58,6 @@
 #include "feature/nodelist/routerlist.h"
 #include "feature/relay/routermode.h"
 #include "feature/relay/selftest.h"
-#include "feature/rend/rendcommon.h"
-#include "feature/rend/rendservice.h"
 #include "feature/stats/predict_ports.h"
 #include "lib/math/fp.h"
 #include "lib/time/tvdiff.h"
@@ -83,16 +81,6 @@ static int
 circuit_matches_with_rend_stream(const edge_connection_t *edge_conn,
                                  const origin_circuit_t *origin_circ)
 {
-  /* Check if this is a v2 rendezvous circ/stream */
-  if ((edge_conn->rend_data && !origin_circ->rend_data) ||
-      (!edge_conn->rend_data && origin_circ->rend_data) ||
-      (edge_conn->rend_data && origin_circ->rend_data &&
-       rend_cmp_service_ids(rend_data_get_address(edge_conn->rend_data),
-                            rend_data_get_address(origin_circ->rend_data)))) {
-    /* this circ is not for this conn */
-    return 0;
-  }
-
   /* Check if this is a v3 rendezvous circ/stream */
   if ((edge_conn->hs_ident && !origin_circ->hs_ident) ||
       (!edge_conn->hs_ident && origin_circ->hs_ident) ||
@@ -688,8 +676,7 @@ circuit_expire_building(void)
           /* c_rend_ready circs measure age since timestamp_dirty,
            * because that's set when they switch purposes
            */
-          if (TO_ORIGIN_CIRCUIT(victim)->rend_data ||
-              TO_ORIGIN_CIRCUIT(victim)->hs_ident ||
+          if (TO_ORIGIN_CIRCUIT(victim)->hs_ident ||
               victim->timestamp_dirty > cutoff.tv_sec)
             continue;
           break;
@@ -896,7 +883,7 @@ circuit_log_ancient_one_hop_circuits(int age)
       continue;
     /* Single Onion Services deliberately make long term one-hop intro
      * and rendezvous connections. Don't log the established ones. */
-    if (rend_service_allow_non_anonymous_connection(options) &&
+    if (hs_service_allow_non_anonymous_connection(options) &&
         (circ->purpose == CIRCUIT_PURPOSE_S_INTRO ||
          circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED))
       continue;
@@ -1141,7 +1128,7 @@ needs_exit_circuits(time_t now, int *needs_uptime, int *needs_capacity)
 STATIC int
 needs_hs_server_circuits(time_t now, int num_uptime_internal)
 {
-  if (!rend_num_services() && !hs_service_get_num_services()) {
+  if (!hs_service_get_num_services()) {
     /* No services, we don't need anything. */
     goto no_need;
   }
@@ -2013,14 +2000,6 @@ circuit_purpose_is_hs_vanguards(const uint8_t purpose)
   return (purpose == CIRCUIT_PURPOSE_HS_VANGUARDS);
 }
 
-/** Return true iff the given circuit is an HS v2 circuit. */
-bool
-circuit_is_hs_v2(const circuit_t *circ)
-{
-  return (CIRCUIT_IS_ORIGIN(circ) &&
-          (CONST_TO_ORIGIN_CIRCUIT(circ)->rend_data != NULL));
-}
-
 /** Return true iff the given circuit is an HS v3 circuit. */
 bool
 circuit_is_hs_v3(const circuit_t *circ)
@@ -2451,11 +2430,8 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn,
         connection_ap_mark_as_waiting_for_renddesc(conn);
         return 0;
       }
-      log_info(LD_REND,"Chose %s as intro point for '%s'.",
-               extend_info_describe(extend_info),
-               (edge_conn->rend_data) ?
-               safe_str_client(rend_data_get_address(edge_conn->rend_data)) :
-               "service");
+      log_info(LD_REND,"Chose %s as intro point for service",
+               extend_info_describe(extend_info));
     }
 
     /* If we have specified a particular exit node for our
@@ -2579,10 +2555,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn,
       rep_hist_note_used_internal(time(NULL), need_uptime, 1);
       if (circ) {
         const edge_connection_t *edge_conn = ENTRY_TO_EDGE_CONN(conn);
-        if (edge_conn->rend_data) {
-          /* write the service_id into circ */
-          circ->rend_data = rend_data_dup(edge_conn->rend_data);
-        } else if (edge_conn->hs_ident) {
+        if (edge_conn->hs_ident) {
           circ->hs_ident =
             hs_ident_circuit_new(&edge_conn->hs_ident->identity_pk);
         }
@@ -2829,13 +2802,9 @@ connection_ap_get_nonrend_circ_purpose(const entry_connection_t *conn)
   if (base_conn->linked_conn &&
       base_conn->linked_conn->type == CONN_TYPE_DIR) {
     /* Set a custom purpose for hsdir activity */
-    if (base_conn->linked_conn->purpose == DIR_PURPOSE_UPLOAD_RENDDESC_V2 ||
-       base_conn->linked_conn->purpose == DIR_PURPOSE_UPLOAD_HSDESC) {
+    if (base_conn->linked_conn->purpose == DIR_PURPOSE_UPLOAD_HSDESC) {
       return CIRCUIT_PURPOSE_S_HSDIR_POST;
-    } else if (base_conn->linked_conn->purpose
-                 == DIR_PURPOSE_FETCH_RENDDESC_V2 ||
-               base_conn->linked_conn->purpose
-                 == DIR_PURPOSE_FETCH_HSDESC) {
+    } else if (base_conn->linked_conn->purpose == DIR_PURPOSE_FETCH_HSDESC) {
       return CIRCUIT_PURPOSE_C_HSDIR_GET;
     }
   }