tor

commit fee95dabcfe21a35e3f5a1ad4b455fe4be1f749a
parent 91da032e9cc264d88802d0bfc072b0b4117c5f33
Author: George Kadianakis <desnacked@riseup.net>
Date:   Thu,  6 Jul 2017 13:50:16 +0300

Turn some warnings into bugs and non-fatal asserts.

Diffstat:
M
src/or/connection_edge.c
 | 
6
++----
M
src/or/hs_circuit.c
 | 
8
++++----

2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
@@ -3566,10 +3566,8 @@ int
 connection_edge_is_rendezvous_stream(const edge_connection_t *conn)
 {
   tor_assert(conn);
-
-  if (BUG(conn->rend_data && conn->hs_ident)) {
-    log_warn(LD_BUG, "Connection has both rend_data and hs_ident...");
-  }
+  /* It should not be possible to set both of these structs */
+  tor_assert_nonfatal(!(conn->rend_data && conn->hs_ident));
 
   if (conn->rend_data || conn->hs_ident) {
     return 1;
diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c
@@ -23,8 +23,8 @@ rend_circuit_validate_purpose(unsigned int circ_purpose, int is_service_side)
 {
   if (is_service_side) {
     if (circ_purpose != CIRCUIT_PURPOSE_S_CONNECT_REND) {
-      log_warn(LD_GENERAL, "HS e2e circuit setup with wrong purpose(%d)",
-               circ_purpose);
+      log_fn(LOG_PROTOCOL_WARN, LD_GENERAL,
+             "HS e2e circuit setup with wrong purpose(%d)", circ_purpose);
       return -1;
     }
   }
@@ -32,8 +32,8 @@ rend_circuit_validate_purpose(unsigned int circ_purpose, int is_service_side)
   if (!is_service_side) {
     if (circ_purpose != CIRCUIT_PURPOSE_C_REND_READY &&
         circ_purpose != CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) {
-      log_warn(LD_GENERAL, "Client e2e circuit setup with wrong purpose(%d)",
-               circ_purpose);
+      log_fn(LOG_PROTOCOL_WARN, LD_GENERAL,
+             "Client e2e circuit setup with wrong purpose(%d)", circ_purpose);
       return -1;
     }
   }