From 4eabb8450ef4fab606d34ac33330d698663dbebf Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 17 Nov 2003 18:40:56 +0000 Subject: [PATCH] Fix possible bug in circID selection when building circuits on combination OP/OR servers svn:r830 --- src/or/circuit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/or/circuit.c b/src/or/circuit.c index d0a763565a..47911f2dde 100644 --- a/src/or/circuit.c +++ b/src/or/circuit.c @@ -777,6 +777,7 @@ int circuit_send_next_onion_skin(circuit_t *circ) { crypt_path_t *hop; routerinfo_t *router; int r; + int circ_id_type; assert(circ && circ->cpath); @@ -784,7 +785,9 @@ int circuit_send_next_onion_skin(circuit_t *circ) { assert(circ->n_conn && circ->n_conn->type == CONN_TYPE_OR); log_fn(LOG_DEBUG,"First skin; sending create cell."); - circ->n_circ_id = get_unique_circ_id_by_conn(circ->n_conn, CIRC_ID_TYPE_BOTH); + circ_id_type = decide_circ_id_type(options.Nickname, + circ->n_conn->nickname); + circ->n_circ_id = get_unique_circ_id_by_conn(circ->n_conn, circ_id_type); memset(&cell, 0, sizeof(cell_t)); cell.command = CELL_CREATE;