summaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2017-07-06 13:50:16 +0300
committerNick Mathewson <nickm@torproject.org>2017-07-07 11:12:26 -0400
commitfee95dabcfe21a35e3f5a1ad4b455fe4be1f749a (patch)
treeee032a404708f3f85cf8fb9e197b6c91de5e31cc /src/or/connection_edge.c
parent91da032e9cc264d88802d0bfc072b0b4117c5f33 (diff)
downloadtor-fee95dabcfe21a35e3f5a1ad4b455fe4be1f749a.tar.gz
tor-fee95dabcfe21a35e3f5a1ad4b455fe4be1f749a.zip
Turn some warnings into bugs and non-fatal asserts.
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 0e18550a41..5e6041f652 100644
--- 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;