diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-18 13:00:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-18 13:00:45 -0400 |
| commit | bd169aa9a512857fe95fa0cbe44e4e6dbc2c800f (patch) | |
| tree | 3b864e4cd291c2bd240dd7fbbf0d7e200f40dd92 /src/or/channel.h | |
| parent | eb896d5e6f09902a760af010326b79ce82492da1 (diff) | |
| parent | 0d75344b0e0eafc89db89a974e87b16564cd8f0a (diff) | |
| download | tor-bd169aa9a512857fe95fa0cbe44e4e6dbc2c800f.tar.gz tor-bd169aa9a512857fe95fa0cbe44e4e6dbc2c800f.zip | |
Merge remote-tracking branch 'public/bug11553_024' into bug11553_025
Conflicts:
src/or/channel.h
Diffstat (limited to 'src/or/channel.h')
| -rw-r--r-- | src/or/channel.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/or/channel.h b/src/or/channel.h index 7ec222df0f..de19fad9a5 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -149,11 +149,8 @@ struct channel_s { circ_id_type_bitfield_t circ_id_type:2; /** DOCDOC*/ unsigned wide_circ_ids:1; - /** - * Which circ_id do we try to use next on this connection? This is - * always in the range 0..1<<15-1. - */ - circid_t next_circ_id; + /** Have we logged a warning about circID exhaustion on this channel? */ + unsigned warned_circ_ids_exhausted:1; /** For how many circuits are we n_chan? What about p_chan? */ unsigned int num_n_circuits, num_p_circuits; |