diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-09-29 17:05:38 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-09-29 17:05:38 -0400 |
| commit | 474e4d2722d52cf225a88cb7b7c677273b8f50ac (patch) | |
| tree | 0ebc666681cfbce8655f72330c3139b02a2a5376 /src/or/or.h | |
| parent | a58610a87e27e446b347f49e847da1cd460ffa81 (diff) | |
| parent | caba3bc57e2895a7c51a87e23fa783b9c48892a5 (diff) | |
| download | tor-474e4d2722d52cf225a88cb7b7c677273b8f50ac.tar.gz tor-474e4d2722d52cf225a88cb7b7c677273b8f50ac.zip | |
Merge commit 'mikeperry/bug1740' into maint-0.2.2
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 62985ca94a..69b0d6be29 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2163,9 +2163,13 @@ typedef struct origin_circuit_t { * to the specification? */ unsigned int remaining_relay_early_cells : 4; - /** Set if this circuit insanely old and if we already informed the user */ + /** Set if this circuit is insanely old and we already informed the user */ unsigned int is_ancient : 1; + /** Set if this circuit has already been opened. Used to detect + * cannibalized circuits. */ + unsigned int has_opened : 1; + /** What commands were sent over this circuit that decremented the * RELAY_EARLY counter? This is for debugging task 878. */ uint8_t relay_early_commands[MAX_RELAY_EARLY_CELLS_PER_CIRCUIT]; |