diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-06 01:53:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-03 11:29:47 -0500 |
| commit | b2863739083125d332cf1166ae6b095df7d0f155 (patch) | |
| tree | 44e6a25866048d143b1e739a46528823306ff9e7 /src/or/relay.c | |
| parent | ecf88b16b8672c8b734d13d84910e97357c470a8 (diff) | |
| download | tor-b2863739083125d332cf1166ae6b095df7d0f155.tar tor-b2863739083125d332cf1166ae6b095df7d0f155.tar.gz | |
Enable the ntor handshake on the client side.
"works for me"
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 5d87b270f..ddeec4e78 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -572,6 +572,7 @@ relay_send_command_from_edge(streamid_t stream_id, circuit_t *circ, origin_circuit_t *origin_circ = TO_ORIGIN_CIRCUIT(circ); if (origin_circ->remaining_relay_early_cells > 0 && (relay_command == RELAY_COMMAND_EXTEND || + relay_command == RELAY_COMMAND_EXTEND2 || cpath_layer != origin_circ->cpath)) { /* If we've got any relay_early cells left and (we're sending * an extend cell or we're not talking to the first hop), use @@ -585,7 +586,8 @@ relay_send_command_from_edge(streamid_t stream_id, circuit_t *circ, * task 878. */ origin_circ->relay_early_commands[ origin_circ->relay_early_cells_sent++] = relay_command; - } else if (relay_command == RELAY_COMMAND_EXTEND) { + } else if (relay_command == RELAY_COMMAND_EXTEND || + relay_command == RELAY_COMMAND_EXTEND2) { /* If no RELAY_EARLY cells can be sent over this circuit, log which * commands have been sent as RELAY_EARLY cells before; helps debug * task 878. */ |