diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-15 15:29:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-15 15:29:24 -0500 |
| commit | 59f50c80d443a7e148f85cfed493e3e703cc4386 (patch) | |
| tree | bdaef44fe052c88c81c3e5fb130837f6ebc65202 /src/or/or.h | |
| parent | a82b18f2168ce19e0637740fed5746d6daac4e3a (diff) | |
| parent | 9e907076025ccd91abfad7fc70c09ba4c9228f82 (diff) | |
| download | tor-59f50c80d443a7e148f85cfed493e3e703cc4386.tar tor-59f50c80d443a7e148f85cfed493e3e703cc4386.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/or.h
src/or/relay.c
Conflicts were simple to resolve. More fixes were needed for
compilation, including: reinstating the tv_to_msec function, and renaming
*_conn_cells to *_chan_cells.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index eff5a6d2b..5318b0fe5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1077,8 +1077,13 @@ typedef struct var_cell_t { typedef struct packed_cell_t { struct packed_cell_t *next; /**< Next cell queued on this circuit. */ char body[CELL_MAX_NETWORK_SIZE]; /**< Cell as packed for network. */ + uint32_t inserted_time; /**< Time (in milliseconds since epoch, with high + * bits truncated) when this cell was inserted. */ } packed_cell_t; +/* XXXX This next structure may be obsoleted by inserted_time in + * packed_cell_t */ + /** Number of cells added to a circuit queue including their insertion * time on 10 millisecond detail; used for buffer statistics. */ typedef struct insertion_time_elem_t { |