nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Encode the 32-bit Global Identifier as 2 x 16-bit in the IPv6 address.

Browse Source 
Without this patch we would encode the IPv6 address' last part as
::ffffffff instead of ::ffff:ffff when the GID is UINT32_MAX.

See: https://bugs.torproject.org/4700
This commit is contained in:
Alexander Færøy 2018-09-14 21:37:36 +02:00 committed by George Kadianakis
parent e44e6a1857
commit 8f085841ef
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/or/connection_edge.c
View File

@ -623,8 +623,10 @@ export_hs_client_circuit_id_haproxy(const edge_connection_t *edge_conn,
} }
/* Build the string */ /* Build the string */
tor_asprintf(&buf, "PROXY TCP6 %s:%x %s %d %d\r\n", tor_asprintf(&buf, "PROXY TCP6 %s:%x:%x %s %d %d\r\n",
src_ipv6_prefix, gid, dst_ipv6, src_port, dst_port); src_ipv6_prefix,
gid >> 16, gid & 0x0000ffff,
dst_ipv6, src_port, dst_port);
connection_buf_add(buf, strlen(buf), conn); connection_buf_add(buf, strlen(buf), conn);

26
src/test/test_hs_service.c
View File

@ -2061,6 +2061,32 @@ test_export_client_circuit_id(void *arg)
export_hs_client_circuit_id_haproxy(edge_conn, conn); export_hs_client_circuit_id_haproxy(edge_conn, conn);
cp2 = buf_get_contents(conn->outbuf, &sz); cp2 = buf_get_contents(conn->outbuf, &sz);
tt_str_op(cp1, OP_NE, cp2); tt_str_op(cp1, OP_NE, cp2);
tor_free(cp1);
/* Check that GID with UINT32_MAX works. */
or_circ->global_identifier = UINT32_MAX;
export_hs_client_circuit_id_haproxy(edge_conn, conn);
cp1 = buf_get_contents(conn->outbuf, &sz);
tt_str_op(cp1, OP_EQ,
"PROXY TCP6 fc00:dead:beef:4dad::ffff:ffff ::1 65535 42\r\n");
tor_free(cp1);
/* Check that GID with UINT16_MAX works. */
or_circ->global_identifier = UINT16_MAX;
export_hs_client_circuit_id_haproxy(edge_conn, conn);
cp1 = buf_get_contents(conn->outbuf, &sz);
tt_str_op(cp1, OP_EQ,
"PROXY TCP6 fc00:dead:beef:4dad::0:ffff ::1 65535 42\r\n");
tor_free(cp1);
/* Check that GID with UINT16_MAX + 7 works. */
or_circ->global_identifier = UINT16_MAX + 7;
export_hs_client_circuit_id_haproxy(edge_conn, conn);
cp1 = buf_get_contents(conn->outbuf, &sz);
tt_str_op(cp1, OP_EQ, "PROXY TCP6 fc00:dead:beef:4dad::1:6 ::1 6 42\r\n");
done: done:
UNMOCK(connection_write_to_buf_impl_); UNMOCK(connection_write_to_buf_impl_);