diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-15 11:33:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-15 11:33:40 -0400 |
| commit | a857f61e278aa5e5980722f9d458424b8790e9b1 (patch) | |
| tree | dcbc2c65fa2b11990ddfbee8a8eee2d32043cea9 /src/or/rendclient.c | |
| parent | 875a551409c81fced826336a73cafa36396a43f8 (diff) | |
| parent | 44eafa9697b0adebfa5e18579adcf70cd6d9c935 (diff) | |
| download | tor-a857f61e278aa5e5980722f9d458424b8790e9b1.tar tor-a857f61e278aa5e5980722f9d458424b8790e9b1.tar.gz | |
Merge remote-tracking branch 'rransom-tor/bug3332-v2'
Diffstat (limited to 'src/or/rendclient.c')
| -rw-r--r-- | src/or/rendclient.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index c4eddb6e7..b618d0fe4 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -145,6 +145,8 @@ rend_client_send_introduction(origin_circuit_t *introcirc, tor_assert(rendcirc->rend_data); tor_assert(!rend_cmp_service_ids(introcirc->rend_data->onion_address, rendcirc->rend_data->onion_address)); + tor_assert(!(introcirc->build_state->onehop_tunnel)); + tor_assert(!(rendcirc->build_state->onehop_tunnel)); if (rend_cache_lookup_entry(introcirc->rend_data->onion_address, -1, &entry) < 1) { @@ -335,6 +337,7 @@ rend_client_introduction_acked(origin_circuit_t *circ, } tor_assert(circ->build_state->chosen_exit); + tor_assert(!(circ->build_state->onehop_tunnel)); tor_assert(circ->rend_data); if (request_len == 0) { @@ -346,6 +349,7 @@ rend_client_introduction_acked(origin_circuit_t *circ, rendcirc = circuit_get_by_rend_query_and_purpose( circ->rend_data->onion_address, CIRCUIT_PURPOSE_C_REND_READY); if (rendcirc) { /* remember the ack */ + tor_assert(!(rendcirc->build_state->onehop_tunnel)); rendcirc->_base.purpose = CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED; /* Set timestamp_dirty, because circuit_expire_building expects * it to specify when a circuit entered the |