diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-13 10:31:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-13 10:31:02 -0400 |
| commit | 4b781e24fb920ad4cd2268b609e4b4b0bd5adb7d (patch) | |
| tree | 81cf1e73e3ecb06333cbc22d80ab045bcea348ba /src/or/or.h | |
| parent | 29498491432040168c5df7091097a7b8a9c9ad86 (diff) | |
| parent | e61df2ec651345f1c46777105bbae69916402ecd (diff) | |
| download | tor-4b781e24fb920ad4cd2268b609e4b4b0bd5adb7d.tar.gz tor-4b781e24fb920ad4cd2268b609e4b4b0bd5adb7d.zip | |
Merge remote-tracking branch 'public/bug7912_squashed'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index daff6de933..0eebe395d9 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2777,6 +2777,13 @@ typedef struct circuit_t { * allowing n_streams to add any more cells. (OR circuit only.) */ unsigned int streams_blocked_on_p_chan : 1; + /** True iff we have queued a delete backwards on this circuit, but not put + * it on the output buffer. */ + unsigned int p_delete_pending : 1; + /** True iff we have queued a delete forwards on this circuit, but not put + * it on the output buffer. */ + unsigned int n_delete_pending : 1; + uint8_t state; /**< Current status of this circuit. */ uint8_t purpose; /**< Why are we creating this circuit? */ |