Added relay prefix to new metrics functions

diff --git a/src/feature/hs/hs_intropoint.c b/src/feature/hs/hs_intropoint.c
index 3dcad309e7a630382c931e33143c6abad9398b80..02b5b4866b6cb0599d5a44aaf37c99428589eb29 100644 (file)
--- a/src/feature/hs/hs_intropoint.c
+++ b/src/feature/hs/hs_intropoint.c
@@ -420,7 +420,7 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request,
 
   /* Check that the circuit is in shape to become an intro point */
   if (!hs_intro_circuit_is_suitable_for_establish_intro(circ)) {
-    increment_est_intro_action(EST_INTRO_UNSUITABLE_CIRCUIT);
+    relay_increment_est_intro_action(EST_INTRO_UNSUITABLE_CIRCUIT);
     goto err;
   }
 
@@ -428,7 +428,7 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request,
   ssize_t parsing_result = trn_cell_establish_intro_parse(&parsed_cell,
                                                          request, request_len);
   if (parsing_result < 0) {
-    increment_est_intro_action(EST_INTRO_MALFORMED);
+    relay_increment_est_intro_action(EST_INTRO_MALFORMED);
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
            "Rejecting %s ESTABLISH_INTRO cell.",
            parsing_result == -1 ? "invalid" : "truncated");
@@ -439,7 +439,7 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request,
                                         (uint8_t *) circ->rend_circ_nonce,
                                         sizeof(circ->rend_circ_nonce));
   if (cell_ok < 0) {
-    increment_est_intro_action(EST_INTRO_MALFORMED);
+    relay_increment_est_intro_action(EST_INTRO_MALFORMED);
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
            "Failed to verify ESTABLISH_INTRO cell.");
     goto err;
@@ -448,11 +448,11 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request,
   /* This cell is legit. Take the appropriate actions. */
   cell_ok = handle_verified_establish_intro_cell(circ, parsed_cell);
   if (cell_ok < 0) {
-    increment_est_intro_action(EST_INTRO_CIRCUIT_DEAD);
+    relay_increment_est_intro_action(EST_INTRO_CIRCUIT_DEAD);
     goto err;
   }
 
-  increment_est_intro_action(EST_INTRO_SUCCESS);
+  relay_increment_est_intro_action(EST_INTRO_SUCCESS);
   /* We are done! */
   retval = 0;
   goto done;
@@ -511,7 +511,7 @@ hs_intro_received_establish_intro(or_circuit_t *circ, const uint8_t *request,
   tor_assert(request);
 
   if (request_len == 0) {
-    increment_est_intro_action(EST_INTRO_MALFORMED);
+    relay_increment_est_intro_action(EST_INTRO_MALFORMED);
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Empty ESTABLISH_INTRO cell.");
     goto err;
   }
@@ -524,12 +524,12 @@ hs_intro_received_establish_intro(or_circuit_t *circ, const uint8_t *request,
     case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_LEGACY1:
       /* Likely version 2 onion service which is now obsolete. Avoid a
        * protocol warning considering they still exists on the network. */
-    increment_est_intro_action(EST_INTRO_MALFORMED);
+    relay_increment_est_intro_action(EST_INTRO_MALFORMED);
       goto err;
     case TRUNNEL_HS_INTRO_AUTH_KEY_TYPE_ED25519:
       return handle_establish_intro(circ, request, request_len);
     default:
-      increment_est_intro_action(EST_INTRO_MALFORMED);
+      relay_increment_est_intro_action(EST_INTRO_MALFORMED);
       log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
              "Unrecognized AUTH_KEY_TYPE %u.", first_byte);
       goto err;
@@ -653,7 +653,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request,
   ssize_t cell_size = trn_cell_introduce1_parse(&parsed_cell, request,
                                                request_len);
   if (cell_size < 0) {
-    increment_intro1_action(INTRO1_MALFORMED);
+    relay_increment_intro1_action(INTRO1_MALFORMED);
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
            "Rejecting %s INTRODUCE1 cell. Responding with NACK.",
            cell_size == -1 ? "invalid" : "truncated");
@@ -664,7 +664,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request,
 
   /* Once parsed validate the cell format. */
   if (validate_introduce1_parsed_cell(parsed_cell) < 0) {
-    increment_intro1_action(INTRO1_MALFORMED);
+    relay_increment_intro1_action(INTRO1_MALFORMED);
     /* Inform client that the INTRODUCE1 has bad format. */
     status = TRUNNEL_HS_INTRO_ACK_STATUS_BAD_FORMAT;
     goto send_ack;
@@ -676,7 +676,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request,
     get_auth_key_from_cell(&auth_key, RELAY_COMMAND_INTRODUCE1, parsed_cell);
     service_circ = hs_circuitmap_get_intro_circ_v3_relay_side(&auth_key);
     if (service_circ == NULL) {
-      increment_intro1_action(INTRO1_UNKNOWN_SERVICE);
+      relay_increment_intro1_action(INTRO1_UNKNOWN_SERVICE);
       char b64_key[ED25519_BASE64_LEN + 1];
       ed25519_public_to_base64(b64_key, &auth_key);
       log_info(LD_REND, "No intro circuit found for INTRODUCE1 cell "
@@ -692,7 +692,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request,
   /* Before sending, lets make sure this cell can be sent on the service
    * circuit asking the DoS defenses. */
   if (!hs_dos_can_send_intro2(service_circ)) {
-    increment_intro1_action(INTRO1_RATE_LIMITED);
+    relay_increment_intro1_action(INTRO1_RATE_LIMITED);
     char *msg;
     static ratelim_t rlimit = RATELIM_INIT(5 * 60);
     if ((msg = rate_limit_log(&rlimit, approx_time()))) {
@@ -709,7 +709,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request,
   if (relay_send_command_from_edge(CONTROL_CELL_ID, TO_CIRCUIT(service_circ),
                                    RELAY_COMMAND_INTRODUCE2,
                                    (char *) request, request_len, NULL)) {
-    increment_intro1_action(INTRO1_CIRCUIT_DEAD);
+    relay_increment_intro1_action(INTRO1_CIRCUIT_DEAD);
     log_warn(LD_PROTOCOL, "Unable to send INTRODUCE2 cell to the service.");
     /* Inform the client that we can't relay the cell. Use the unknown ID
      * status code since it means that we do not know the service. */
@@ -717,7 +717,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request,
     goto send_ack;
   }
 
-  increment_intro1_action(INTRO1_SUCCESS);
+  relay_increment_intro1_action(INTRO1_SUCCESS);
   /* Success! Send an INTRODUCE_ACK success status onto the client circuit. */
   status = TRUNNEL_HS_INTRO_ACK_STATUS_SUCCESS;
   ret = 0;
@@ -748,7 +748,7 @@ circuit_is_suitable_for_introduce1(const or_circuit_t *circ)
   }
 
   if (circ->already_received_introduce1) {
-    increment_intro1_action(INTRO1_CIRCUIT_REUSED);
+    relay_increment_intro1_action(INTRO1_CIRCUIT_REUSED);
     log_fn(LOG_PROTOCOL_WARN, LD_REND,
            "Blocking multiple introductions on the same circuit. "
            "Someone might be trying to attack a hidden service through "
@@ -758,7 +758,7 @@ circuit_is_suitable_for_introduce1(const or_circuit_t *circ)
 
   /* Disallow single hop client circuit. */
   if (circ->p_chan && channel_is_client(circ->p_chan)) {
-    increment_intro1_action(INTRO1_SINGLE_HOP);
+    relay_increment_intro1_action(INTRO1_SINGLE_HOP);
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
            "Single hop client was rejected while trying to introduce. "
            "Closing circuit.");
@@ -780,7 +780,7 @@ hs_intro_received_introduce1(or_circuit_t *circ, const uint8_t *request,
 
   /* A cell that can't hold a DIGEST_LEN is invalid. */
   if (request_len < DIGEST_LEN) {
-    increment_intro1_action(INTRO1_MALFORMED);
+    relay_increment_intro1_action(INTRO1_MALFORMED);
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Invalid INTRODUCE1 cell length.");
     goto err;
   }

diff --git a/src/feature/relay/relay_metrics.c b/src/feature/relay/relay_metrics.c
index 95367d82cdd655ce0f53862c77d4e6263d99abb5..8f3b82bd96c4326c00aa64739f3fb66015da7035 100644 (file)
--- a/src/feature/relay/relay_metrics.c
+++ b/src/feature/relay/relay_metrics.c
@@ -1056,7 +1056,7 @@ fill_signing_cert_expiry(void)
 static uint64_t est_intro_actions[EST_INTRO_ACTION_COUNT] = {0};
 
 void
-increment_est_intro_action(est_intro_action_t action)
+relay_increment_est_intro_action(est_intro_action_t action)
 {
   est_intro_actions[action]++;
 }
@@ -1092,7 +1092,7 @@ fill_est_intro_cells(void)
 static uint64_t est_rend_actions[EST_REND_ACTION_COUNT] = {0};
 
 void
-increment_est_rend_action(est_rend_action_t action)
+relay_increment_est_rend_action(est_rend_action_t action)
 {
   est_rend_actions[action]++;
 }
@@ -1129,7 +1129,7 @@ fill_est_rend_cells(void)
 static uint64_t intro1_actions[INTRO1_ACTION_COUNT] = {0};
 
 void
-increment_intro1_action(intro1_action_t action)
+relay_increment_intro1_action(intro1_action_t action)
 {
   intro1_actions[action]++;
 }
@@ -1167,7 +1167,7 @@ fill_intro1_cells(void)
 static uint64_t rend1_actions[REND1_ACTION_COUNT] = {0};
 
 void
-increment_rend1_action(rend1_action_t action)
+relay_increment_rend1_action(rend1_action_t action)
 {
   rend1_actions[action]++;
 }

diff --git a/src/feature/relay/relay_metrics.h b/src/feature/relay/relay_metrics.h
index 523570cadde9e26a35d77bde85a0abd8a73ae440..cf9dddf955e7fc7ae73945e2fa6527c8be3b0033 100644 (file)
--- a/src/feature/relay/relay_metrics.h
+++ b/src/feature/relay/relay_metrics.h
@@ -89,7 +89,7 @@ typedef enum {
   EST_INTRO_ACTION_COUNT
 } est_intro_action_t;
 
-void increment_est_intro_action(est_intro_action_t);
+void relay_increment_est_intro_action(est_intro_action_t);
 
 typedef enum {
   EST_REND_SUCCESS,
@@ -102,7 +102,7 @@ typedef enum {
   EST_REND_ACTION_COUNT
 } est_rend_action_t;
 
-void increment_est_rend_action(est_rend_action_t);
+void relay_increment_est_rend_action(est_rend_action_t);
 
 typedef enum {
   INTRO1_SUCCESS,
@@ -116,7 +116,7 @@ typedef enum {
   INTRO1_ACTION_COUNT
 } intro1_action_t;
 
-void increment_intro1_action(intro1_action_t);
+void relay_increment_intro1_action(intro1_action_t);
 
 typedef enum {
   REND1_SUCCESS,
@@ -128,6 +128,6 @@ typedef enum {
   REND1_ACTION_COUNT
 } rend1_action_t;
 
-void increment_rend1_action(rend1_action_t);
+void relay_increment_rend1_action(rend1_action_t);
 
 #endif /* !defined(TOR_FEATURE_RELAY_RELAY_METRICS_H) */

diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c
index e95087bd6f5fbaa41a35b063d55cddd856d153a2..dee91629ecafcb5fbf8945e15d4522376a346dff 100644 (file)
--- a/src/feature/rend/rendmid.c
+++ b/src/feature/rend/rendmid.c
@@ -37,7 +37,7 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request,
            (unsigned)circ->p_circ_id);
 
   if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {
-    increment_est_rend_action(EST_REND_UNSUITABLE_CIRCUIT);
+    relay_increment_est_rend_action(EST_REND_UNSUITABLE_CIRCUIT);
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
            "Tried to establish rendezvous on non-OR circuit with purpose %s",
            circuit_purpose_to_string(circ->base_.purpose));
@@ -48,7 +48,7 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request,
    * attempt to establish rendezvous points directly to us. */
   if (channel_is_client(circ->p_chan) &&
       dos_should_refuse_single_hop_client()) {
-    increment_est_rend_action(EST_REND_SINGLE_HOP);
+    relay_increment_est_rend_action(EST_REND_SINGLE_HOP);
     /* Note it down for the heartbeat log purposes. */
     dos_note_refuse_single_hop_client();
     /* Silent drop so the client has to time out before moving on. */
@@ -56,21 +56,21 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request,
   }
 
   if (circ->base_.n_chan) {
-    increment_est_rend_action(EST_REND_UNSUITABLE_CIRCUIT);
+    relay_increment_est_rend_action(EST_REND_UNSUITABLE_CIRCUIT);
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
              "Tried to establish rendezvous on non-edge circuit");
     goto err;
   }
 
   if (request_len != REND_COOKIE_LEN) {
-    increment_est_rend_action(EST_REND_MALFORMED);
+    relay_increment_est_rend_action(EST_REND_MALFORMED);
     log_fn(LOG_PROTOCOL_WARN,
            LD_PROTOCOL, "Invalid length on ESTABLISH_RENDEZVOUS.");
     goto err;
   }
 
   if (hs_circuitmap_get_rend_circ_relay_side(request)) {
-    increment_est_rend_action(EST_REND_DUPLICATE_COOKIE);
+    relay_increment_est_rend_action(EST_REND_DUPLICATE_COOKIE);
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
            "Duplicate rendezvous cookie in ESTABLISH_RENDEZVOUS.");
     goto err;
@@ -80,13 +80,13 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request,
   if (relay_send_command_from_edge(0,TO_CIRCUIT(circ),
                                    RELAY_COMMAND_RENDEZVOUS_ESTABLISHED,
                                    "", 0, NULL)<0) {
-    increment_est_rend_action(EST_REND_CIRCUIT_DEAD);
+    relay_increment_est_rend_action(EST_REND_CIRCUIT_DEAD);
     log_warn(LD_PROTOCOL, "Couldn't send RENDEZVOUS_ESTABLISHED cell.");
     /* Stop right now, the circuit has been closed. */
     return -1;
   }
 
-  increment_est_rend_action(EST_REND_SUCCESS);
+  relay_increment_est_rend_action(EST_REND_SUCCESS);
   circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_REND_POINT_WAITING);
   hs_circuitmap_register_rend_circ_relay_side(circ, request);
 
@@ -116,7 +116,7 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
   int reason = END_CIRC_REASON_INTERNAL;
 
   if (circ->base_.purpose != CIRCUIT_PURPOSE_OR || circ->base_.n_chan) {
-    increment_rend1_action(REND1_UNSUITABLE_CIRCUIT);
+    relay_increment_rend1_action(REND1_UNSUITABLE_CIRCUIT);
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
            "Tried to complete rendezvous on non-OR or non-edge circuit %u.",
            (unsigned)circ->p_circ_id);
@@ -125,7 +125,7 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
   }
 
   if (request_len < REND_COOKIE_LEN) {
-    increment_rend1_action(REND1_MALFORMED);
+    relay_increment_rend1_action(REND1_MALFORMED);
     log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
          "Rejecting RENDEZVOUS1 cell with bad length (%d) on circuit %u.",
          (int)request_len, (unsigned)circ->p_circ_id);
@@ -145,7 +145,7 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
      * client gives up on a rendezvous circuit after sending INTRODUCE1, but
      * before the onion service sends the RENDEZVOUS1 cell.
      */
-    increment_rend1_action(REND1_UNKNOWN_COOKIE);
+    relay_increment_rend1_action(REND1_UNKNOWN_COOKIE);
     log_fn(LOG_DEBUG, LD_PROTOCOL,
          "Rejecting RENDEZVOUS1 cell with unrecognized rendezvous cookie %s.",
          hexid);
@@ -166,7 +166,7 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
                                    RELAY_COMMAND_RENDEZVOUS2,
                                    (char*)(request+REND_COOKIE_LEN),
                                    request_len-REND_COOKIE_LEN, NULL)) {
-    increment_rend1_action(REND1_CIRCUIT_DEAD);
+    relay_increment_rend1_action(REND1_CIRCUIT_DEAD);
     log_warn(LD_GENERAL,
              "Unable to send RENDEZVOUS2 cell to client on circuit %u.",
              (unsigned)rend_circ->p_circ_id);
@@ -174,7 +174,7 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
     return -1;
   }
 
-  increment_rend1_action(REND1_SUCCESS);
+  relay_increment_rend1_action(REND1_SUCCESS);
   /* Join the circuits. */
   log_info(LD_REND,
            "Completing rendezvous: circuit %u joins circuit %u (cookie %s)",