diff options
author | Roger Dingledine <arma@torproject.org> | 2006-10-09 22:26:21 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2006-10-09 22:26:21 +0000 |
commit | 552d828def9e1ec94b7b2c0dc3d21352abf65fcb (patch) | |
tree | 8a5e63907977c628ed02953cd93021ee6aa54123 /src/or/circuituse.c | |
parent | 655859f76b237d3156cb0a77f5e56a77ef28fa17 (diff) | |
download | tor-552d828def9e1ec94b7b2c0dc3d21352abf65fcb.tar.gz tor-552d828def9e1ec94b7b2c0dc3d21352abf65fcb.zip |
- Stop triggering asserts if the controller tries to extend hidden
service circuits.
(also found by mwenge)
svn:r8682
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r-- | src/or/circuituse.c | 13 |
1 files changed, 6 insertions, 7 deletions
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. */ } } |