summaryrefslogtreecommitdiff
path: root/src/or/command.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2018-01-15 22:33:40 -0500
committerRoger Dingledine <arma@torproject.org>2018-01-15 22:33:40 -0500
commitaf8cadf3a9febe3dbe22899b828f9f7946a82cef (patch)
treedd6d3466b7aea51446ca073ce93f621c9fa670a1 /src/or/command.c
parente3ab27001f81dc05eb1dd1ac8371a35ccce2b50d (diff)
downloadtor-af8cadf3a9febe3dbe22899b828f9f7946a82cef.tar.gz
tor-af8cadf3a9febe3dbe22899b828f9f7946a82cef.zip
Remove false positives from channel_is_client()
Fix a set of false positives where relays would consider connections to other relays as being client-only connections (and thus e.g. deserving different link padding schemes) if those relays fell out of the consensus briefly. Now we look only at the initial handshake and whether the connection authenticated as a relay. Fixes bug 24898; bugfix on 0.3.1.1-alpha.
Diffstat (limited to 'src/or/command.c')
-rw-r--r--src/or/command.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/command.c b/src/or/command.c
index c667cbbe52..894483e001 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -328,12 +328,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan)
if (connection_or_digest_is_known_relay(chan->identity_digest)) {
rep_hist_note_circuit_handshake_requested(create_cell->handshake_type);
- // Needed for chutney: Sometimes relays aren't in the consensus yet, and
- // get marked as clients. This resets their channels once they appear.
- // Probably useful for normal operation wrt relay flapping, too.
- chan->is_client = 0;
- } else {
- channel_mark_client(chan);
}
if (create_cell->handshake_type != ONION_HANDSHAKE_TYPE_FAST) {