diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-15 09:43:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-22 08:57:45 -0400 |
| commit | 95a7e7e9254bc70db9e1d967d0db3deb658a2be3 (patch) | |
| tree | 3937c7b1a241020f4d7d48d6df6660dba3319c9e | |
| parent | 6a75a6fd9a7cd9c60904388f6836e7e659ef60e6 (diff) | |
| download | tor-95a7e7e9254bc70db9e1d967d0db3deb658a2be3.tar.gz tor-95a7e7e9254bc70db9e1d967d0db3deb658a2be3.zip | |
Stop using CREATE_FAST as a signifier of clienthood.
Relays send it, and we may as well let them. Part of our fix for
22805.
| -rw-r--r-- | changes/bug22805 | 3 | ||||
| -rw-r--r-- | src/or/command.c | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/changes/bug22805 b/changes/bug22805 index 6d95ad5a33..2b0369da30 100644 --- a/changes/bug22805 +++ b/changes/bug22805 @@ -1,7 +1,8 @@ o Minor features (relay): - When choosing which circuits can be expired as unused, consider circuits from clients even if those clients used regular CREATE - cells to make them. Part of ticket 22805. + cells to make them; and do not consider circuits from relays even if + they were made with CREATE_FAST. Part of ticket 22805. o Code simplification and refactoring: - Remove various ways of testing circuits and connections for diff --git a/src/or/command.c b/src/or/command.c index 46d3b6291c..42b42b21bb 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -353,16 +353,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan) int len; created_cell_t created_cell; - /* If the client used CREATE_FAST, it's probably a tor client or bridge - * relay, and we must not use it for EXTEND requests (in most cases, we - * won't have an authenticated peer ID for the extend). - * Public relays on 0.2.9 and later will use CREATE_FAST if they have no - * ntor onion key for this relay, but that should be a rare occurrence. - * Clients on 0.3.1 and later avoid using CREATE_FAST as much as they can, - * even during bootstrap, so the CREATE_FAST check is most accurate for - * earlier tor client versions. */ - channel_mark_client(chan); - memset(&created_cell, 0, sizeof(created_cell)); len = onion_skin_server_handshake(ONION_HANDSHAKE_TYPE_FAST, create_cell->onionskin, |