diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-26 09:46:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-26 09:46:40 -0400 |
| commit | 8fe410e875343a4c134ddbe0db6da3d38865deee (patch) | |
| tree | dafaeba487edd2d50ae070ad31698986cce59393 /src | |
| parent | a601ed5c1579e1936aae175e301e19bd1e4a1826 (diff) | |
| parent | 33a3e6f7183c791d7aa544e3878c66f4ede9a2e7 (diff) | |
| download | tor-8fe410e875343a4c134ddbe0db6da3d38865deee.tar.gz tor-8fe410e875343a4c134ddbe0db6da3d38865deee.zip | |
Merge remote-tracking branch 'andrea/oos-test-failures'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/connection.c | 4 | ||||
| -rw-r--r-- | src/test/test_oos.c | 2 |
2 files changed, 4 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; } 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); |