|
@@ -4,6 +4,9 @@
|
|
|
#include "or.h"
|
|
|
#define CIRCUITBUILD_PRIVATE
|
|
|
#include "circuitbuild.h"
|
|
|
+#include "circuitlist.h"
|
|
|
+#include "rephist.h"
|
|
|
+#include "channeltls.h"
|
|
|
#define RELAY_PRIVATE
|
|
|
#include "relay.h"
|
|
|
/* For init/free stuff */
|
|
@@ -16,6 +19,9 @@
|
|
|
static or_circuit_t * new_fake_orcirc(channel_t *nchan, channel_t *pchan);
|
|
|
|
|
|
static void test_relay_append_cell_to_circuit_queue(void *arg);
|
|
|
+uint64_t find_largest_max(bw_array_t *b);
|
|
|
+void commit_max(bw_array_t *b);
|
|
|
+void advance_obs(bw_array_t *b);
|
|
|
|
|
|
static or_circuit_t *
|
|
|
new_fake_orcirc(channel_t *nchan, channel_t *pchan)
|
|
@@ -27,10 +33,9 @@ new_fake_orcirc(channel_t *nchan, channel_t *pchan)
|
|
|
circ = &(orcirc->base_);
|
|
|
circ->magic = OR_CIRCUIT_MAGIC;
|
|
|
|
|
|
- circ->n_chan = nchan;
|
|
|
- circ->n_circ_id = get_unique_circ_id_by_chan(nchan);
|
|
|
- circ->n_mux = NULL; /* ?? */
|
|
|
+ circuit_set_n_circid_chan(circ, get_unique_circ_id_by_chan(nchan), nchan);
|
|
|
cell_queue_init(&(circ->n_chan_cells));
|
|
|
+
|
|
|
circ->n_hop = NULL;
|
|
|
circ->streams_blocked_on_n_chan = 0;
|
|
|
circ->streams_blocked_on_p_chan = 0;
|
|
@@ -43,13 +48,108 @@ new_fake_orcirc(channel_t *nchan, channel_t *pchan)
|
|
|
circ->deliver_window = CIRCWINDOW_START_MAX;
|
|
|
circ->n_chan_create_cell = NULL;
|
|
|
|
|
|
- orcirc->p_chan = pchan;
|
|
|
- orcirc->p_circ_id = get_unique_circ_id_by_chan(pchan);
|
|
|
+ /* for assert_circ_ok */
|
|
|
+ orcirc->p_crypto = (void*)1;
|
|
|
+ orcirc->n_crypto = (void*)1;
|
|
|
+ orcirc->n_digest = (void*)1;
|
|
|
+ orcirc->p_digest = (void*)1;
|
|
|
+
|
|
|
+ circuit_set_p_circid_chan(orcirc, get_unique_circ_id_by_chan(pchan), pchan);
|
|
|
cell_queue_init(&(orcirc->p_chan_cells));
|
|
|
|
|
|
return orcirc;
|
|
|
}
|
|
|
|
|
|
+static void
|
|
|
+test_relay_close_circuit(void *arg)
|
|
|
+{
|
|
|
+ channel_t *nchan = NULL, *pchan = NULL;
|
|
|
+ or_circuit_t *orcirc = NULL;
|
|
|
+ cell_t *cell = NULL;
|
|
|
+ int old_count, new_count;
|
|
|
+
|
|
|
+ (void)arg;
|
|
|
+
|
|
|
+ /* Make fake channels to be nchan and pchan for the circuit */
|
|
|
+ nchan = new_fake_channel();
|
|
|
+ tt_assert(nchan);
|
|
|
+
|
|
|
+ pchan = new_fake_channel();
|
|
|
+ tt_assert(pchan);
|
|
|
+
|
|
|
+ /* We'll need chans with working cmuxes */
|
|
|
+ nchan->cmux = circuitmux_alloc();
|
|
|
+ pchan->cmux = circuitmux_alloc();
|
|
|
+
|
|
|
+ /* Make a fake orcirc */
|
|
|
+ orcirc = new_fake_orcirc(nchan, pchan);
|
|
|
+ tt_assert(orcirc);
|
|
|
+ circuitmux_attach_circuit(nchan->cmux, TO_CIRCUIT(orcirc),
|
|
|
+ CELL_DIRECTION_OUT);
|
|
|
+ circuitmux_attach_circuit(pchan->cmux, TO_CIRCUIT(orcirc),
|
|
|
+ CELL_DIRECTION_IN);
|
|
|
+
|
|
|
+ /* Make a cell */
|
|
|
+ cell = tor_malloc_zero(sizeof(cell_t));
|
|
|
+ make_fake_cell(cell);
|
|
|
+
|
|
|
+ MOCK(scheduler_channel_has_waiting_cells,
|
|
|
+ scheduler_channel_has_waiting_cells_mock);
|
|
|
+
|
|
|
+ /* Append it */
|
|
|
+ old_count = get_mock_scheduler_has_waiting_cells_count();
|
|
|
+ append_cell_to_circuit_queue(TO_CIRCUIT(orcirc), nchan, cell,
|
|
|
+ CELL_DIRECTION_OUT, 0);
|
|
|
+ new_count = get_mock_scheduler_has_waiting_cells_count();
|
|
|
+ tt_int_op(new_count, OP_EQ, old_count + 1);
|
|
|
+
|
|
|
+ /* Now try the reverse direction */
|
|
|
+ old_count = get_mock_scheduler_has_waiting_cells_count();
|
|
|
+ append_cell_to_circuit_queue(TO_CIRCUIT(orcirc), pchan, cell,
|
|
|
+ CELL_DIRECTION_IN, 0);
|
|
|
+ new_count = get_mock_scheduler_has_waiting_cells_count();
|
|
|
+ tt_int_op(new_count, OP_EQ, old_count + 1);
|
|
|
+
|
|
|
+ /* Ensure our write totals are 0 */
|
|
|
+ tt_int_op(find_largest_max(write_array), OP_EQ, 0);
|
|
|
+
|
|
|
+ /* Mark the circuit for close */
|
|
|
+ circuit_mark_for_close(TO_CIRCUIT(orcirc), 0);
|
|
|
+
|
|
|
+ /* Check our write totals. */
|
|
|
+ advance_obs(write_array);
|
|
|
+ commit_max(write_array);
|
|
|
+ /* Check for two cells plus overhead */
|
|
|
+ tt_int_op(find_largest_max(write_array), OP_EQ,
|
|
|
+ 2*(get_cell_network_size(nchan->wide_circ_ids)
|
|
|
+ +TLS_PER_CELL_OVERHEAD));
|
|
|
+
|
|
|
+ UNMOCK(scheduler_channel_has_waiting_cells);
|
|
|
+
|
|
|
+ /* Get rid of the fake channels */
|
|
|
+ MOCK(scheduler_release_channel, scheduler_release_channel_mock);
|
|
|
+ channel_mark_for_close(nchan);
|
|
|
+ channel_mark_for_close(pchan);
|
|
|
+ UNMOCK(scheduler_release_channel);
|
|
|
+
|
|
|
+ /* Shut down channels */
|
|
|
+ channel_free_all();
|
|
|
+
|
|
|
+ done:
|
|
|
+ tor_free(cell);
|
|
|
+ if (orcirc) {
|
|
|
+ circuitmux_detach_circuit(nchan->cmux, TO_CIRCUIT(orcirc));
|
|
|
+ circuitmux_detach_circuit(pchan->cmux, TO_CIRCUIT(orcirc));
|
|
|
+ cell_queue_clear(&orcirc->base_.n_chan_cells);
|
|
|
+ cell_queue_clear(&orcirc->p_chan_cells);
|
|
|
+ }
|
|
|
+ tor_free(orcirc);
|
|
|
+ free_fake_channel(nchan);
|
|
|
+ free_fake_channel(pchan);
|
|
|
+
|
|
|
+ return;
|
|
|
+}
|
|
|
+
|
|
|
static void
|
|
|
test_relay_append_cell_to_circuit_queue(void *arg)
|
|
|
{
|
|
@@ -129,6 +229,8 @@ test_relay_append_cell_to_circuit_queue(void *arg)
|
|
|
struct testcase_t relay_tests[] = {
|
|
|
{ "append_cell_to_circuit_queue", test_relay_append_cell_to_circuit_queue,
|
|
|
TT_FORK, NULL, NULL },
|
|
|
+ { "close_circ_rephist", test_relay_close_circuit,
|
|
|
+ TT_FORK, NULL, NULL },
|
|
|
END_OF_TESTCASES
|
|
|
};
|
|
|
|