aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_cell_formats.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-01-18 09:02:48 -0500
committerNick Mathewson <nickm@torproject.org>2017-01-18 09:02:48 -0500
commite69afb853dde958c6efd94dfdb0cd18f01f7d841 (patch)
tree050fde643722e50ec98fbe7828f4ec453e2dede6 /src/test/test_cell_formats.c
parent92c3926479de1511dc4607fdc1f9b8fa0fa9f47b (diff)
parent0151e1d1586b2e96dffb667cf2825e4fe993b62e (diff)
downloadtor-e69afb853dde958c6efd94dfdb0cd18f01f7d841.tar.gz
tor-e69afb853dde958c6efd94dfdb0cd18f01f7d841.zip
Merge branch 'bug19769_19025_029'
Diffstat (limited to 'src/test/test_cell_formats.c')
-rw-r--r--src/test/test_cell_formats.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_cell_formats.c b/src/test/test_cell_formats.c
index bbcff38d6d..22c34b6d6c 100644
--- a/src/test/test_cell_formats.c
+++ b/src/test/test_cell_formats.c
@@ -346,9 +346,9 @@ test_cfmt_connected_cells(void *arg)
memset(&cell, 0, sizeof(cell));
tor_addr_parse(&addr, "30.40.50.60");
rh.length = connected_cell_format_payload(cell.payload+RELAY_HEADER_SIZE,
- &addr, 128);
+ &addr, 1024);
tt_int_op(rh.length, OP_EQ, 8);
- test_memeq_hex(cell.payload+RELAY_HEADER_SIZE, "1e28323c" "00000080");
+ test_memeq_hex(cell.payload+RELAY_HEADER_SIZE, "1e28323c" "00000e10");
/* Try parsing it. */
tor_addr_make_unspec(&addr);
@@ -356,7 +356,7 @@ test_cfmt_connected_cells(void *arg)
tt_int_op(r, OP_EQ, 0);
tt_int_op(tor_addr_family(&addr), OP_EQ, AF_INET);
tt_str_op(fmt_addr(&addr), OP_EQ, "30.40.50.60");
- tt_int_op(ttl, OP_EQ, 128);
+ tt_int_op(ttl, OP_EQ, 3600); /* not 1024, since we clipped to 3600 */
/* Try an IPv6 address */
memset(&rh, 0, sizeof(rh));