[tor-commits] [tor/master] Use LD_BUG, not LOG_PROTOCOL_WARN, for bad-purpose cases.

nickm at torproject.org nickm at torproject.org
Fri Jul 7 15:19:28 UTC 2017


commit ec3e0469864ebb11fd7af3150e748f8082d57d13
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 11:14:47 2017 -0400

    Use LD_BUG, not LOG_PROTOCOL_WARN, for bad-purpose cases.
---
 src/or/hs_circuit.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c
index f2ea8f5..2f595d7 100644
--- a/src/or/hs_circuit.c
+++ b/src/or/hs_circuit.c
@@ -19,12 +19,13 @@
  * <b>circ_purpose</b> and ensure that it's properly set. Return true iff
  * circuit purpose is properly set, otherwise return false. */
 static int
-circuit_purpose_is_correct_for_rend(unsigned int circ_purpose, int is_service_side)
+circuit_purpose_is_correct_for_rend(unsigned int circ_purpose,
+                                    int is_service_side)
 {
   if (is_service_side) {
     if (circ_purpose != CIRCUIT_PURPOSE_S_CONNECT_REND) {
-      log_fn(LOG_PROTOCOL_WARN, LD_GENERAL,
-             "HS e2e circuit setup with wrong purpose(%d)", circ_purpose);
+      log_warn(LD_BUG,
+            "HS e2e circuit setup with wrong purpose (%d)", circ_purpose);
       return 0;
     }
   }
@@ -32,8 +33,8 @@ circuit_purpose_is_correct_for_rend(unsigned int circ_purpose, int is_service_si
   if (!is_service_side) {
     if (circ_purpose != CIRCUIT_PURPOSE_C_REND_READY &&
         circ_purpose != CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) {
-      log_fn(LOG_PROTOCOL_WARN, LD_GENERAL,
-             "Client e2e circuit setup with wrong purpose(%d)", circ_purpose);
+      log_warn(LD_BUG,
+            "Client e2e circuit setup with wrong purpose (%d)", circ_purpose);
       return 0;
     }
   }





More information about the tor-commits mailing list