commit a364f88477105075a202e55b2e44dafa4bf2be51 Author: Robert Ransom rransom.8774@gmail.com Date: Wed Nov 23 14:07:46 2011 -0800

Add ifdefs to disable #3332 assertions --- src/or/directory.c | 4 ++++ src/or/rendclient.c | 6 ++++++ src/or/rendservice.c | 6 ++++++ 3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/or/directory.c b/src/or/directory.c index 776b7a2..073b887 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -907,8 +907,12 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr,

log_debug(LD_DIR, "Initiating %s", dir_conn_purpose_to_string(dir_purpose));

+#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(is_sensitive_dir_purpose(dir_purpose) && !anonymized_connection)); +#else + (void)is_sensitive_dir_purpose; +#endif

/* ensure that we don't make direct connections when a SOCKS server is * configured. */ diff --git a/src/or/rendclient.c b/src/or/rendclient.c index fae9df0..e7ef313 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -139,8 +139,10 @@ 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)); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(introcirc->build_state->onehop_tunnel)); tor_assert(!(rendcirc->build_state->onehop_tunnel)); +#endif

if (rend_cache_lookup_entry(introcirc->rend_data->onion_address, -1, &entry) < 1) { @@ -331,7 +333,9 @@ rend_client_introduction_acked(origin_circuit_t *circ, }

tor_assert(circ->build_state->chosen_exit); +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(circ->build_state->onehop_tunnel)); +#endif tor_assert(circ->rend_data);

if (request_len == 0) { @@ -343,7 +347,9 @@ 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 */ +#ifndef NON_ANONYMOUS_MODE_ENABLED tor_assert(!(rendcirc->build_state->onehop_tunnel)); +#endif 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 diff --git a/src/or/rendservice.c b/src/or/rendservice.c index e0c1a8c..34d255a 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -910,7 +910,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, @@ -1394,7 +1396,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);

@@ -1550,7 +1554,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);