summaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2017-08-03 15:47:06 +0300
committerNick Mathewson <nickm@torproject.org>2017-08-08 20:29:34 -0400
commit7c507a1f7f58adb48be887cd26686190c3b22cfd (patch)
treeeac4b2d44a35f6e4065c5921c609f2669f924be4 /src/or/connection_edge.c
parente42c55626abf7447a154f5271e3bc35743340a21 (diff)
downloadtor-7c507a1f7f58adb48be887cd26686190c3b22cfd.tar.gz
tor-7c507a1f7f58adb48be887cd26686190c3b22cfd.zip
Relax assertions: turn them to BUGs and non-fatal asserts.
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 41e5f88ab8..9f0cc061e1 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -3098,10 +3098,12 @@ handle_hs_exit_conn(circuit_t *circ, edge_connection_t *conn)
/* Setup the identifier to be the one for the circuit service. */
conn->hs_ident =
hs_ident_edge_conn_new(&origin_circ->hs_ident->identity_pk);
+ tor_assert(connection_edge_is_rendezvous_stream(conn));
ret = hs_service_set_conn_addr_port(origin_circ, conn);
} else {
/* We should never get here if the circuit's purpose is rendezvous. */
- tor_assert(0);
+ tor_assert_nonfatal_unreached();
+ return -1;
}
if (ret < 0) {
log_info(LD_REND, "Didn't find rendezvous service (addr%s, port %d)",