diff options
| author | Mike Perry <mikeperry-git@torproject.org> | 2018-01-20 03:16:24 +0000 |
|---|---|---|
| committer | Mike Perry <mikeperry-git@torproject.org> | 2018-01-20 03:18:31 +0000 |
| commit | db5b670d85febc6e3011932f8f0c7d383d4b9bea (patch) | |
| tree | 185ec7f70716c45f44bd24e7b8414596d07f7acd /src/or/connection_edge.c | |
| parent | 48a51c5f8b80a359da31bc5aaac8ecd25890fe0d (diff) | |
| download | tor-db5b670d85febc6e3011932f8f0c7d383d4b9bea.tar.gz tor-db5b670d85febc6e3011932f8f0c7d383d4b9bea.zip | |
Bug 24946: Fix a warning message caused by a missed purpose check.
Also fix three other checks (found by inspection of all
CIRCUIT_PURPOSE_C_GENERAL occurrences).
Diffstat (limited to 'src/or/connection_edge.c')
| -rw-r--r-- | src/or/connection_edge.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 4021ca9e0c..a47f044e08 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -792,7 +792,10 @@ connection_ap_expire_beginning(void) } continue; } + if (circ->purpose != CIRCUIT_PURPOSE_C_GENERAL && + circ->purpose != CIRCUIT_PURPOSE_C_HSDIR_GET && + circ->purpose != CIRCUIT_PURPOSE_S_HSDIR_POST && circ->purpose != CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT && circ->purpose != CIRCUIT_PURPOSE_PATH_BIAS_TESTING) { log_warn(LD_BUG, "circuit->purpose == CIRCUIT_PURPOSE_C_GENERAL failed. " |