nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'dgoulet/bug24502_032_01' into maint-0.3.2

Browse Source
This commit is contained in:
Nick Mathewson 2017-12-06 14:37:53 -05:00
commit d4ca18573c
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug24502 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (scheduler):
- Properly set the scheduler state of an unopened channel in the KIST
scheduler main loop. This prevents a harmless but annoying log warning.
Fixes bug 24502; bugfix on 0.3.2.4-alpha.

5
src/or/scheduler_kist.c
View File

@ -606,9 +606,12 @@ kist_scheduler_run(void)
* fails leading to the channel to be closed which triggers a release
* and free its entry in the socket table. And because of a engineering
* design issue, the error is not propagated back so we don't get an
* error at this poin. So before we continue, make sure the channel is
* error at this point. So before we continue, make sure the channel is
* open and if not just ignore it. See #23751. */
if (!CHANNEL_IS_OPEN(chan)) {
/* Channel isn't open so we put it back in IDLE mode. It is either
* renegotiating its TLS session or about to be released. */
chan->scheduler_state = SCHED_CHAN_IDLE;
continue;
}
/* flush_result has the # cells flushed */

28
src/test/test_scheduler.c
View File

@ -807,6 +807,7 @@ test_scheduler_loop_kist(void *arg)
#endif
channel_t *ch1 = new_fake_channel(), *ch2 = new_fake_channel();
channel_t *ch3 = new_fake_channel();
/* setup options so we're sure about what sched we are running */
MOCK(get_options, mock_get_options);
@ -857,14 +858,35 @@ test_scheduler_loop_kist(void *arg)
the_scheduler->run();
channel_flush_some_cells_mock_free_all();
tt_int_op(1,==,1);
/* We'll try to run this closed channel threw the scheduler loop and make
* sure it ends up in the right state. */
tt_assert(ch3);
ch3->magic = TLS_CHAN_MAGIC;
ch3->state = CHANNEL_STATE_OPEN;
ch3->cmux = circuitmux_alloc();
channel_register(ch3);
tt_assert(ch3->registered);
ch3->scheduler_state = SCHED_CHAN_WAITING_FOR_CELLS;
scheduler_channel_has_waiting_cells(ch3);
/* Should be in the pending list now waiting to be handled. */
tt_int_op(ch3->scheduler_state, OP_EQ, SCHED_CHAN_PENDING);
tt_int_op(smartlist_len(get_channels_pending()), OP_EQ, 1);
/* By running the scheduler on a closed channel, it should end up in the
* IDLE state and not in the pending channel list. */
ch3->state = CHANNEL_STATE_CLOSED;
the_scheduler->run();
tt_int_op(ch3->scheduler_state, OP_EQ, SCHED_CHAN_IDLE);
tt_int_op(smartlist_len(get_channels_pending()), OP_EQ, 0);
done:
/* Prep the channel so the free() function doesn't explode. */
ch1->state = ch2->state = CHANNEL_STATE_CLOSED;
ch1->registered = ch2->registered = 0;
ch1->state = ch2->state = ch3->state = CHANNEL_STATE_CLOSED;
ch1->registered = ch2->registered = ch3->registered = 0;
channel_free(ch1);
channel_free(ch2);
channel_free(ch3);
UNMOCK(update_socket_info_impl);
UNMOCK(channel_should_write_to_kernel);
UNMOCK(channel_write_to_kernel);