[tor-commits] [tor/release-0.4.0] More LOG_PROTOCOL_WARN.

[teor@xxxxxxxxxxxxxx]

commit a3089662c0e20bbddd17e6187f9fd3a00b1fe0c4
Author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Date:   Wed Jun 5 12:33:39 2019 -0700

    More LOG_PROTOCOL_WARN.
    
    Make origin-side messages about padding negotiation failure into
    LOG_PROTOCOL_WARN.
    
    I'm not sure I like this either.. But the negotiation refusal case might
    happen naturally due to consensus drift, and is functionally no different than
    a corrupted cell.
---
 src/core/or/circuitpadding.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 63281d136..8346ea4ae 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -2433,7 +2433,7 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell)
   circpad_negotiate_t *negotiate;
 
   if (CIRCUIT_IS_ORIGIN(circ)) {
-    log_fn(LOG_WARN, LD_CIRC,
+    log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
            "Padding negotiate cell unsupported at origin.");
     return -1;
   }
@@ -2498,7 +2498,7 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t *cell,
 
   /* Verify this came from the expected hop */
   if (!circpad_padding_is_from_expected_hop(circ, layer_hint)) {
-    log_fn(LOG_WARN, LD_CIRC,
+    log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
            "Padding negotiated cell from wrong hop!");
     return -1;
   }
@@ -2524,7 +2524,7 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t *cell,
     // and be sad
     free_circ_machineinfos_with_machine_num(circ, negotiated->machine_type);
     TO_ORIGIN_CIRCUIT(circ)->padding_negotiation_failed = 1;
-    log_fn(LOG_INFO, LD_CIRC,
+    log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
            "Middle node did not accept our padding request.");
   }
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits