mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-25 15:10:48 +01:00
Use TOR_SIMPLEQ for packed_cell_t
This commit is contained in:
parent
27ec1fafe4
commit
1047e7dcb0
5 changed files with 24 additions and 25 deletions
|
@ -682,6 +682,7 @@ init_circuit_base(circuit_t *circ)
|
||||||
|
|
||||||
circ->package_window = circuit_initial_package_window();
|
circ->package_window = circuit_initial_package_window();
|
||||||
circ->deliver_window = CIRCWINDOW_START;
|
circ->deliver_window = CIRCWINDOW_START;
|
||||||
|
cell_queue_init(&circ->n_chan_cells);
|
||||||
|
|
||||||
circuit_add(circ);
|
circuit_add(circ);
|
||||||
}
|
}
|
||||||
|
@ -727,6 +728,7 @@ or_circuit_new(circid_t p_circ_id, channel_t *p_chan)
|
||||||
circuit_set_p_circid_chan(circ, p_circ_id, p_chan);
|
circuit_set_p_circid_chan(circ, p_circ_id, p_chan);
|
||||||
|
|
||||||
circ->remaining_relay_early_cells = MAX_RELAY_EARLY_CELLS_PER_CIRCUIT;
|
circ->remaining_relay_early_cells = MAX_RELAY_EARLY_CELLS_PER_CIRCUIT;
|
||||||
|
cell_queue_init(&circ->p_chan_cells);
|
||||||
|
|
||||||
init_circuit_base(TO_CIRCUIT(circ));
|
init_circuit_base(TO_CIRCUIT(circ));
|
||||||
|
|
||||||
|
|
|
@ -510,7 +510,7 @@ circuitmux_mark_destroyed_circids_usable(circuitmux_t *cmux, channel_t *chan)
|
||||||
{
|
{
|
||||||
packed_cell_t *cell;
|
packed_cell_t *cell;
|
||||||
int n_bad = 0;
|
int n_bad = 0;
|
||||||
for (cell = cmux->destroy_cell_queue.head; cell; cell = cell->next) {
|
TOR_SIMPLEQ_FOREACH(cell, &cmux->destroy_cell_queue.head, next) {
|
||||||
circid_t circid = 0;
|
circid_t circid = 0;
|
||||||
if (packed_cell_is_destroy(chan, cell, &circid)) {
|
if (packed_cell_is_destroy(chan, cell, &circid)) {
|
||||||
channel_mark_circid_usable(chan, circid);
|
channel_mark_circid_usable(chan, circid);
|
||||||
|
|
|
@ -99,6 +99,7 @@
|
||||||
#include "ht.h"
|
#include "ht.h"
|
||||||
#include "replaycache.h"
|
#include "replaycache.h"
|
||||||
#include "crypto_curve25519.h"
|
#include "crypto_curve25519.h"
|
||||||
|
#include "tor_queue.h"
|
||||||
|
|
||||||
/* These signals are defined to help handle_control_signal work.
|
/* These signals are defined to help handle_control_signal work.
|
||||||
*/
|
*/
|
||||||
|
@ -1083,7 +1084,8 @@ typedef struct var_cell_t {
|
||||||
|
|
||||||
/** A cell as packed for writing to the network. */
|
/** A cell as packed for writing to the network. */
|
||||||
typedef struct packed_cell_t {
|
typedef struct packed_cell_t {
|
||||||
struct packed_cell_t *next; /**< Next cell queued on this circuit. */
|
/** Next cell queued on this circuit. */
|
||||||
|
TOR_SIMPLEQ_ENTRY(packed_cell_t) next;
|
||||||
char body[CELL_MAX_NETWORK_SIZE]; /**< Cell as packed for network. */
|
char body[CELL_MAX_NETWORK_SIZE]; /**< Cell as packed for network. */
|
||||||
} packed_cell_t;
|
} packed_cell_t;
|
||||||
|
|
||||||
|
@ -1105,8 +1107,8 @@ typedef struct insertion_time_queue_t {
|
||||||
/** A queue of cells on a circuit, waiting to be added to the
|
/** A queue of cells on a circuit, waiting to be added to the
|
||||||
* or_connection_t's outbuf. */
|
* or_connection_t's outbuf. */
|
||||||
typedef struct cell_queue_t {
|
typedef struct cell_queue_t {
|
||||||
packed_cell_t *head; /**< The first cell, or NULL if the queue is empty. */
|
/** Linked list of packed_cell_t*/
|
||||||
packed_cell_t *tail; /**< The last cell, or NULL if the queue is empty. */
|
TOR_SIMPLEQ_HEAD(cell_simpleq, packed_cell_t) head;
|
||||||
int n; /**< The number of cells in the queue. */
|
int n; /**< The number of cells in the queue. */
|
||||||
insertion_time_queue_t *insertion_times; /**< Insertion times of cells. */
|
insertion_time_queue_t *insertion_times; /**< Insertion times of cells. */
|
||||||
} cell_queue_t;
|
} cell_queue_t;
|
||||||
|
|
|
@ -2129,7 +2129,6 @@ packed_cell_copy(const cell_t *cell, int wide_circ_ids)
|
||||||
{
|
{
|
||||||
packed_cell_t *c = packed_cell_new();
|
packed_cell_t *c = packed_cell_new();
|
||||||
cell_pack(c, cell, wide_circ_ids);
|
cell_pack(c, cell, wide_circ_ids);
|
||||||
c->next = NULL;
|
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2137,14 +2136,7 @@ packed_cell_copy(const cell_t *cell, int wide_circ_ids)
|
||||||
void
|
void
|
||||||
cell_queue_append(cell_queue_t *queue, packed_cell_t *cell)
|
cell_queue_append(cell_queue_t *queue, packed_cell_t *cell)
|
||||||
{
|
{
|
||||||
if (queue->tail) {
|
TOR_SIMPLEQ_INSERT_TAIL(&queue->head, cell, next);
|
||||||
tor_assert(!queue->tail->next);
|
|
||||||
queue->tail->next = cell;
|
|
||||||
} else {
|
|
||||||
queue->head = cell;
|
|
||||||
}
|
|
||||||
queue->tail = cell;
|
|
||||||
cell->next = NULL;
|
|
||||||
++queue->n;
|
++queue->n;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2187,18 +2179,24 @@ cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell,
|
||||||
cell_queue_append(queue, copy);
|
cell_queue_append(queue, copy);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Initialize <b>queue</b> as an empty cell queue. */
|
||||||
|
void
|
||||||
|
cell_queue_init(cell_queue_t *queue)
|
||||||
|
{
|
||||||
|
memset(queue, 0, sizeof(cell_queue_t));
|
||||||
|
TOR_SIMPLEQ_INIT(&queue->head);
|
||||||
|
}
|
||||||
|
|
||||||
/** Remove and free every cell in <b>queue</b>. */
|
/** Remove and free every cell in <b>queue</b>. */
|
||||||
void
|
void
|
||||||
cell_queue_clear(cell_queue_t *queue)
|
cell_queue_clear(cell_queue_t *queue)
|
||||||
{
|
{
|
||||||
packed_cell_t *cell, *next;
|
packed_cell_t *cell;
|
||||||
cell = queue->head;
|
while ((cell = TOR_SIMPLEQ_FIRST(&queue->head))) {
|
||||||
while (cell) {
|
TOR_SIMPLEQ_REMOVE_HEAD(&queue->head, next);
|
||||||
next = cell->next;
|
|
||||||
packed_cell_free_unchecked(cell);
|
packed_cell_free_unchecked(cell);
|
||||||
cell = next;
|
|
||||||
}
|
}
|
||||||
queue->head = queue->tail = NULL;
|
TOR_SIMPLEQ_INIT(&queue->head);
|
||||||
queue->n = 0;
|
queue->n = 0;
|
||||||
if (queue->insertion_times) {
|
if (queue->insertion_times) {
|
||||||
while (queue->insertion_times->first) {
|
while (queue->insertion_times->first) {
|
||||||
|
@ -2215,14 +2213,10 @@ cell_queue_clear(cell_queue_t *queue)
|
||||||
static INLINE packed_cell_t *
|
static INLINE packed_cell_t *
|
||||||
cell_queue_pop(cell_queue_t *queue)
|
cell_queue_pop(cell_queue_t *queue)
|
||||||
{
|
{
|
||||||
packed_cell_t *cell = queue->head;
|
packed_cell_t *cell = TOR_SIMPLEQ_FIRST(&queue->head);
|
||||||
if (!cell)
|
if (!cell)
|
||||||
return NULL;
|
return NULL;
|
||||||
queue->head = cell->next;
|
TOR_SIMPLEQ_REMOVE_HEAD(&queue->head, next);
|
||||||
if (cell == queue->tail) {
|
|
||||||
tor_assert(!queue->head);
|
|
||||||
queue->tail = NULL;
|
|
||||||
}
|
|
||||||
--queue->n;
|
--queue->n;
|
||||||
return cell;
|
return cell;
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,6 +51,7 @@ size_t packed_cell_mem_cost(void);
|
||||||
/* For channeltls.c */
|
/* For channeltls.c */
|
||||||
void packed_cell_free(packed_cell_t *cell);
|
void packed_cell_free(packed_cell_t *cell);
|
||||||
|
|
||||||
|
void cell_queue_init(cell_queue_t *queue);
|
||||||
void cell_queue_clear(cell_queue_t *queue);
|
void cell_queue_clear(cell_queue_t *queue);
|
||||||
void cell_queue_append(cell_queue_t *queue, packed_cell_t *cell);
|
void cell_queue_append(cell_queue_t *queue, packed_cell_t *cell);
|
||||||
void cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell,
|
void cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell,
|
||||||
|
|
Loading…
Add table
Reference in a new issue