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

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 31 Mar '15

31 Mar '15

commit f090e9a2fb8017544461455fc640e86bb683a392 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 31 19:45:08 2015 +0000 Update translations for torcheck --- bg/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bg/torcheck.po b/bg/torcheck.po index c0585ce..fc0d74d 100644 --- a/bg/torcheck.po +++ b/bg/torcheck.po @@ -5,13 +5,14 @@ # Aleksandar Ivanov <ivanov.aleksandar.m(a)gmail.com>, 2013 # Etem Bavarian <mr.cyberpower(a)gmail.com>, 2014 # Gabriel Radev <gabosss(a)gmail.com>, 2015 +# iliev.mb <iliev.mb(a)gmail.com>, 2015 # Ivo, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2015-03-21 06:54+0000\n" -"Last-Translator: Gabriel Radev <gabosss(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-31 19:41+0000\n" +"Last-Translator: iliev.mb <iliev.mb(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -103,4 +104,4 @@ msgid "Run a Relay" msgstr "" msgid "Stay Anonymous" -msgstr "" +msgstr "Останете анонимни"

1 0

[tor/master] Add unit tests for control_event_is_interesting()
by nickm＠torproject.org 31 Mar '15

31 Mar '15

commit 99c10a95e408f8800e373735fd9a1eca0acc4df8 Author: teor <teor2345(a)gmail.com> Date: Sun Mar 22 14:22:56 2015 +1100 Add unit tests for control_event_is_interesting() Part of ticket 15431, checks for bugs similar to 13085. --- changes/ticket15431 | 4 ++ src/or/control.c | 2 +- src/or/control.h | 19 ++++++- src/test/test_controller_events.c | 99 +++++++++++++++++++++++++++++++++++++ 4 files changed, 122 insertions(+), 2 deletions(-) diff --git a/changes/ticket15431 b/changes/ticket15431 new file mode 100644 index 0000000..e35bab6 --- /dev/null +++ b/changes/ticket15431 @@ -0,0 +1,4 @@ + o Minor features (testing): + - Add unit tests for control_event_is_interesting(). + Part of ticket 15431, checks for bugs similar to 13085. + Patch by "teor". diff --git a/src/or/control.c b/src/or/control.c index 34d539b..5ec97bd 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -72,7 +72,7 @@ static int disable_log_messages = 0; /** Macro: true if any control connection is interested in events of type * e. */ #define EVENT_IS_INTERESTING(e) \ - (!! (global_event_mask & (((uint64_t)1)<<(e)))) + (!! (global_event_mask & EVENT_MASK_(e))) /** If we're using cookie-type authentication, how long should our cookies be? */ diff --git a/src/or/control.h b/src/or/control.h index 47a6018..9b0362a 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -123,6 +123,7 @@ void control_free_all(void); * because it is used both as a list of v0 event types, and as indices * into the bitfield to determine which controllers want which events. */ +/* This bitfield has no event zero 0x0000 */ #define EVENT_MIN_ 0x0001 #define EVENT_CIRCUIT_STATUS 0x0001 #define EVENT_STREAM_STATUS 0x0002 @@ -158,9 +159,25 @@ void control_free_all(void); #define EVENT_TRANSPORT_LAUNCHED 0x0020 #define EVENT_HS_DESC 0x0021 #define EVENT_MAX_ 0x0021 -/* If EVENT_MAX_ ever hits 0x003F, we need to make the mask into a + +/* sizeof(control_connection_t.event_mask) in bits, currently a uint64_t */ +#define EVENT_CAPACITY_ 0x0040 + +/* If EVENT_MAX_ ever hits 0x0040, we need to make the mask into a * different structure, as it can only handle a maximum left shift of 1<<63. */ +#define EVENT_MASK_(e) (((uint64_t)1)<<(e)) + +#define EVENT_MASK_NONE_ ((uint64_t)0x0) + +#define EVENT_MASK_ABOVE_MIN_ ((~((uint64_t)0x0)) << EVENT_MIN_) +#define EVENT_MASK_BELOW_MAX_ ((~((uint64_t)0x0)) \ + >> (EVENT_CAPACITY_ - EVENT_MAX_ \ + - EVENT_MIN_)) + +#define EVENT_MASK_ALL_ (EVENT_MASK_ABOVE_MIN_ \ + & EVENT_MASK_BELOW_MAX_) + /* Used only by control.c and test.c */ STATIC size_t write_escaped_data(const char *data, size_t len, char **out); STATIC size_t read_escaped_data(const char *data, size_t len, char **out); diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index e36314d..bd91aec 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@ -293,6 +293,104 @@ test_cntev_format_cell_stats(void *arg) tor_free(n_chan); } +static void +test_cntev_event_mask(void *arg) +{ + unsigned int test_event, selected_event; + (void)arg; + + /* Check that nothing is interesting when no events are set */ + control_testing_set_global_event_mask(EVENT_MASK_NONE_); + + /* Check that nothing is interesting between EVENT_MIN_ and EVENT_MAX_ */ + for (test_event = EVENT_MIN_; test_event <= EVENT_MAX_; test_event++) + tt_assert(!control_event_is_interesting(test_event)); + + /* Check that nothing is interesting outside EVENT_MIN_ to EVENT_MAX_ + * This will break if control_event_is_interesting() checks its arguments */ + for (test_event = 0; test_event < EVENT_MIN_; test_event++) + tt_assert(!control_event_is_interesting(test_event)); + for (test_event = EVENT_MAX_ + 1; + test_event < EVENT_CAPACITY_; + test_event++) + tt_assert(!control_event_is_interesting(test_event)); + + /* Check that all valid events are interesting when all events are set */ + control_testing_set_global_event_mask(EVENT_MASK_ALL_); + + /* Check that everything is interesting between EVENT_MIN_ and EVENT_MAX_ */ + for (test_event = EVENT_MIN_; test_event <= EVENT_MAX_; test_event++) + tt_assert(control_event_is_interesting(test_event)); + + /* Check that nothing is interesting outside EVENT_MIN_ to EVENT_MAX_ + * This will break if control_event_is_interesting() checks its arguments */ + for (test_event = 0; test_event < EVENT_MIN_; test_event++) + tt_assert(!control_event_is_interesting(test_event)); + for (test_event = EVENT_MAX_ + 1; + test_event < EVENT_CAPACITY_; + test_event++) + tt_assert(!control_event_is_interesting(test_event)); + + /* Check that only that event is interesting when a single event is set */ + for (selected_event = EVENT_MIN_; + selected_event <= EVENT_MAX_; + selected_event++) { + control_testing_set_global_event_mask(EVENT_MASK_(selected_event)); + + /* Check that only this event is interesting + * between EVENT_MIN_ and EVENT_MAX_ */ + for (test_event = EVENT_MIN_; test_event <= EVENT_MAX_; test_event++) { + if (test_event == selected_event) { + tt_assert(control_event_is_interesting(test_event)); + } else { + tt_assert(!control_event_is_interesting(test_event)); + } + } + + /* Check that nothing is interesting outside EVENT_MIN_ to EVENT_MAX_ + * This will break if control_event_is_interesting checks its arguments */ + for (test_event = 0; test_event < EVENT_MIN_; test_event++) + tt_assert(!control_event_is_interesting(test_event)); + for (test_event = EVENT_MAX_ + 1; + test_event < EVENT_CAPACITY_; + test_event++) + tt_assert(!control_event_is_interesting(test_event)); + } + + /* Check that only that event is not-interesting + * when a single event is un-set */ + for (selected_event = EVENT_MIN_; + selected_event <= EVENT_MAX_; + selected_event++) { + control_testing_set_global_event_mask( + EVENT_MASK_ALL_ + & ~(EVENT_MASK_(selected_event)) + ); + + /* Check that only this event is not-interesting + * between EVENT_MIN_ and EVENT_MAX_ */ + for (test_event = EVENT_MIN_; test_event <= EVENT_MAX_; test_event++) { + if (test_event == selected_event) { + tt_assert(!control_event_is_interesting(test_event)); + } else { + tt_assert(control_event_is_interesting(test_event)); + } + } + + /* Check that nothing is interesting outside EVENT_MIN_ to EVENT_MAX_ + * This will break if control_event_is_interesting checks its arguments */ + for (test_event = 0; test_event < EVENT_MIN_; test_event++) + tt_assert(!control_event_is_interesting(test_event)); + for (test_event = EVENT_MAX_ + 1; + test_event < EVENT_CAPACITY_; + test_event++) + tt_assert(!control_event_is_interesting(test_event)); + } + + done: + ; +} + #define TEST(name, flags) \ { #name, test_cntev_ ## name, flags, 0, NULL } @@ -302,6 +400,7 @@ struct testcase_t controller_event_tests[] = { TEST(sum_up_cell_stats, 0), TEST(append_cell_stats, 0), TEST(format_cell_stats, 0), + TEST(event_mask, 0), END_OF_TESTCASES };

1 0

[tor/master] Compile-time check that control_event_t.event_mask is big enough
by nickm＠torproject.org 31 Mar '15

31 Mar '15

commit b41a5039f1ee16ddbcb5cbef63d5ba9abf802834 Author: teor <teor2345(a)gmail.com> Date: Sun Mar 22 14:25:42 2015 +1100 Compile-time check that control_event_t.event_mask is big enough Add a compile-time check that the number of events doesn't exceed the capacity of control_event_t.event_mask. --- changes/ticket15431 | 4 +++- src/or/control.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/ticket15431 b/changes/ticket15431 index e35bab6..ea6821a 100644 --- a/changes/ticket15431 +++ b/changes/ticket15431 @@ -1,4 +1,6 @@ o Minor features (testing): - Add unit tests for control_event_is_interesting(). - Part of ticket 15431, checks for bugs similar to 13085. + Add a compile-time check that the number of events doesn't exceed + the capacity of control_event_t.event_mask. + Closes ticket 15431, checks for bugs similar to 13085. Patch by "teor". diff --git a/src/or/control.h b/src/or/control.h index 9b0362a..dbb80b1 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -166,6 +166,10 @@ void control_free_all(void); /* If EVENT_MAX_ ever hits 0x0040, we need to make the mask into a * different structure, as it can only handle a maximum left shift of 1<<63. */ +#if EVENT_MAX_ >= EVENT_CAPACITY_ +#error control_connection_t.event_mask has an event greater than its capacity +#endif + #define EVENT_MASK_(e) (((uint64_t)1)<<(e)) #define EVENT_MASK_NONE_ ((uint64_t)0x0)

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket15431-event-mask-tests'
by nickm＠torproject.org 31 Mar '15

31 Mar '15

commit 02c3879f8730021d0b8b7bc359895cbd9dda204f Merge: 725d615 b41a503 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 31 14:57:04 2015 -0400 Merge remote-tracking branch 'teor/ticket15431-event-mask-tests' changes/ticket15431 | 6 +++ src/or/control.c | 2 +- src/or/control.h | 23 ++++++++- src/test/test_controller_events.c | 99 +++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 2 deletions(-)

1 0

[tor/master] fix some compilation warnings
by nickm＠torproject.org 31 Mar '15

31 Mar '15

commit 725d6157df150ec9151450dc2422d9838c20187e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 31 14:42:01 2015 -0400 fix some compilation warnings --- src/test/test_address.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 317b370..4bd631d 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -454,7 +454,7 @@ test_address_get_if_addrs_ioctl(void *arg) #define FAKE_SOCKET_FD (42) -tor_socket_t +static tor_socket_t fake_open_socket(int domain, int type, int protocol) { (void)domain; @@ -468,7 +468,7 @@ static int last_connected_socket_fd = 0; static int connect_retval = 0; -tor_socket_t +static tor_socket_t pretend_to_connect(tor_socket_t socket, const struct sockaddr *address, socklen_t address_len) { @@ -482,11 +482,12 @@ pretend_to_connect(tor_socket_t socket, const struct sockaddr *address, static struct sockaddr *mock_addr = NULL; -int +static int fake_getsockname(tor_socket_t socket, struct sockaddr *address, socklen_t *address_len) { socklen_t bytes_to_copy = 0; + (void) socket; if (!mock_addr) return -1;

1 0

[tor/master] IPv6 case for whitebox test.
by nickm＠torproject.org 31 Mar '15

31 Mar '15

commit b5f84fde494833182a52a56d9f8584919915ec40 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Mar 15 15:32:16 2015 +0200 IPv6 case for whitebox test. --- src/test/test_address.c | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index bfa2905..7a9471f 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -504,14 +504,26 @@ int fake_getsockname(tor_socket_t socket, struct sockaddr *address, socklen_t *address_len) { + socklen_t bytes_to_copy = 0; + if (!mock_addr) return -1; - if (*address_len < sizeof(struct sockaddr)) + if (mock_addr->sa_family == AF_INET) { + bytes_to_copy = sizeof(struct sockaddr_in); + } else if (mock_addr->sa_family == AF_INET6) { + bytes_to_copy = sizeof(struct sockaddr_in6); + } else { + return -1; + } + + if (*address_len < bytes_to_copy) { return -1; + } + + memcpy(address,mock_addr,bytes_to_copy); + *address_len = bytes_to_copy; - memcpy(address,mock_addr,sizeof(struct sockaddr)); - *address_len = sizeof(mock_addr); return 0; } @@ -520,6 +532,9 @@ test_address_udp_socket_trick_whitebox(void *arg) { int hack_retval; tor_addr_t *addr_from_hack = tor_malloc_zero(sizeof(tor_addr_t)); + struct sockaddr_in6 *mock_addr6; + struct sockaddr_in6 *ipv6_to_check = + tor_malloc_zero(sizeof(struct sockaddr_in6)); (void)arg; @@ -527,7 +542,7 @@ test_address_udp_socket_trick_whitebox(void *arg) MOCK(tor_connect_socket,pretend_to_connect); MOCK(tor_getsockname,fake_getsockname); - mock_addr = tor_malloc_zero(sizeof(struct sockaddr)); + mock_addr = tor_malloc_zero(sizeof(struct sockaddr_storage)); sockaddr_in_from_string("23.32.246.118",(struct sockaddr_in *)mock_addr); hack_retval = @@ -537,11 +552,31 @@ test_address_udp_socket_trick_whitebox(void *arg) tt_int_op(hack_retval,==,0); tt_assert(tor_addr_eq_ipv4h(addr_from_hack, 0x1720f676)); + /* Now, lets do an IPv6 case. */ + memset(mock_addr,0,sizeof(struct sockaddr_storage)); + + mock_addr6 = (struct sockaddr_in6 *)mock_addr; + mock_addr6->sin6_family = AF_INET6; + mock_addr6->sin6_port = 0; + inet_pton(AF_INET6,"2001:cdba::3257:9652",&(mock_addr6->sin6_addr)); + + hack_retval = + get_interface_address6_via_udp_socket_hack(LOG_DEBUG, + AF_INET6, addr_from_hack); + + tt_int_op(hack_retval,==,0); + + tor_addr_to_sockaddr(addr_from_hack,0,(struct sockaddr *)ipv6_to_check, + sizeof(struct sockaddr_in6)); + + tt_assert(sockaddr_in6_are_equal(mock_addr6,ipv6_to_check)); + UNMOCK(tor_open_socket); UNMOCK(tor_connect_socket); UNMOCK(tor_getsockname); done: + tor_free(ipv6_to_check); tor_free(mock_addr); tor_free(addr_from_hack); return;

1 0

[tor/master] Remove unused function.
by nickm＠torproject.org 31 Mar '15

31 Mar '15

commit 5e759127f8a8e176d40a213d31f340f7ec3d0b0d Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Mar 17 21:23:12 2015 +0200 Remove unused function. --- src/test/test_address.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 7a9471f..859c146 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -452,24 +452,6 @@ test_address_get_if_addrs_ioctl(void *arg) #endif -/** Return 1 iff an address exactly equal to tor_addr is in - * smartlist. Otherwise, return 0. - */ -static int -smartlist_contain_tor_addr(smartlist_t *smartlist, tor_addr_t *tor_addr) -{ - int success = 0; - - SMARTLIST_FOREACH_BEGIN(smartlist, tor_addr_t *, a) { - if (tor_addr_compare(tor_addr,a,CMP_EXACT) == 0) { - success = 1; - break; - } - } SMARTLIST_FOREACH_END(a); - - return success; -} - #define FAKE_SOCKET_FD (42) tor_socket_t

1 0

[tor/master] Use tor_inet_pton() (not inet_pton()) in testcases.
by nickm＠torproject.org 31 Mar '15

31 Mar '15

commit 33fbb5011df19d6325e6b1e6e731fdf6b0f22f06 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Mar 22 15:22:02 2015 +0200 Use tor_inet_pton() (not inet_pton()) in testcases. --- src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 859c146..a69a605 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -130,8 +130,8 @@ test_address_ifaddrs_to_smartlist(void *arg) ipv6_sockaddr = tor_malloc(sizeof(struct sockaddr_in6)); ipv6_sockaddr->sin6_family = AF_INET6; ipv6_sockaddr->sin6_port = 0; - inet_pton(AF_INET6, "2001:db8:8714:3a90::12", - &(ipv6_sockaddr->sin6_addr)); + tor_inet_pton(AF_INET6, "2001:db8:8714:3a90::12", + &(ipv6_sockaddr->sin6_addr)); ifa = tor_malloc(sizeof(struct ifaddrs)); ifa_ipv4 = tor_malloc(sizeof(struct ifaddrs)); @@ -540,7 +540,7 @@ test_address_udp_socket_trick_whitebox(void *arg) mock_addr6 = (struct sockaddr_in6 *)mock_addr; mock_addr6->sin6_family = AF_INET6; mock_addr6->sin6_port = 0; - inet_pton(AF_INET6,"2001:cdba::3257:9652",&(mock_addr6->sin6_addr)); + tor_inet_pton(AF_INET6,"2001:cdba::3257:9652",&(mock_addr6->sin6_addr)); hack_retval = get_interface_address6_via_udp_socket_hack(LOG_DEBUG,

1 0

[tor/master] Changes file for 14710.
by nickm＠torproject.org 31 Mar '15

31 Mar '15

commit b49ffb2a21ccbcf62c3e38b822043b4302d8c26f Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Mar 22 16:04:46 2015 +0200 Changes file for 14710. --- changes/ticket14710 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/changes/ticket14710 b/changes/ticket14710 new file mode 100644 index 0000000..2b6cb20 --- /dev/null +++ b/changes/ticket14710 @@ -0,0 +1,10 @@ + o Code simplification and refactoring: + - Move the hacky fallback code out of get_interface_address6() + into separate function and get it covered with unit-tests. Resolves + ticket 14710. + + o Minor bugfixes: + - When attempting to use fallback technique for network interface + lookup, disregard loopback and multicast addresses since they are + unsuitable for public communications. +

1 0

[tor/master] Whitebox test for get_interface_address6_via_udp_socket_hack().
by nickm＠torproject.org 31 Mar '15

31 Mar '15

commit a4f89e21a6df0785f7e7714a7bf64d32f388e380 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Mar 14 20:20:50 2015 +0200 Whitebox test for get_interface_address6_via_udp_socket_hack(). Also, fix some whitespace mishaps. --- src/common/address.c | 8 ++--- src/common/compat.c | 20 +++++++++-- src/common/compat.h | 10 +++++- src/test/test_address.c | 86 ++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 113 insertions(+), 11 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 3e26576..e4aad43 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1529,13 +1529,14 @@ get_interface_address6_via_udp_socket_hack(int severity, goto err; } - if (connect(sock,(struct sockaddr *)&target_addr, addr_len) < 0) { + if (tor_connect_socket(sock,(struct sockaddr *)&target_addr, + addr_len) < 0) { int e = tor_socket_errno(sock); log_fn(severity, LD_NET, "connect() failed: %s", tor_socket_strerror(e)); goto err; } - if (getsockname(sock,(struct sockaddr*)&my_addr, &addr_len)) { + if (tor_getsockname(sock,(struct sockaddr*)&my_addr, &addr_len)) { int e = tor_socket_errno(sock); log_fn(severity, LD_NET, "getsockname() to determine interface failed: %s", tor_socket_strerror(e)); @@ -1546,8 +1547,7 @@ get_interface_address6_via_udp_socket_hack(int severity, if (tor_addr_is_loopback(addr) || tor_addr_is_multicast(addr)) { log_fn(severity, LD_NET, "Address that we determined via UDP socket" " magic is unsuitable for public comms."); - } - else { + } else { r=0; } } diff --git a/src/common/compat.c b/src/common/compat.c index fde65d9..18ab208 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1156,12 +1156,20 @@ mark_socket_open(tor_socket_t s) /** @} */ /** As socket(), but counts the number of open sockets. */ -tor_socket_t -tor_open_socket(int domain, int type, int protocol) +MOCK_IMPL(tor_socket_t, +tor_open_socket,(int domain, int type, int protocol)) { return tor_open_socket_with_extensions(domain, type, protocol, 1, 0); } +/** Mockable wrapper for connect(). */ +MOCK_IMPL(tor_socket_t, +tor_connect_socket,(tor_socket_t socket,const struct sockaddr *address, + socklen_t address_len)) +{ + return connect(socket,address,address_len); +} + /** As socket(), but creates a nonblocking socket and * counts the number of open sockets. */ tor_socket_t @@ -1308,6 +1316,14 @@ get_n_open_sockets(void) return n; } +/** Mockable wrapper for getsockname(). */ +MOCK_IMPL(int, +tor_getsockname,(tor_socket_t socket, struct sockaddr *address, + socklen_t *address_len)) +{ + return getsockname(socket, address, address_len); +} + /** Turn socket into a nonblocking socket. Return 0 on success, -1 * on failure. */ diff --git a/src/common/compat.h b/src/common/compat.h index 23f8614..18902e0 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -451,7 +451,8 @@ int tor_close_socket(tor_socket_t s); tor_socket_t tor_open_socket_with_extensions( int domain, int type, int protocol, int cloexec, int nonblock); -tor_socket_t tor_open_socket(int domain, int type, int protocol); +MOCK_DECL(tor_socket_t, +tor_open_socket,(int domain, int type, int protocol)); tor_socket_t tor_open_socket_nonblocking(int domain, int type, int protocol); tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len); @@ -462,8 +463,15 @@ tor_socket_t tor_accept_socket_with_extensions(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len, int cloexec, int nonblock); +MOCK_DECL(tor_socket_t, +tor_connect_socket,(tor_socket_t socket,const struct sockaddr *address, + socklen_t address_len)); int get_n_open_sockets(void); +MOCK_DECL(int, +tor_getsockname,(tor_socket_t socket, struct sockaddr *address, + socklen_t *address_len)); + #define tor_socket_send(s, buf, len, flags) send(s, buf, len, flags) #define tor_socket_recv(s, buf, len, flags) recv(s, buf, len, flags) diff --git a/src/test/test_address.c b/src/test/test_address.c index 2f37967..bfa2905 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -470,15 +470,92 @@ smartlist_contain_tor_addr(smartlist_t *smartlist, tor_addr_t *tor_addr) return success; } +#define FAKE_SOCKET_FD (42) + +tor_socket_t +fake_open_socket(int domain, int type, int protocol) +{ + (void)domain; + (void)type; + (void)protocol; + + return FAKE_SOCKET_FD; +} + +static int last_connected_socket_fd = 0; + +static int connect_retval = 0; + +tor_socket_t +pretend_to_connect(tor_socket_t socket, const struct sockaddr *address, + socklen_t address_len) +{ + (void)address; + (void)address_len; + + last_connected_socket_fd = socket; + + return connect_retval; +} + +static struct sockaddr *mock_addr = NULL; + +int +fake_getsockname(tor_socket_t socket, struct sockaddr *address, + socklen_t *address_len) +{ + if (!mock_addr) + return -1; + + if (*address_len < sizeof(struct sockaddr)) + return -1; + + memcpy(address,mock_addr,sizeof(struct sockaddr)); + *address_len = sizeof(mock_addr); + return 0; +} + +static void +test_address_udp_socket_trick_whitebox(void *arg) +{ + int hack_retval; + tor_addr_t *addr_from_hack = tor_malloc_zero(sizeof(tor_addr_t)); + + (void)arg; + + MOCK(tor_open_socket,fake_open_socket); + MOCK(tor_connect_socket,pretend_to_connect); + MOCK(tor_getsockname,fake_getsockname); + + mock_addr = tor_malloc_zero(sizeof(struct sockaddr)); + sockaddr_in_from_string("23.32.246.118",(struct sockaddr_in *)mock_addr); + + hack_retval = + get_interface_address6_via_udp_socket_hack(LOG_DEBUG, + AF_INET, addr_from_hack); + + tt_int_op(hack_retval,==,0); + tt_assert(tor_addr_eq_ipv4h(addr_from_hack, 0x1720f676)); + + UNMOCK(tor_open_socket); + UNMOCK(tor_connect_socket); + UNMOCK(tor_getsockname); + + done: + tor_free(mock_addr); + tor_free(addr_from_hack); + return; +} + static void test_address_udp_socket_trick_blackbox(void *arg) { - /* We want get_interface_address6_via_udp_socket_hack() to yield - * the same valid address that get_interface_address6() returns. - * If the latter is unable to find a valid address, we want + /* We want get_interface_address6_via_udp_socket_hack() to yield + * the same valid address that get_interface_address6() returns. + * If the latter is unable to find a valid address, we want * _hack() to fail and return-1. * - * Furthermore, we want _hack() never to crash, even if + * Furthermore, we want _hack() never to crash, even if * get_interface_addresses_raw() is returning NULL. */ @@ -531,6 +608,7 @@ test_address_udp_socket_trick_blackbox(void *arg) { #name, test_address_ ## name, flags, NULL, NULL } struct testcase_t address_tests[] = { + ADDRESS_TEST(udp_socket_trick_whitebox, TT_FORK), ADDRESS_TEST(udp_socket_trick_blackbox, TT_FORK), #ifdef HAVE_IFADDRS_TO_SMARTLIST ADDRESS_TEST(get_if_addrs_ifaddrs, TT_FORK),

1 0