diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-13 11:15:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-13 11:15:40 -0500 |
| commit | 0fc2b7f82e5583f5652893931d24c94d04464c66 (patch) | |
| tree | 951de1e3bd870fec351007b674a09651f8de20d4 | |
| parent | 2777b469fa9e62763cdaee94c10446cf49d7d378 (diff) | |
| parent | 1a5746f8e1a392f0b67e36083019534bf97f1fa6 (diff) | |
| download | tor-0fc2b7f82e5583f5652893931d24c94d04464c66.tar.gz tor-0fc2b7f82e5583f5652893931d24c94d04464c66.zip | |
Merge branch 'bug8185_031' into maint-0.3.1
| -rw-r--r-- | changes/bug8185_025 | 6 | ||||
| -rw-r--r-- | src/or/relay.c | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/changes/bug8185_025 b/changes/bug8185_025 new file mode 100644 index 0000000000..1bfc12b1e4 --- /dev/null +++ b/changes/bug8185_025 @@ -0,0 +1,6 @@ + o Minor bugfixes (logging, relay shutdown, annoyance): + - When a circuit is marked for close, do not attempt to package any cells + for channels on that circuit. Previously, we would detect this + condition lower in the call stack, when we noticed that the circuit had + no attached channel, and log an annoying message. Fixes bug 8185; + bugfix on 0.2.5.4-alpha. diff --git a/src/or/relay.c b/src/or/relay.c index cb1a0692b6..81942af1e8 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -506,6 +506,11 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ, { channel_t *chan; /* where to send the cell */ + if (circ->marked_for_close) { + /* Circuit is marked; send nothing. */ + return 0; + } + if (cell_direction == CELL_DIRECTION_OUT) { crypt_path_t *thishop; /* counter for repeated crypts */ chan = circ->n_chan; @@ -824,6 +829,12 @@ connection_edge_send_command(edge_connection_t *fromconn, return -1; } + if (circ->marked_for_close) { + /* The circuit has been marked, but not freed yet. When it's freed, it + * will mark this connection for close. */ + return -1; + } + #ifdef MEASUREMENTS_21206 /* Keep track of the number of RELAY_DATA cells sent for directory * connections. */ |