diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-06-11 11:57:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-06-11 11:57:56 -0400 |
| commit | 3a2e25969fbb7bf38fcfafce676e7f56a1aca118 (patch) | |
| tree | 39d1fc39c7a66bfe63a777c0b4d752a6dc56bcaa /src/or/or.h | |
| parent | 7f3563058d6b9215fe93116a71db9573e790e017 (diff) | |
| parent | bbb8f12ee4efd6f1c2bc8b34dfaf50e314863476 (diff) | |
| download | tor-3a2e25969fbb7bf38fcfafce676e7f56a1aca118.tar tor-3a2e25969fbb7bf38fcfafce676e7f56a1aca118.tar.gz | |
Merge remote-tracking branch 'public/ticket6799_024_v2_squashed'
Conflicts:
src/or/channel.c
src/or/circuitlist.c
src/or/connection.c
Conflicts involved removal of next_circ_id and addition of
unusable-circid tracking.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h index 6aa6b59e8..f1d68b766 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1488,13 +1488,14 @@ typedef struct or_connection_t { uint16_t link_proto; /**< What protocol version are we using? 0 for * "none negotiated yet." */ - + uint16_t idle_timeout; /**< How long can this connection sit with no + * circuits on it before we close it? Based on + * IDLE_CIRCUIT_TIMEOUT_{NON,}CANONICAL and + * on is_canonical, randomized. */ or_handshake_state_t *handshake_state; /**< If we are setting this connection * up, state information to do so. */ time_t timestamp_lastempty; /**< When was the outbuf last completely empty?*/ - time_t timestamp_last_added_nonpadding; /** When did we last add a - * non-padding cell to the outbuf? */ /* bandwidth* and *_bucket only used by ORs in OPEN state: */ int bandwidthrate; /**< Bytes/s added to the bucket. (OPEN ORs only.) */ |