torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check for closing channel in channel_send_destroy()

Browse Source
This commit is contained in:
Andrea Shepard
2012-11-06 17:52:14 -08:00
parent 39a0a2c3ae
commit 688cea7248
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/channel.c
+22 -10
View File
@@ -2585,17 +2585,29 @@ channel_send_destroy(circid_t circ_id, channel_t *chan, int reason)
tor_assert(chan);
memset(&cell, 0, sizeof(cell_t));
cell.circ_id = circ_id;
cell.command = CELL_DESTROY;
cell.payload[0] = (uint8_t) reason;
log_debug(LD_OR,
"Sending destroy (circID %d) on channel %p "
"(global ID " U64_FORMAT ")",
circ_id, chan,
U64_PRINTF_ARG(chan->global_identifier));
/* Check to make sure we can send on this channel first */
if (!(chan->state == CHANNEL_STATE_CLOSING ||
chan->state == CHANNEL_STATE_CLOSED ||
chan->state == CHANNEL_STATE_ERROR)) {
memset(&cell, 0, sizeof(cell_t));
cell.circ_id = circ_id;
cell.command = CELL_DESTROY;
cell.payload[0] = (uint8_t) reason;
log_debug(LD_OR,
"Sending destroy (circID %d) on channel %p "
"(global ID " U64_FORMAT ")",
circ_id, chan,
U64_PRINTF_ARG(chan->global_identifier));
channel_write_cell(chan, &cell);
channel_write_cell(chan, &cell);
} else {
log_warn(LD_BUG,
"Someone called channel_send_destroy() for circID %d "
"on a channel " U64_FORMAT " at %p in state %s (%d)",
circ_id, U64_PRINTF_ARG(chan->global_identifier),
chan, channel_state_to_string(chan->state),
chan->state);
}
return 0;
}