diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-15 15:35:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-15 15:35:00 -0500 |
| commit | 7a2b30fe16eacc040b3dd11f8c39c410628c2f43 (patch) | |
| tree | 356e060be24608160a8e5d4fea33d39cc01a4c46 /src/or/or.h | |
| parent | 4aa9affec2eac0a95ba026e380718b032451a0af (diff) | |
| parent | 59f50c80d443a7e148f85cfed493e3e703cc4386 (diff) | |
| download | tor-7a2b30fe16eacc040b3dd11f8c39c410628c2f43.tar tor-7a2b30fe16eacc040b3dd11f8c39c410628c2f43.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Conflicts:
src/or/relay.c
Conflict changes were easy; compilation fixes required were using
using TOR_SIMPLEQ_FIRST to get head of cell queue.
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 a31324850..6b18f1328 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1120,8 +1120,13 @@ typedef struct packed_cell_t { /** Next cell queued on this circuit. */ TOR_SIMPLEQ_ENTRY(packed_cell_t) next; 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 { |