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 'andrea/oos-test-failures'

Browse Source
This commit is contained in:
Nick Mathewson 2016-08-26 09:46:40 -04:00
commit 8fe410e875
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/connection.c
View File

@ -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;
}

2
src/test/test_oos.c
View File

@ -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);