[tor-commits] [tor/release-0.4.2] dir: Remove connection_dir_is_anonymous() logging

[teor at torproject.org]

commit 985717675cf2c613ca88bae694695c5ee7db05d4
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Oct 24 11:23:31 2019 -0400

    dir: Remove connection_dir_is_anonymous() logging
    
    First, remove the HSDir mention which should not be in that generic function.
    Second, move them to debug() level since they are possible error case.
    
    Part of #31958
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/feature/dircommon/directory.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/feature/dircommon/directory.c b/src/feature/dircommon/directory.c
index 1ac35dd8b..8e5b41332 100644
--- a/src/feature/dircommon/directory.c
+++ b/src/feature/dircommon/directory.c
@@ -212,7 +212,8 @@ connection_dir_is_anonymous(const dir_connection_t *dir_conn)
    * be closed or marked for close. */
   if (linked_conn == NULL || linked_conn->magic != EDGE_CONNECTION_MAGIC ||
       conn->linked_conn_is_closed || conn->linked_conn->marked_for_close) {
-    log_info(LD_DIR, "Rejected HSDir request: not linked to edge");
+    log_debug(LD_DIR, "Directory connection is not anonymous: "
+                      "not linked to edge");
     return false;
   }
 
@@ -221,7 +222,8 @@ connection_dir_is_anonymous(const dir_connection_t *dir_conn)
 
   /* Can't be a circuit we initiated and without a circuit, no channel. */
   if (circ == NULL || CIRCUIT_IS_ORIGIN(circ)) {
-    log_info(LD_DIR, "Rejected HSDir request: not on OR circuit");
+    log_debug(LD_DIR, "Directory connection is not anonymous: "
+                      "not on OR circuit");
     return false;
   }
 
@@ -230,6 +232,8 @@ connection_dir_is_anonymous(const dir_connection_t *dir_conn)
    * not continue so return that it is not anonymous since we can not know for
    * sure if it is. */
   if (circ->marked_for_close) {
+    log_debug(LD_DIR, "Directory connection is not anonymous: "
+                      "circuit marked for close");
     return false;
   }
 
@@ -237,7 +241,8 @@ connection_dir_is_anonymous(const dir_connection_t *dir_conn)
    * BUG() because if the circuit is not mark for close, we ought to have a
    * p_chan else we have a code flow issue. */
   if (BUG(CONST_TO_OR_CIRCUIT(circ)->p_chan == NULL)) {
-    log_info(LD_DIR, "Rejected HSDir request: no p_chan");
+    log_debug(LD_DIR, "Directory connection is not anonymous: "
+                      "no p_chan on circuit");
     return false;
   }