October 2015 - tor-commits - lists.torproject.org

[tor/master] Fix compilation of sandbox.[ch] under musl-libc
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit a5ed8b1667156384483c12eb4f98d511c6dd2bd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 10:35:45 2015 -0400 Fix compilation of sandbox.[ch] under musl-libc Patch from jamestk; fix on 0.2.5.1-alpha. Fixes 17347. --- changes/bug17347 | 4 ++++ src/common/sandbox.c | 2 +- src/common/sandbox.h | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug17347 b/changes/bug17347 new file mode 100644 index 0000000..487b132 --- /dev/null +++ b/changes/bug17347 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix compilation of sandbox.c with musl-libc. + Fixes bug 17347; bugfix on 0.2.5.1-alpha. + Patch from 'jamestk'. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 161eab7..b995762 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -48,7 +48,7 @@ #include <sys/epoll.h> #include <sys/prctl.h> #include <linux/futex.h> -#include <bits/signum.h> +#include <sys/file.h> #include <stdarg.h> #include <seccomp.h> diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 36d25d6..21d517f 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -42,6 +42,9 @@ typedef struct sandbox_cfg_elem sandbox_cfg_t; #ifndef __USE_GNU #define __USE_GNU #endif +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include <sys/ucontext.h> #include <seccomp.h> #include <netdb.h>

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit ab3826f8333cec974c4b020ef30acda678ebe318 Merge: fa4a815 a5ed8b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 10:38:09 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.7'

1 0

[tor/maint-0.2.7] Fix compilation of sandbox.[ch] under musl-libc
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit a5ed8b1667156384483c12eb4f98d511c6dd2bd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 10:35:45 2015 -0400 Fix compilation of sandbox.[ch] under musl-libc Patch from jamestk; fix on 0.2.5.1-alpha. Fixes 17347. --- changes/bug17347 | 4 ++++ src/common/sandbox.c | 2 +- src/common/sandbox.h | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug17347 b/changes/bug17347 new file mode 100644 index 0000000..487b132 --- /dev/null +++ b/changes/bug17347 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix compilation of sandbox.c with musl-libc. + Fixes bug 17347; bugfix on 0.2.5.1-alpha. + Patch from 'jamestk'. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 161eab7..b995762 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -48,7 +48,7 @@ #include <sys/epoll.h> #include <sys/prctl.h> #include <linux/futex.h> -#include <bits/signum.h> +#include <sys/file.h> #include <stdarg.h> #include <seccomp.h> diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 36d25d6..21d517f 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -42,6 +42,9 @@ typedef struct sandbox_cfg_elem sandbox_cfg_t; #ifndef __USE_GNU #define __USE_GNU #endif +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include <sys/ucontext.h> #include <seccomp.h> #include <netdb.h>

1 0

[tor/master] Fix compilation of sandbox.[ch] under musl-libc
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 50148dc45dc0e20abc5b63791ad3da417bf970bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 10:35:45 2015 -0400 Fix compilation of sandbox.[ch] under musl-libc Patch from jamestk; fix on 0.2.5.1-alpha. Fixes 17347. --- changes/bug17347 | 4 ++++ src/common/sandbox.c | 2 +- src/common/sandbox.h | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug17347 b/changes/bug17347 new file mode 100644 index 0000000..487b132 --- /dev/null +++ b/changes/bug17347 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix compilation of sandbox.c with musl-libc. + Fixes bug 17347; bugfix on 0.2.5.1-alpha. + Patch from 'jamestk'. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 161eab7..b995762 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -48,7 +48,7 @@ #include <sys/epoll.h> #include <sys/prctl.h> #include <linux/futex.h> -#include <bits/signum.h> +#include <sys/file.h> #include <stdarg.h> #include <seccomp.h> diff --git a/src/common/sandbox.h b/src/common/sandbox.h index 36d25d6..21d517f 100644 --- a/src/common/sandbox.h +++ b/src/common/sandbox.h @@ -42,6 +42,9 @@ typedef struct sandbox_cfg_elem sandbox_cfg_t; #ifndef __USE_GNU #define __USE_GNU #endif +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif #include <sys/ucontext.h> #include <seccomp.h> #include <netdb.h>

1 0

[tor/master] Merge branch 'bug17347'
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit fa4a81518a92e8e414c3911e480cfcc2175cb6b6 Merge: 4e5e93a 50148dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 10:36:29 2015 -0400 Merge branch 'bug17347' changes/bug17347 | 4 ++++ src/common/sandbox.c | 2 +- src/common/sandbox.h | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] blank line at eof for test_address.c
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 4e5e93a74b01be4177a60889d4ea4713a98cb4ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 10:22:33 2015 -0400 blank line at eof for test_address.c --- src/test/test_address.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_address.c b/src/test/test_address.c index b925608..7ffdcfe 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -1080,3 +1080,4 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(tor_addr_eq_ipv4h, 0), END_OF_TESTCASES }; +

1 0

[tor/master] Add several tests for address.h
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 73ba9f337c8eb04d39096c78446273bb1653eb05 Author: Ola Bini <ola(a)olabini.se> Date: Tue Sep 15 15:49:54 2015 +0200 Add several tests for address.h --- src/test/test_address.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 131 insertions(+), 1 deletion(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 9d64563..6ca1c59 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -634,6 +634,132 @@ test_address_udp_socket_trick_blackbox(void *arg) return; } + +static void +test_address_tor_addr_to_in6(void *ignored) +{ + (void)ignored; + tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); + const struct in6_addr *res; + + a->family = AF_INET; + res = tor_addr_to_in6(a); + tt_assert(!res); + + a->family = AF_INET6; + a->addr.in6_addr.s6_addr[0] = 42; + res = tor_addr_to_in6(a); + tt_assert(res); + tt_int_op(res->s6_addr[0], OP_EQ, 42); + + done: + (void)0; +} + +static void +test_address_tor_addr_to_in(void *ignored) +{ + (void)ignored; + tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); + const struct in_addr *res; + + a->family = AF_INET6; + res = tor_addr_to_in(a); + tt_assert(!res); + + a->family = AF_INET; + a->addr.in_addr.s_addr = 44; + res = tor_addr_to_in(a); + tt_assert(res); + tt_int_op(res->s_addr, OP_EQ, 44); + + done: + (void)0; +} + +static void +test_address_tor_addr_to_ipv4n(void *ignored) +{ + (void)ignored; + tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); + uint32_t res; + + a->family = AF_INET6; + res = tor_addr_to_ipv4n(a); + tt_assert(!res); + + a->family = AF_INET; + a->addr.in_addr.s_addr = 43; + res = tor_addr_to_ipv4n(a); + tt_assert(res); + tt_int_op(res, OP_EQ, 43); + + done: + (void)0; +} + + +static void +test_address_tor_addr_to_mapped_ipv4h(void *ignored) +{ + (void)ignored; + tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); + uint32_t res; + + a->family = AF_INET; + res = tor_addr_to_mapped_ipv4h(a); + tt_assert(!res); + + a->family = AF_INET6; + + a->addr.in6_addr.s6_addr[0] = 0; + a->addr.in6_addr.s6_addr[1] = 0; + a->addr.in6_addr.s6_addr[2] = 0; + a->addr.in6_addr.s6_addr[3] = 0; + a->addr.in6_addr.s6_addr[4] = 0; + a->addr.in6_addr.s6_addr[5] = 0; + a->addr.in6_addr.s6_addr[6] = 0; + a->addr.in6_addr.s6_addr[7] = 0; + a->addr.in6_addr.s6_addr[8] = 0; + a->addr.in6_addr.s6_addr[9] = 0; + a->addr.in6_addr.s6_addr[10] = 255; + a->addr.in6_addr.s6_addr[11] = 255; + a->addr.in6_addr.s6_addr[12] = 0; + a->addr.in6_addr.s6_addr[13] = 0; + a->addr.in6_addr.s6_addr[14] = 0; + a->addr.in6_addr.s6_addr[15] = 42; + res = tor_addr_to_mapped_ipv4h(a); + tt_assert(res); + tt_int_op(res, OP_EQ, 42); + + done: + (void)0; +} + +static void +test_address_tor_addr_eq_ipv4h(void *ignored) +{ + (void)ignored; + tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); + int res; + + a->family = AF_INET6; + res = tor_addr_eq_ipv4h(a, 42); + tt_assert(!res); + + a->family = AF_INET; + a->addr.in_addr.s_addr = 52; + res = tor_addr_eq_ipv4h(a, 42); + tt_assert(!res); + + a->addr.in_addr.s_addr = 52; + res = tor_addr_eq_ipv4h(a, ntohl(52)); + tt_assert(res); + + done: + (void)0; +} + #define ADDRESS_TEST(name, flags) \ { #name, test_address_ ## name, flags, NULL, NULL } @@ -652,6 +778,10 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(get_if_addrs_ioctl, TT_FORK), ADDRESS_TEST(ifreq_to_smartlist, 0), #endif + ADDRESS_TEST(tor_addr_to_in6, 0), + ADDRESS_TEST(tor_addr_to_in, 0), + ADDRESS_TEST(tor_addr_to_ipv4n, 0), + ADDRESS_TEST(tor_addr_to_mapped_ipv4h, 0), + ADDRESS_TEST(tor_addr_eq_ipv4h, 0), END_OF_TESTCASES }; -

1 0

[tor/master] Fix spaces
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit fb5cefbfa0364fc7189706aa765d3033fc9c2458 Author: Ola Bini <ola(a)olabini.se> Date: Mon Oct 5 10:07:31 2015 -0500 Fix spaces --- src/test/test_address.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index b696ef8..57a4f9f 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -634,14 +634,14 @@ test_address_udp_socket_trick_blackbox(void *arg) return; } - static void test_address_tor_addr_to_in6(void *ignored) { (void)ignored; tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); const struct in6_addr *res; - uint8_t expected[16] = {42, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; + uint8_t expected[16] = {42, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15}; a->family = AF_INET; res = tor_addr_to_in6(a); @@ -699,7 +699,6 @@ test_address_tor_addr_to_ipv4n(void *ignored) (void)0; } - static void test_address_tor_addr_to_mapped_ipv4h(void *ignored) {

1 0

[tor/master] Test full IP addresses instead of just one nibble
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 987c38e6c3fae55451989b2019870aad408fbca9 Author: Ola Bini <ola(a)olabini.se> Date: Mon Oct 5 10:01:10 2015 -0500 Test full IP addresses instead of just one nibble --- src/test/test_address.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 6ca1c59..b696ef8 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -641,16 +641,17 @@ test_address_tor_addr_to_in6(void *ignored) (void)ignored; tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); const struct in6_addr *res; + uint8_t expected[16] = {42, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; a->family = AF_INET; res = tor_addr_to_in6(a); tt_assert(!res); a->family = AF_INET6; - a->addr.in6_addr.s6_addr[0] = 42; + memcpy(a->addr.in6_addr.s6_addr, expected, 16); res = tor_addr_to_in6(a); tt_assert(res); - tt_int_op(res->s6_addr[0], OP_EQ, 42); + tt_mem_op(res->s6_addr, OP_EQ, expected, 16); done: (void)0; @@ -705,6 +706,7 @@ test_address_tor_addr_to_mapped_ipv4h(void *ignored) (void)ignored; tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); uint32_t res; + uint8_t toset[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 0, 42}; a->family = AF_INET; res = tor_addr_to_mapped_ipv4h(a); @@ -712,22 +714,7 @@ test_address_tor_addr_to_mapped_ipv4h(void *ignored) a->family = AF_INET6; - a->addr.in6_addr.s6_addr[0] = 0; - a->addr.in6_addr.s6_addr[1] = 0; - a->addr.in6_addr.s6_addr[2] = 0; - a->addr.in6_addr.s6_addr[3] = 0; - a->addr.in6_addr.s6_addr[4] = 0; - a->addr.in6_addr.s6_addr[5] = 0; - a->addr.in6_addr.s6_addr[6] = 0; - a->addr.in6_addr.s6_addr[7] = 0; - a->addr.in6_addr.s6_addr[8] = 0; - a->addr.in6_addr.s6_addr[9] = 0; - a->addr.in6_addr.s6_addr[10] = 255; - a->addr.in6_addr.s6_addr[11] = 255; - a->addr.in6_addr.s6_addr[12] = 0; - a->addr.in6_addr.s6_addr[13] = 0; - a->addr.in6_addr.s6_addr[14] = 0; - a->addr.in6_addr.s6_addr[15] = 42; + memcpy(a->addr.in6_addr.s6_addr, toset, 16); res = tor_addr_to_mapped_ipv4h(a); tt_assert(res); tt_int_op(res, OP_EQ, 42);

1 0

[tor/master] Merge remote-tracking branch 'twstrike/address_tests'
by nickm＠torproject.org 15 Oct '15

15 Oct '15

commit 0d8b8fa585ed50513f2f63c54ddba57a54d5be44 Merge: 49ccb7e fb5cefb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 10:21:42 2015 -0400 Merge remote-tracking branch 'twstrike/address_tests' src/test/test_address.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 117 insertions(+), 1 deletion(-) diff --cc src/test/test_address.c index de96998,57a4f9f..b925608 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@@ -679,262 -635,117 +679,374 @@@ test_address_udp_socket_trick_blackbox( } static void +test_address_get_if_addrs_list_internal(void *arg) +{ + smartlist_t *results = NULL; + + (void)arg; + + results = get_interface_address_list(LOG_ERR, 1); + + tt_assert(results != NULL); + /* When the network is down, a system might not have any non-local + * non-multicast addresseses, not even internal ones. + * Unit tests shouldn't fail because of this. */ + tt_int_op(smartlist_len(results),>=,0); + + tt_assert(!smartlist_contains_localhost_tor_addr(results)); + tt_assert(!smartlist_contains_multicast_tor_addr(results)); + /* The list may or may not contain internal addresses */ + + /* Allow unit tests to pass on IPv6-only machines */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv4_tor_addr(results) + || smartlist_contains_ipv6_tor_addr(results)); + } + + done: + free_interface_address_list(results); + return; +} + +static void +test_address_get_if_addrs_list_no_internal(void *arg) +{ + smartlist_t *results = NULL; + + (void)arg; + + results = get_interface_address_list(LOG_ERR, 0); + + tt_assert(results != NULL); + /* Work even on systems with only internal IPv4 addresses */ + tt_int_op(smartlist_len(results),>=,0); + + tt_assert(!smartlist_contains_localhost_tor_addr(results)); + tt_assert(!smartlist_contains_multicast_tor_addr(results)); + tt_assert(!smartlist_contains_internal_tor_addr(results)); + + /* if there are any addresses, they must be IPv4 */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv4_tor_addr(results)); + } + tt_assert(!smartlist_contains_ipv6_tor_addr(results)); + + done: + free_interface_address_list(results); + return; +} + +static void +test_address_get_if_addrs6_list_internal(void *arg) +{ + smartlist_t *results = NULL; + + (void)arg; + + results = get_interface_address6_list(LOG_ERR, AF_INET6, 1); + + tt_assert(results != NULL); + /* Work even on systems without IPv6 interfaces */ + tt_int_op(smartlist_len(results),>=,0); + + tt_assert(!smartlist_contains_localhost_tor_addr(results)); + tt_assert(!smartlist_contains_multicast_tor_addr(results)); + /* The list may or may not contain internal addresses */ + + /* if there are any addresses, they must be IPv6 */ + tt_assert(!smartlist_contains_ipv4_tor_addr(results)); + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv6_tor_addr(results)); + } + + done: + free_interface_address6_list(results); + return; +} + +static void +test_address_get_if_addrs6_list_no_internal(void *arg) +{ + smartlist_t *results = NULL; + + (void)arg; + + results = get_interface_address6_list(LOG_ERR, AF_INET6, 0); + + tt_assert(results != NULL); + /* Work even on systems without IPv6 interfaces */ + tt_int_op(smartlist_len(results),>=,0); + + tt_assert(!smartlist_contains_localhost_tor_addr(results)); + tt_assert(!smartlist_contains_multicast_tor_addr(results)); + tt_assert(!smartlist_contains_internal_tor_addr(results)); + + tt_assert(!smartlist_contains_ipv4_tor_addr(results)); + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv6_tor_addr(results)); + } + + done: + free_interface_address6_list(results); + return; +} + +static int called_get_interface_addresses_raw = 0; + +static smartlist_t * +mock_get_interface_addresses_raw_fail(int severity) +{ + (void)severity; + + called_get_interface_addresses_raw++; + return smartlist_new(); +} + +static int called_get_interface_address6_via_udp_socket_hack = 0; + +static int +mock_get_interface_address6_via_udp_socket_hack_fail(int severity, + sa_family_t family, + tor_addr_t *addr) +{ + (void)severity; + (void)family; + (void)addr; + + called_get_interface_address6_via_udp_socket_hack++; + return -1; +} + +static void +test_address_get_if_addrs_internal_fail(void *arg) +{ + smartlist_t *results1 = NULL, *results2 = NULL; + int rv = 0; + uint32_t ipv4h_addr = 0; + tor_addr_t ipv6_addr; + + memset(&ipv6_addr, 0, sizeof(tor_addr_t)); + + (void)arg; + + MOCK(get_interface_addresses_raw, + mock_get_interface_addresses_raw_fail); + MOCK(get_interface_address6_via_udp_socket_hack, + mock_get_interface_address6_via_udp_socket_hack_fail); + + results1 = get_interface_address6_list(LOG_ERR, AF_INET6, 1); + tt_assert(results1 != NULL); + tt_int_op(smartlist_len(results1),==,0); + + results2 = get_interface_address_list(LOG_ERR, 1); + tt_assert(results2 != NULL); + tt_int_op(smartlist_len(results2),==,0); + + rv = get_interface_address6(LOG_ERR, AF_INET6, &ipv6_addr); + tt_assert(rv == -1); + + rv = get_interface_address(LOG_ERR, &ipv4h_addr); + tt_assert(rv == -1); + + done: + UNMOCK(get_interface_addresses_raw); + UNMOCK(get_interface_address6_via_udp_socket_hack); + free_interface_address6_list(results1); + free_interface_address6_list(results2); + return; +} + +static void +test_address_get_if_addrs_no_internal_fail(void *arg) +{ + smartlist_t *results1 = NULL, *results2 = NULL; + + (void)arg; + + MOCK(get_interface_addresses_raw, + mock_get_interface_addresses_raw_fail); + MOCK(get_interface_address6_via_udp_socket_hack, + mock_get_interface_address6_via_udp_socket_hack_fail); + + results1 = get_interface_address6_list(LOG_ERR, AF_INET6, 0); + tt_assert(results1 != NULL); + tt_int_op(smartlist_len(results1),==,0); + + results2 = get_interface_address_list(LOG_ERR, 0); + tt_assert(results2 != NULL); + tt_int_op(smartlist_len(results2),==,0); + + done: + UNMOCK(get_interface_addresses_raw); + UNMOCK(get_interface_address6_via_udp_socket_hack); + free_interface_address6_list(results1); + free_interface_address6_list(results2); + return; +} + +static void +test_address_get_if_addrs(void *arg) +{ + int rv; + uint32_t addr_h = 0; + tor_addr_t tor_addr; + + (void)arg; + + rv = get_interface_address(LOG_ERR, &addr_h); + + /* When the network is down, a system might not have any non-local + * non-multicast IPv4 addresses, not even internal ones. + * Unit tests shouldn't fail because of this. */ + if (rv == 0) { + tor_addr_from_ipv4h(&tor_addr, addr_h); + + tt_assert(!tor_addr_is_loopback(&tor_addr)); + tt_assert(!tor_addr_is_multicast(&tor_addr)); + /* The address may or may not be an internal address */ + + tt_assert(tor_addr_is_v4(&tor_addr)); + } + + done: + return; +} + +static void +test_address_get_if_addrs6(void *arg) +{ + int rv; + tor_addr_t tor_addr; + + (void)arg; + + rv = get_interface_address6(LOG_ERR, AF_INET6, &tor_addr); + + /* Work even on systems without IPv6 interfaces */ + if (rv == 0) { + tt_assert(!tor_addr_is_loopback(&tor_addr)); + tt_assert(!tor_addr_is_multicast(&tor_addr)); + /* The address may or may not be an internal address */ + + tt_assert(!tor_addr_is_v4(&tor_addr)); + } + + done: + return; +} + ++static void + test_address_tor_addr_to_in6(void *ignored) + { + (void)ignored; + tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); + const struct in6_addr *res; + uint8_t expected[16] = {42, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15}; + + a->family = AF_INET; + res = tor_addr_to_in6(a); + tt_assert(!res); + + a->family = AF_INET6; + memcpy(a->addr.in6_addr.s6_addr, expected, 16); + res = tor_addr_to_in6(a); + tt_assert(res); + tt_mem_op(res->s6_addr, OP_EQ, expected, 16); + + done: + (void)0; + } + + static void + test_address_tor_addr_to_in(void *ignored) + { + (void)ignored; + tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); + const struct in_addr *res; + + a->family = AF_INET6; + res = tor_addr_to_in(a); + tt_assert(!res); + + a->family = AF_INET; + a->addr.in_addr.s_addr = 44; + res = tor_addr_to_in(a); + tt_assert(res); + tt_int_op(res->s_addr, OP_EQ, 44); + + done: + (void)0; + } + + static void + test_address_tor_addr_to_ipv4n(void *ignored) + { + (void)ignored; + tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); + uint32_t res; + + a->family = AF_INET6; + res = tor_addr_to_ipv4n(a); + tt_assert(!res); + + a->family = AF_INET; + a->addr.in_addr.s_addr = 43; + res = tor_addr_to_ipv4n(a); + tt_assert(res); + tt_int_op(res, OP_EQ, 43); + + done: + (void)0; + } + + static void + test_address_tor_addr_to_mapped_ipv4h(void *ignored) + { + (void)ignored; + tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); + uint32_t res; + uint8_t toset[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 0, 42}; + + a->family = AF_INET; + res = tor_addr_to_mapped_ipv4h(a); + tt_assert(!res); + + a->family = AF_INET6; + + memcpy(a->addr.in6_addr.s6_addr, toset, 16); + res = tor_addr_to_mapped_ipv4h(a); + tt_assert(res); + tt_int_op(res, OP_EQ, 42); + + done: + (void)0; + } + + static void + test_address_tor_addr_eq_ipv4h(void *ignored) + { + (void)ignored; + tor_addr_t *a = tor_malloc_zero(sizeof(tor_addr_t)); + int res; + + a->family = AF_INET6; + res = tor_addr_eq_ipv4h(a, 42); + tt_assert(!res); + + a->family = AF_INET; + a->addr.in_addr.s_addr = 52; + res = tor_addr_eq_ipv4h(a, 42); + tt_assert(!res); + + a->addr.in_addr.s_addr = 52; + res = tor_addr_eq_ipv4h(a, ntohl(52)); + tt_assert(res); + + done: + (void)0; + } + #define ADDRESS_TEST(name, flags) \ { #name, test_address_ ## name, flags, NULL, NULL }

1 0