From 32fbc9738a18e8d66c94e238e5afd4631d295692 Mon Sep 17 00:00:00 2001 From: Andrea Shepard Date: Fri, 26 Aug 2016 00:01:25 +0000 Subject: [PATCH 1/2] Fix OOS comparator fix --- src/or/connection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index e3560af4c5..5ecd1ad7bf 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4510,8 +4510,8 @@ oos_victim_comparator_for_orconns(or_connection_t *a, or_connection_t *b) a_circs = connection_or_get_num_circuits(a); b_circs = connection_or_get_num_circuits(b); - if (a_circs < b_circs) return -1; - else if (a_circs > b_circs) return 1; + if (a_circs < b_circs) return 1; + else if (a_circs > b_circs) return -1; else return 0; } From 33a3e6f7183c791d7aa544e3878c66f4ede9a2e7 Mon Sep 17 00:00:00 2001 From: Andrea Shepard Date: Fri, 26 Aug 2016 00:02:00 +0000 Subject: [PATCH 2/2] Avoid asserts in oos/kill_conn_list unit test --- src/test/test_oos.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/test_oos.c b/src/test/test_oos.c index 3afb68b27a..db06625116 100644 --- a/src/test/test_oos.c +++ b/src/test/test_oos.c @@ -294,6 +294,8 @@ test_oos_kill_conn_list(void *arg) dir_c2 = tor_malloc_zero(sizeof(*dir_c2)); dir_c2->base_.magic = DIR_CONNECTION_MAGIC; dir_c2->base_.type = CONN_TYPE_DIR; + dir_c2->base_.state = DIR_CONN_STATE_MIN_; + dir_c2->base_.purpose = DIR_PURPOSE_MIN_; c2 = TO_CONN(dir_c2); tt_assert(c1 != NULL);