[tor-commits] [tor/maint-0.4.1] circpad: some more logging changes.

[nickm at torproject.org]

commit a15ec8bf84db2dcadcc292b9672fbd6d35ffdf77
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Jun 11 14:28:38 2019 +0300

    circpad: some more logging changes.
    
    - Add an info log when receiving a STOP command.
    - Keep warning if we receive padding from a wrong hop.
---
 src/core/or/circuitpadding.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index ebad6518b..7521fd339 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -2821,6 +2821,8 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell)
     /* Free the machine corresponding to this machine type */
     if (free_circ_machineinfos_with_machine_num(circ,
                 negotiate->machine_type)) {
+      log_info(LD_CIRC, "Received STOP command for machine %u",
+               negotiate->machine_type);
       goto done;
     }
     log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
@@ -2871,7 +2873,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_PROTOCOL_WARN, LD_CIRC,
+    log_fn(LOG_WARN, LD_CIRC,
            "Padding negotiated cell from wrong hop!");
     return -1;
   }