diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:54:33 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:54:33 -0500 |
| commit | d04f21bf394eb9e1781a89d9827476e13cc11086 (patch) | |
| tree | de78da1483e0421c73bc9efad042eccd627f572d /src/or/rendservice.c | |
| parent | 3b88b638264011158d27d5b451fd07d16f60e16b (diff) | |
| parent | db648fe886fd8ae4f42bb13d0219ca7fa690bdc1 (diff) | |
| download | tor-d04f21bf394eb9e1781a89d9827476e13cc11086.tar.gz tor-d04f21bf394eb9e1781a89d9827476e13cc11086.zip | |
Merge branch 'feature2553-v4-rebased'
Diffstat (limited to 'src/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 1d0773e1cd..a360d5ce58 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -952,7 +952,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, time_t *access_time; const or_options_t *options = get_options(); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(circuit->build_state->onehop_tunnel)); +#endif tor_assert(circuit->rend_data); base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1, @@ -1440,7 +1442,9 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) crypto_pk_env_t *intro_key; tor_assert(circuit->_base.purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(circuit->build_state->onehop_tunnel)); +#endif tor_assert(circuit->cpath); tor_assert(circuit->rend_data); @@ -1597,7 +1601,9 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit) tor_assert(circuit->_base.purpose == CIRCUIT_PURPOSE_S_CONNECT_REND); tor_assert(circuit->cpath); tor_assert(circuit->build_state); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(circuit->build_state->onehop_tunnel)); +#endif tor_assert(circuit->rend_data); hop = circuit->build_state->pending_final_cpath; tor_assert(hop); |