summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-02-10 13:55:27 -0500
committerNick Mathewson <nickm@torproject.org>2014-02-10 13:55:27 -0500
commit3133cde3c12a814fab4c83ba59d5dfeace397ebc (patch)
tree5169b40ead6fece4f4de40132736a9d8426b1671 /src/or/or.h
parent7f6aa780e3183f34b2fa771e17813018e6b28115 (diff)
downloadtor-3133cde3c12a814fab4c83ba59d5dfeace397ebc.tar.gz
tor-3133cde3c12a814fab4c83ba59d5dfeace397ebc.zip
Excise the insertion_time_elem_t logic
It's now redundant with the inserted_time field in packed_cell_t Fixes bug 10870.
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 5318b0fe5d..3eaf3447dc 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1081,31 +1081,12 @@ typedef struct packed_cell_t {
* 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 {
- struct insertion_time_elem_t *next; /**< Next element in queue. */
- uint32_t insertion_time; /**< When were cells inserted (in 10 ms steps
- * starting at 0:00 of the current day)? */
- unsigned counter; /**< How many cells were inserted? */
-} insertion_time_elem_t;
-
-/** Queue of insertion times. */
-typedef struct insertion_time_queue_t {
- struct insertion_time_elem_t *first; /**< First element in queue. */
- struct insertion_time_elem_t *last; /**< Last element in queue. */
-} insertion_time_queue_t;
-
/** A queue of cells on a circuit, waiting to be added to the
* or_connection_t's outbuf. */
typedef struct cell_queue_t {
packed_cell_t *head; /**< The first cell, or NULL if the queue is empty. */
packed_cell_t *tail; /**< The last cell, or NULL if the queue is empty. */
int n; /**< The number of cells in the queue. */
- insertion_time_queue_t *insertion_times; /**< Insertion times of cells. */
} cell_queue_t;
/** Beginning of a RELAY cell payload. */