mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 12:23:32 +01:00
Merge remote-tracking branch 'public/bug9082'
This commit is contained in:
commit
2974c83735
@ -803,6 +803,7 @@ channel_free(channel_t *chan)
|
||||
/* Get rid of cmux */
|
||||
if (chan->cmux) {
|
||||
circuitmux_detach_all_circuits(chan->cmux);
|
||||
circuitmux_mark_destroyed_circids_usable(chan->cmux, chan);
|
||||
circuitmux_free(chan->cmux);
|
||||
chan->cmux = NULL;
|
||||
}
|
||||
@ -2616,6 +2617,29 @@ channel_queue_var_cell(channel_t *chan, var_cell_t *var_cell)
|
||||
}
|
||||
}
|
||||
|
||||
/** If <b>packed_cell</b> on <b>chan</b> is a destroy cell, then set
|
||||
* *<b>circid_out</b> to its circuit ID, and return true. Otherwise, return
|
||||
* false. */
|
||||
/* XXXX Move this function. */
|
||||
int
|
||||
packed_cell_is_destroy(channel_t *chan,
|
||||
const packed_cell_t *packed_cell,
|
||||
circid_t *circid_out)
|
||||
{
|
||||
if (chan->wide_circ_ids) {
|
||||
if (packed_cell->body[4] == CELL_DESTROY) {
|
||||
*circid_out = ntohl(get_uint32(packed_cell->body));
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
if (packed_cell->body[2] == CELL_DESTROY) {
|
||||
*circid_out = ntohs(get_uint16(packed_cell->body));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/** DOCDOC */
|
||||
static int
|
||||
is_destroy_cell(channel_t *chan,
|
||||
@ -2636,18 +2660,7 @@ is_destroy_cell(channel_t *chan,
|
||||
}
|
||||
break;
|
||||
case CELL_QUEUE_PACKED:
|
||||
if (chan->wide_circ_ids) {
|
||||
if (q->u.packed.packed_cell->body[4] == CELL_DESTROY) {
|
||||
*circid_out = ntohl(get_uint32(q->u.packed.packed_cell->body));
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
if (q->u.packed.packed_cell->body[2] == CELL_DESTROY) {
|
||||
*circid_out = ntohs(get_uint16(q->u.packed.packed_cell->body));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
break;
|
||||
return packed_cell_is_destroy(chan, q->u.packed.packed_cell, circid_out);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -477,5 +477,9 @@ uint64_t channel_count_xmitted(channel_t *chan);
|
||||
|
||||
uint64_t channel_listener_count_accepted(channel_listener_t *chan_l);
|
||||
|
||||
int packed_cell_is_destroy(channel_t *chan,
|
||||
const packed_cell_t *packed_cell,
|
||||
circid_t *circid_out);
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -498,6 +498,31 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux)
|
||||
cmux->n_cells = 0;
|
||||
}
|
||||
|
||||
/** Reclaim all circuit IDs currently marked as unusable on <b>chan</b> because
|
||||
* of pending destroy cells in <b>cmux</b>.
|
||||
*
|
||||
* This function must be called AFTER circuits are unlinked from the (channel,
|
||||
* circuid-id) map with circuit_unlink_all_from_channel(), but before calling
|
||||
* circuitmux_free().
|
||||
*/
|
||||
void
|
||||
circuitmux_mark_destroyed_circids_usable(circuitmux_t *cmux, channel_t *chan)
|
||||
{
|
||||
packed_cell_t *cell;
|
||||
int n_bad = 0;
|
||||
for (cell = cmux->destroy_cell_queue.head; cell; cell = cell->next) {
|
||||
circid_t circid = 0;
|
||||
if (packed_cell_is_destroy(chan, cell, &circid)) {
|
||||
channel_mark_circid_usable(chan, circid);
|
||||
} else {
|
||||
++n_bad;
|
||||
}
|
||||
}
|
||||
if (n_bad)
|
||||
log_warn(LD_BUG, "%d cell(s) on destroy queue did not look like a "
|
||||
"DESTROY cell.", n_bad);
|
||||
}
|
||||
|
||||
/**
|
||||
* Free a circuitmux_t; the circuits must be detached first with
|
||||
* circuitmux_detach_all_circuits().
|
||||
|
@ -137,6 +137,8 @@ void circuitmux_set_num_cells(circuitmux_t *cmux, circuit_t *circ,
|
||||
void circuitmux_append_destroy_cell(channel_t *chan,
|
||||
circuitmux_t *cmux, circid_t circ_id,
|
||||
uint8_t reason);
|
||||
void circuitmux_mark_destroyed_circids_usable(circuitmux_t *cmux,
|
||||
channel_t *chan);
|
||||
|
||||
#endif /* TOR_CIRCUITMUX_H */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user