diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-23 12:44:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-23 12:44:18 -0400 |
| commit | 17ad309d33561ee255cac70bdb9a19803f2d8c08 (patch) | |
| tree | ce2cc2e2ad455d032290dd204eed3a7b3bad1689 /src/or/channel.h | |
| parent | fd9961d220504f81204ab5ad0204cfec8abdb75e (diff) | |
| parent | a770b74501a3faf6483c40735b70adae6fb95187 (diff) | |
| download | tor-17ad309d33561ee255cac70bdb9a19803f2d8c08.tar.gz tor-17ad309d33561ee255cac70bdb9a19803f2d8c08.zip | |
Merge remote-tracking branch 'public/bug11553_024' into bug11553_025
Conflicts:
src/or/circuitbuild.c
Diffstat (limited to 'src/or/channel.h')
| -rw-r--r-- | src/or/channel.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/channel.h b/src/or/channel.h index de19fad9a5..bd9a02f323 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -149,8 +149,6 @@ struct channel_s { circ_id_type_bitfield_t circ_id_type:2; /** DOCDOC*/ unsigned wide_circ_ids:1; - /** 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; @@ -179,6 +177,10 @@ struct channel_s { */ unsigned int is_local:1; + /** Have we logged a warning about circID exhaustion on this channel? + * If so, when? */ + ratelim_t last_warned_circ_ids_exhausted; + /** Channel timestamps for cell channels */ time_t timestamp_client; /* Client used this, according to relay.c */ time_t timestamp_drained; /* Output queue empty */ |