diff options
| author | Karsten Loesing <karsten.loesing@gmx.net> | 2013-10-28 11:30:49 +0100 |
|---|---|---|
| committer | Karsten Loesing <karsten.loesing@gmx.net> | 2013-10-28 12:09:42 +0100 |
| commit | 2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4 (patch) | |
| tree | f4639f6ed8b224087e665373ba147df1fd53144d /src/test/test_cell_queue.c | |
| parent | 49278cd68a0d84727ae1131e677bc3481b3e2fc7 (diff) | |
| parent | e46de82c97e694d3bfa399af48b9de9365e264bd (diff) | |
| download | tor-2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4.tar.gz tor-2e0fad542cccddf9ad8b8dbaeba8b1e825c09ff4.zip | |
Merge branch 'morestats4' into morestats5
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
Diffstat (limited to 'src/test/test_cell_queue.c')
| -rw-r--r-- | src/test/test_cell_queue.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/test_cell_queue.c b/src/test/test_cell_queue.c index cf2d11ad5d..1eac073105 100644 --- a/src/test/test_cell_queue.c +++ b/src/test/test_cell_queue.c @@ -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); |