Commit fee95dab authored by asn's avatar asn Committed by Nick Mathewson

Turn some warnings into bugs and non-fatal asserts.

parent 91da032e
......@@ -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;
......
......@@ -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;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment