torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'morestats4' into morestats5

Browse Source 
Conflicts:
	doc/tor.1.txt
	src/or/config.c
	src/or/connection.h
	src/or/control.c
	src/or/control.h
	src/or/or.h
	src/or/relay.c
	src/or/relay.h
	src/test/test.c
This commit is contained in:
Karsten Loesing
2013-10-28 11:30:49 +01:00
parent 49278cd68a e46de82c97
commit 2e0fad542c
18 changed files with 1047 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_cell_queue.c
+4 -2
View File
@@ -56,9 +56,11 @@ test_cq_manip(void *arg)
"once-ler lerkim, sed do barbaloot tempor gluppitus ut labore et "
"truffula magna aliqua.",
sizeof(cell.payload));
cell_queue_append_packed_copy(&cq, &cell, 1 /*wide*/, 0 /*stats*/);
cell_queue_append_packed_copy(NULL /*circ*/, &cq, 0 /*exitward*/, &cell,
1 /*wide*/, 0 /*stats*/);
cell.circ_id = 0x2013;
cell_queue_append_packed_copy(&cq, &cell, 0 /*wide*/, 0 /*stats*/);
cell_queue_append_packed_copy(NULL /*circ*/, &cq, 0 /*exitward*/, &cell,
0 /*wide*/, 0 /*stats*/);
tt_int_op(cq.n, ==, 2);
pc_tmp = cell_queue_pop(&cq);