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

Merge branch 'bug9296'

Browse Source
This commit is contained in:
Nick Mathewson 2013-07-19 11:58:20 -04:00
commit d2cd0dfd14
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/or/circuitmux.c
View File

@ -383,6 +383,7 @@ circuitmux_alloc(void)
rv = tor_malloc_zero(sizeof(*rv)); rv = tor_malloc_zero(sizeof(*rv));
rv->chanid_circid_map = tor_malloc_zero(sizeof(*( rv->chanid_circid_map))); rv->chanid_circid_map = tor_malloc_zero(sizeof(*( rv->chanid_circid_map)));
HT_INIT(chanid_circid_muxinfo_map, rv->chanid_circid_map); HT_INIT(chanid_circid_muxinfo_map, rv->chanid_circid_map);
cell_queue_init(&rv->destroy_cell_queue);
return rv; return rv;
} }

1
src/test/include.am
View File

@ -20,6 +20,7 @@ src_test_test_SOURCES = \
src/test/test_addr.c \ src/test/test_addr.c \
src/test/test_cell_formats.c \ src/test/test_cell_formats.c \
src/test/test_circuitlist.c \ src/test/test_circuitlist.c \
src/test/test_circuitmux.c \
src/test/test_containers.c \ src/test/test_containers.c \
src/test/test_crypto.c \ src/test/test_crypto.c \
src/test/test_cell_queue.c \ src/test/test_cell_queue.c \

2
src/test/test.c
View File

@ -2133,6 +2133,7 @@ extern struct testcase_t introduce_tests[];
extern struct testcase_t replaycache_tests[]; extern struct testcase_t replaycache_tests[];
extern struct testcase_t cell_format_tests[]; extern struct testcase_t cell_format_tests[];
extern struct testcase_t circuitlist_tests[]; extern struct testcase_t circuitlist_tests[];
extern struct testcase_t circuitmux_tests[];
extern struct testcase_t cell_queue_tests[]; extern struct testcase_t cell_queue_tests[];
extern struct testcase_t options_tests[]; extern struct testcase_t options_tests[];
@ -2152,6 +2153,7 @@ static struct testgroup_t testgroups[] = {
{ "replaycache/", replaycache_tests }, { "replaycache/", replaycache_tests },
{ "introduce/", introduce_tests }, { "introduce/", introduce_tests },
{ "circuitlist/", circuitlist_tests }, { "circuitlist/", circuitlist_tests },
{ "circuitmux/", circuitmux_tests },
{ "options/", options_tests }, { "options/", options_tests },
END_OF_GROUPS END_OF_GROUPS
}; };