summaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-04-26 18:52:16 +0000
committerRoger Dingledine <arma@torproject.org>2005-04-26 18:52:16 +0000
commit509405a5f7643f94933ae7feb0a2788a73abd801 (patch)
tree7732760a74a902c247f746ebc52ccb97e54dc329 /src/or/connection_edge.c
parent5e86e87124e643108c827366daac878e708d935d (diff)
downloadtor-509405a5f7643f94933ae7feb0a2788a73abd801.tar.gz
tor-509405a5f7643f94933ae7feb0a2788a73abd801.zip
clean up this TOR_FRAGILE business
svn:r4116
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 01c9d44e7a..a0fa1605dd 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -129,9 +129,7 @@ int connection_edge_process_inbuf(connection_t *conn, int package_partial) {
return 0;
}
log_fn(LOG_WARN,"Bug: Got unexpected state %d. Closing.",conn->state);
-#ifdef TOR_FRAGILE
- tor_assert(0);
-#endif
+ tor_fragile_assert();
connection_edge_end(conn, END_STREAM_REASON_INTERNAL, conn->cpath_layer);
connection_mark_for_close(conn);
return -1;
@@ -176,9 +174,7 @@ connection_edge_end(connection_t *conn, char reason, crypt_path_t *cpath_layer)
if (conn->has_sent_end) {
log_fn(LOG_WARN,"Harmless bug: Calling connection_edge_end (reason %d) on an already ended stream?", reason);
-#ifdef TOR_FRAGILE
- tor_assert(0);
-#endif
+ tor_fragile_assert();
return -1;
}
@@ -251,9 +247,7 @@ int connection_edge_finished_flushing(connection_t *conn) {
return 0;
default:
log_fn(LOG_WARN,"BUG: called in unexpected state %d.", conn->state);
-#ifdef TOR_FRAGILE
- tor_assert(0);
-#endif
+ tor_fragile_assert();
return -1;
}
return 0;