From 552d828def9e1ec94b7b2c0dc3d21352abf65fcb Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 9 Oct 2006 22:26:21 +0000 Subject: [PATCH] - Stop triggering asserts if the controller tries to extend hidden service circuits. (also found by mwenge) svn:r8682 --- ChangeLog | 2 ++ src/or/circuituse.c | 13 ++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 520ce08fed..464248488b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,8 @@ Changes in version 0.1.2.3-alpha - 2006-10-?? not requested. - When reporting verbose nicknames in entry_guards_getinfo(), avoid printing a duplicate "$" in the keys we send. + - Stop triggering asserts if the controller tries to extend hidden + service circuits. Changes in version 0.1.2.2-alpha - 2006-10-07 diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 4876926072..9e8b0c73e8 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -703,9 +703,9 @@ circuit_has_opened(origin_circuit_t *circ) case CIRCUIT_PURPOSE_TESTING: circuit_testing_opened(circ); break; - default: - log_err(LD_BUG,"unhandled purpose %d",circ->_base.purpose); - tor_assert(0); + /* default: + * This won't happen in normal operation, but might happen if the + * controller did it. Just let it slide. */ } } @@ -793,10 +793,9 @@ circuit_build_failed(origin_circuit_t *circ) failed_at_last_hop?"last":"non-last"); rend_service_relaunch_rendezvous(circ); break; - default: - /* Other cases are impossible, since this function is only called with - * unbuilt circuits. */ - tor_assert(0); + /* default: + * This won't happen in normal operation, but might happen if the + * controller did it. Just let it slide. */ } }