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

[tor/master] Merge remote-tracking branch 'public/decouple_conn_attach_2'
by nickm＠torproject.org 19 Nov '15

19 Nov '15

commit 118bdc3a6ddf14f89f77853078ab4c7cf24f8d94 Merge: 913fbf8 58edf92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 19 10:44:31 2015 -0500 Merge remote-tracking branch 'public/decouple_conn_attach_2' changes/decouple_conn_attach | 6 ++ src/or/circuituse.c | 8 +-- src/or/connection_edge.c | 162 ++++++++++++++++++++++++++++++++++++------ src/or/connection_edge.h | 6 +- src/or/main.c | 6 ++ src/or/rendclient.c | 11 +-- 6 files changed, 165 insertions(+), 34 deletions(-)

1 0

[tor/master] Be more conservative in scanning the list of pending streams
by nickm＠torproject.org 19 Nov '15

19 Nov '15

commit 84b3350c83a995a7668c16cb06ae069664dc0633 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 17 08:49:30 2015 -0500 Be more conservative in scanning the list of pending streams Now we only re-scan the list in the cases we did before: when we have a new circuit that we should try attaching to, or when we have added a new stream that we haven't tried to attach yet. This is part of 17590. --- src/or/circuituse.c | 6 +++--- src/or/connection_edge.c | 16 ++++++++++++++-- src/or/connection_edge.h | 2 +- src/or/main.c | 8 ++++---- src/or/rendclient.c | 4 ++-- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 3a1d154..5b24425 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1475,7 +1475,7 @@ circuit_has_opened(origin_circuit_t *circ) case CIRCUIT_PURPOSE_C_ESTABLISH_REND: rend_client_rendcirc_has_opened(circ); /* Start building an intro circ if we don't have one yet. */ - connection_ap_attach_pending(); + connection_ap_attach_pending(1); /* This isn't a call to circuit_try_attaching_streams because a * circuit in _C_ESTABLISH_REND state isn't connected to its * hidden service yet, thus we can't attach streams to it yet, @@ -1537,14 +1537,14 @@ void circuit_try_attaching_streams(origin_circuit_t *circ) { /* Attach streams to this circuit if we can. */ - connection_ap_attach_pending(); + connection_ap_attach_pending(1); /* The call to circuit_try_clearing_isolation_state here will do * nothing and return 0 if we didn't attach any streams to circ * above. */ if (circuit_try_clearing_isolation_state(circ)) { /* Maybe *now* we can attach some streams to this circuit. */ - connection_ap_attach_pending(); + connection_ap_attach_pending(1); } } diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index ce6bace..20a27dc 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -512,6 +512,8 @@ connection_edge_finished_connecting(edge_connection_t *edge_conn) /* XXXXX Free this list on exit. */ static smartlist_t *pending_entry_connections = NULL; +static int untried_pending_connections = 0; + /** Common code to connection_(ap|exit)_about_to_close. */ static void connection_edge_about_to_close(edge_connection_t *edge_conn) @@ -766,24 +768,31 @@ connection_ap_rescan_and_attach_pending(void) "in pending_entry_connections, but wasn't. No worries; " "adding it.", pending_entry_connections); + untried_pending_connections = 1; smartlist_add(pending_entry_connections, entry_conn); } } SMARTLIST_FOREACH_END(conn); - connection_ap_attach_pending(); + connection_ap_attach_pending(1); } /** Tell any AP streams that are listed as waiting for a new circuit to try * again, either attaching to an available circ or launching a new one. + * + * If retry is false, only check the list if it contains at least one + * streams that we have not yet tried to attach to a circuit. */ void -connection_ap_attach_pending(void) +connection_ap_attach_pending(int retry) { if (PREDICT_UNLIKELY(!pending_entry_connections)) { return; } + if (untried_pending_connections == 0 && !retry) + return; + SMARTLIST_FOREACH_BEGIN(pending_entry_connections, entry_connection_t *, entry_conn) { connection_t *conn = ENTRY_TO_CONN(entry_conn); @@ -811,6 +820,8 @@ connection_ap_attach_pending(void) } } SMARTLIST_FOREACH_END(entry_conn); + + untried_pending_connections = 0; } /** Mark entry_conn as needing to get attached to a circuit. @@ -838,6 +849,7 @@ connection_ap_mark_as_pending_circuit(entry_connection_t *entry_conn) return; } + untried_pending_connections = 1; smartlist_add(pending_entry_connections, entry_conn); } diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 2030999..86f3fe9 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -65,7 +65,7 @@ int connection_ap_can_use_exit(const entry_connection_t *conn, const node_t *exit); void connection_ap_expire_beginning(void); void connection_ap_rescan_and_attach_pending(void); -void connection_ap_attach_pending(void); +void connection_ap_attach_pending(int retry); void connection_ap_mark_as_pending_circuit(entry_connection_t *entry_conn); void connection_ap_fail_onehop(const char *failed_digest, cpath_build_state_t *build_state); diff --git a/src/or/main.c b/src/or/main.c index bfa41b9..0fe818d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2505,10 +2505,10 @@ run_main_loop_once(void) } } - /* This should be pretty fast if nothing is pending. BUT... watch out; - * we need to make sure it doesn't show up in the profiles. five times a - * second would be enough, for instance. */ - connection_ap_attach_pending(); + /* This will be pretty fast if nothing new is pending. Note that this gets + * called once per libevent loop, which will make it happen once per group + * of events that fire, or once per second. */ + connection_ap_attach_pending(0); return 1; } diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 3846ef0..b8a4b2a 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -52,7 +52,7 @@ rend_client_introcirc_has_opened(origin_circuit_t *circ) tor_assert(circ->cpath); log_info(LD_REND,"introcirc is open"); - connection_ap_attach_pending(); + connection_ap_attach_pending(1); } /** Send the establish-rendezvous cell along a rendezvous circuit. if @@ -1107,7 +1107,7 @@ rend_client_rendezvous_acked(origin_circuit_t *circ, const uint8_t *request, * than trying to attach them all. See comments bug 743. */ /* If we already have the introduction circuit built, make sure we send * the INTRODUCE cell _now_ */ - connection_ap_attach_pending(); + connection_ap_attach_pending(1); return 0; }

1 0

[tor-messenger-build/master] Update Tor Messenger logo in Tor Launcher
by sukhbir＠torproject.org 18 Nov '15

18 Nov '15

commit 6df21ea934cc166a7d30d996c063db3792c093b2 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Nov 18 17:36:50 2015 -0500 Update Tor Messenger logo in Tor Launcher --- ChangeLog | 1 + projects/tor-launcher/build | 1 + projects/tor-launcher/config | 1 + projects/tor-launcher/default48.png | Bin 0 -> 1178 bytes projects/tor-launcher/logo.patch | 13 +++++++++++++ 5 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index e265878..058bde8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Tor Messenger 0.1.0b4 -- * Use the FIREFOX_42_0_RELEASE tag on mozilla-release * Use the THUNDERBIRD_42_0b2_RELEASE tag on comm-release * Bug 16489: Prevent automatic logins at startup + * Update Tor Messenger logo in Tor Launcher * Mac * Bug 16476: Themes preference is positioned incorrectly * Bug 17456: Hang in preferences menu diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 50b73fd..8735d33 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -10,6 +10,7 @@ cp ../torbirdy.png src/chrome/skin/tbb-logo.png [% END -%] [% IF c("var/tor-messenger") -%] cp ../messenger.png src/chrome/skin/tbb-logo.png +cp ../default48.png src/chrome/skin/default48.png [% END -%] patch -p1 < ../logo.patch make package diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index a48b4e8..25c26b5 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -8,6 +8,7 @@ filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - filename: torbirdy.png - filename: messenger.png + - filename: default48.png - filename: logo.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' diff --git a/projects/tor-launcher/default48.png b/projects/tor-launcher/default48.png new file mode 100644 index 0000000..8381428 Binary files /dev/null and b/projects/tor-launcher/default48.png differ diff --git a/projects/tor-launcher/logo.patch b/projects/tor-launcher/logo.patch index 156c0a7..00b273b 100644 --- a/projects/tor-launcher/logo.patch +++ b/projects/tor-launcher/logo.patch @@ -13,3 +13,16 @@ index 646baa6..66a89a3 100644 margin-right: 20px; } +diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css +index d718452..5706f4d 100644 +--- a/src/chrome/skin/progress.css ++++ b/src/chrome/skin/progress.css +@@ -23,7 +23,7 @@ dialog { + #tbb-icon { + list-style-image: url("chrome://torlauncher/skin/default48.png"); + width: 48px; +- height: 48px; ++ height: 36px; + } + + #progressDesc {

1 0

[tor-messenger-build/master] Bump version to 0.1.0b4
by sukhbir＠torproject.org 18 Nov '15

18 Nov '15

commit fb253e8fccfd9816db23b43791627a72ff6e0516 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Nov 18 16:35:50 2015 -0500 Bump version to 0.1.0b4 --- ChangeLog | 1 - projects/tor-messenger/config | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79a90ae..e265878 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,5 @@ Tor Messenger 0.1.0b4 -- * All Platforms - * Bug 16478: Update certificate pane in preferences window * Bug 17492: Include default bridges configuration * Use tor and the pluggable transports from tor-browser 5.0.4 * Bug 17552: Instantbird throwing on XMPP non-MUC message stanzas w/ subject diff --git a/projects/tor-messenger/config b/projects/tor-messenger/config index 3b2d7c4..1a3430f 100644 --- a/projects/tor-messenger/config +++ b/projects/tor-messenger/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.1.0b3 +version: 0.1.0b4 filename: 'tor-messenger-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].[% c("var/filename_ext") %]' input_files: - name: instantbird

1 0

[tor/master] Update comments in get_interface_addresses_ioctl
by nickm＠torproject.org 18 Nov '15

18 Nov '15

commit 878b5738c25bf378f7e9a801eca623af2abde2b1 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Nov 18 23:30:25 2015 +1100 Update comments in get_interface_addresses_ioctl Comment-only change noting platforms that can return IPv6 addresses from SIOCGIFCONF (or SIOCGLIFCONF). --- src/common/address.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/address.c b/src/common/address.c index cfa8fd1..aef229b 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1469,7 +1469,8 @@ get_interface_addresses_ioctl(int severity) int fd; smartlist_t *result = NULL; - /* This interface, AFAICT, only supports AF_INET addresses */ + /* This interface, AFAICT, only supports AF_INET addresses, + * except on AIX. For Solaris, we could use SIOCGLIFCONF. */ fd = socket(AF_INET, SOCK_DGRAM, 0); if (fd < 0) { tor_log(severity, LD_NET, "socket failed: %s", strerror(errno));

1 0

[tor/master] Fixup 86eba14ac549: add errno.h for EPROTONOSUPPORT
by nickm＠torproject.org 18 Nov '15

18 Nov '15

commit 3351f69c757b23e89f3785a3d1215f7152c1836e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Nov 18 23:47:12 2015 +1100 Fixup 86eba14ac549: add errno.h for EPROTONOSUPPORT --- src/test/test_util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_util.c b/src/test/test_util.c index 9a10846..1a74973 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -20,6 +20,7 @@ #include <math.h> #include <ctype.h> #include <float.h> +#include <errno.h> /* XXXX this is a minimal wrapper to make the unit tests compile with the * changed tor_timegm interface. */

1 0

[tor/master] Really Fixup 86eba14ac549: error return values are negative
by nickm＠torproject.org 18 Nov '15

18 Nov '15

commit eed86892ddac634be61ddf5bcb8deb23d86512c4 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Nov 18 23:54:26 2015 +1100 Really Fixup 86eba14ac549: error return values are negative --- src/test/test_util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 1a74973..15eb2cf 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -20,7 +20,6 @@ #include <math.h> #include <ctype.h> #include <float.h> -#include <errno.h> /* XXXX this is a minimal wrapper to make the unit tests compile with the * changed tor_timegm interface. */ @@ -4344,7 +4343,7 @@ fd_is_nonblocking(tor_socket_t fd) #endif #ifdef EPROTONOSUPPORT -#define SOCKET_EPROTO(s) (s == EPROTONOSUPPORT) +#define SOCKET_EPROTO(s) (s == -EPROTONOSUPPORT) #else #define SOCKET_EPROTO(s) (0) #endif

1 0

[tor/master] Really Really Fixup 86eba14ac549: Windows support, error return values
by nickm＠torproject.org 18 Nov '15

18 Nov '15

commit a1ce111d32a105ce09e17974800e6cc3e239e60f Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Nov 19 00:13:58 2015 +1100 Really Really Fixup 86eba14ac549: Windows support, error return values --- src/test/test_util.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 15eb2cf..187cb23 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4342,11 +4342,8 @@ fd_is_nonblocking(tor_socket_t fd) } #endif -#ifdef EPROTONOSUPPORT -#define SOCKET_EPROTO(s) (s == -EPROTONOSUPPORT) -#else -#define SOCKET_EPROTO(s) (0) -#endif +#define ERRNO_IS_EPROTO(e) (e == SOCK_ERRNO(EPROTONOSUPPORT)) +#define SOCK_ERR_IS_EPROTO(s) ERRNO_IS_EPROTO(tor_socket_errno(s)) /* Test for tor_open_socket*, using IPv4 or IPv6 depending on arg. */ static void @@ -4364,7 +4361,7 @@ test_util_socket(void *arg) (void)arg; fd1 = tor_open_socket_with_extensions(domain, SOCK_STREAM, 0, 0, 0); - if (SOCKET_EPROTO(fd1)) { + if (SOCK_ERR_IS_EPROTO(fd1)) { /* Assume we're on an IPv4-only or IPv6-only system, and give up now. */ goto done; } @@ -4427,7 +4424,7 @@ test_util_socketpair(void *arg) int socketpair_result = 0; socketpair_result = tor_socketpair_fn(family, SOCK_STREAM, 0, fds); - if (ersatz && SOCKET_EPROTO(socketpair_result)) { + if (ersatz && ERRNO_IS_EPROTO(-socketpair_result)) { /* Assume we're on an IPv6-only system, and give up now. * (tor_ersatz_socketpair uses IPv4.) */ goto done;

1 0

[tor/master] Merge remote-tracking branch 'teor/bug17632-no-ipv4-no-localhost'
by nickm＠torproject.org 18 Nov '15

18 Nov '15

commit 913fbf8f2f9eea36ccef6100608295d8c8ce449a Merge: 85bb710 a1ce111 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 18 15:02:45 2015 -0500 Merge remote-tracking branch 'teor/bug17632-no-ipv4-no-localhost' changes/bug17632-no-ipv4-no-localhost | 7 ++++ src/common/address.c | 3 +- src/test/test_address.c | 65 +++++++++++++++++++++++++++++---- src/test/test_util.c | 37 +++++++++++++++---- 4 files changed, 96 insertions(+), 16 deletions(-)

1 0

[tor/master] Fix unit tests on systems without IPv4 or localhost addresses
by nickm＠torproject.org 18 Nov '15

18 Nov '15

commit 86eba14ac5495cb031669b7e495d5e85653535f2 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Nov 18 23:25:21 2015 +1100 Fix unit tests on systems without IPv4 or localhost addresses Make unit tests pass on IPv6-only systems, and systems without localhost addresses (like some FreeBSD jails). Fixes: * get_if_addrs_ifaddrs: systems without localhost * get_if_addrs_ioctl: only works on IPv4 systems * socket: check IPv4 and IPv6, skip on EPROTONOSUPPORT * socketpair_ersatz: uses IPv4, skip on EPROTONOSUPPORT Fixes bug #17632; bugfix on unit tests in 0.2.7.3-rc. c464a367728d was a partial fix for this issue in #17255; it was released in unit tests in 0.2.7.4-rc. Patch by "teor". --- changes/bug17632-no-ipv4-no-localhost | 7 ++++ src/test/test_address.c | 65 +++++++++++++++++++++++++++++---- src/test/test_util.c | 40 ++++++++++++++++---- 3 files changed, 97 insertions(+), 15 deletions(-) diff --git a/changes/bug17632-no-ipv4-no-localhost b/changes/bug17632-no-ipv4-no-localhost new file mode 100644 index 0000000..0462207 --- /dev/null +++ b/changes/bug17632-no-ipv4-no-localhost @@ -0,0 +1,7 @@ + o Minor bugfix (unit tests): + - Make unit tests pass on IPv6-only systems, and systems without + localhost addresses (like some FreeBSD jails). + Fixes bug #17632; bugfix on unit tests in 0.2.7.3-rc. + c464a367728d was a partial fix for this issue in #17255; + it was released in unit tests in 0.2.7.4-rc. + Patch by "teor". diff --git a/src/test/test_address.c b/src/test/test_address.c index 7368b05..9f3d81c 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -119,6 +119,21 @@ smartlist_contains_internal_tor_addr(smartlist_t *smartlist) } /** Return 1 iff smartlist contains a tor_addr_t structure + * that is NULL or the null tor_addr_t. Otherwise, return 0. + */ +static int +smartlist_contains_null_tor_addr(smartlist_t *smartlist) +{ + SMARTLIST_FOREACH_BEGIN(smartlist, tor_addr_t *, tor_addr) { + if (tor_addr == NULL || tor_addr_is_null(tor_addr)) { + return 1; + } + } SMARTLIST_FOREACH_END(tor_addr); + + return 0; +} + +/** Return 1 iff smartlist contains a tor_addr_t structure * that is an IPv4 address. Otherwise, return 0. */ static int @@ -268,8 +283,18 @@ test_address_get_if_addrs_ifaddrs(void *arg) results = get_interface_addresses_ifaddrs(LOG_ERR); - tt_int_op(smartlist_len(results),>=,1); - tt_assert(smartlist_contains_localhost_tor_addr(results)); + tt_assert(results); + /* Some FreeBSD jails don't have localhost IP address. Instead, they only + * have the address assigned to the jail (whatever that may be). + * And a jail without a network connection might not have any addresses at + * all. */ + tt_assert(!smartlist_contains_null_tor_addr(results)); + + /* If there are addresses, they must be IPv4 or IPv6 */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv4_tor_addr(results) + || smartlist_contains_ipv6_tor_addr(results)); + } done: SMARTLIST_FOREACH(results, tor_addr_t *, t, tor_free(t)); @@ -293,6 +318,13 @@ test_address_get_if_addrs_win32(void *arg) tt_int_op(smartlist_len(results),>=,1); tt_assert(smartlist_contains_localhost_tor_addr(results)); + tt_assert(!smartlist_contains_null_tor_addr(results)); + + /* If there are addresses, they must be IPv4 or IPv6 */ + if (smartlist_len(results) > 0) { + tt_assert(smartlist_contains_ipv4_tor_addr(results) + || smartlist_contains_ipv6_tor_addr(results)); + } done: SMARTLIST_FOREACH(results, tor_addr_t *, t, tor_free(t)); @@ -481,10 +513,24 @@ test_address_get_if_addrs_ioctl(void *arg) result = get_interface_addresses_ioctl(LOG_ERR); + /* On an IPv6-only system, this will fail and return NULL tt_assert(result); - tt_int_op(smartlist_len(result),>=,1); + */ - tt_assert(smartlist_contains_localhost_tor_addr(result)); + /* Some FreeBSD jails don't have localhost IP address. Instead, they only + * have the address assigned to the jail (whatever that may be). + * And a jail without a network connection might not have any addresses at + * all. */ + if (result) { + tt_assert(!smartlist_contains_null_tor_addr(result)); + + /* If there are addresses, they must be IPv4 or IPv6. + * (AIX supports IPv6 from SIOCGIFCONF.) */ + if (smartlist_len(result) > 0) { + tt_assert(smartlist_contains_ipv4_tor_addr(result) + || smartlist_contains_ipv6_tor_addr(result)); + } + } done: if (result) { @@ -696,12 +742,13 @@ test_address_get_if_addrs_list_internal(void *arg) 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 */ + tt_assert(!smartlist_contains_null_tor_addr(results)); - /* Allow unit tests to pass on IPv6-only machines */ + /* if there are any addresses, they must be IPv4 */ if (smartlist_len(results) > 0) { - tt_assert(smartlist_contains_ipv4_tor_addr(results) - || smartlist_contains_ipv6_tor_addr(results)); + tt_assert(smartlist_contains_ipv4_tor_addr(results)); } + tt_assert(!smartlist_contains_ipv6_tor_addr(results)); done: free_interface_address_list(results); @@ -724,6 +771,7 @@ test_address_get_if_addrs_list_no_internal(void *arg) 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_null_tor_addr(results)); /* if there are any addresses, they must be IPv4 */ if (smartlist_len(results) > 0) { @@ -752,6 +800,7 @@ test_address_get_if_addrs6_list_internal(void *arg) 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 */ + tt_assert(!smartlist_contains_null_tor_addr(results)); /* if there are any addresses, they must be IPv6 */ tt_assert(!smartlist_contains_ipv4_tor_addr(results)); @@ -780,7 +829,9 @@ test_address_get_if_addrs6_list_no_internal(void *arg) 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_null_tor_addr(results)); + /* 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)); diff --git a/src/test/test_util.c b/src/test/test_util.c index 208186c..9a10846 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4342,9 +4342,17 @@ fd_is_nonblocking(tor_socket_t fd) } #endif +#ifdef EPROTONOSUPPORT +#define SOCKET_EPROTO(s) (s == EPROTONOSUPPORT) +#else +#define SOCKET_EPROTO(s) (0) +#endif + +/* Test for tor_open_socket*, using IPv4 or IPv6 depending on arg. */ static void test_util_socket(void *arg) { + const int domain = !strcmp(arg, "4") ? AF_INET : AF_INET6; tor_socket_t fd1 = TOR_INVALID_SOCKET; tor_socket_t fd2 = TOR_INVALID_SOCKET; tor_socket_t fd3 = TOR_INVALID_SOCKET; @@ -4355,15 +4363,19 @@ test_util_socket(void *arg) (void)arg; - fd1 = tor_open_socket_with_extensions(AF_INET, SOCK_STREAM, 0, 0, 0); - fd2 = tor_open_socket_with_extensions(AF_INET, SOCK_STREAM, 0, 0, 1); + fd1 = tor_open_socket_with_extensions(domain, SOCK_STREAM, 0, 0, 0); + if (SOCKET_EPROTO(fd1)) { + /* Assume we're on an IPv4-only or IPv6-only system, and give up now. */ + goto done; + } + fd2 = tor_open_socket_with_extensions(domain, SOCK_STREAM, 0, 0, 1); tt_assert(SOCKET_OK(fd1)); tt_assert(SOCKET_OK(fd2)); tt_int_op(get_n_open_sockets(), OP_EQ, n + 2); - //fd3 = tor_open_socket_with_extensions(AF_INET, SOCK_STREAM, 0, 1, 0); - //fd4 = tor_open_socket_with_extensions(AF_INET, SOCK_STREAM, 0, 1, 1); - fd3 = tor_open_socket(AF_INET, SOCK_STREAM, 0); - fd4 = tor_open_socket_nonblocking(AF_INET, SOCK_STREAM, 0); + //fd3 = tor_open_socket_with_extensions(domain, SOCK_STREAM, 0, 1, 0); + //fd4 = tor_open_socket_with_extensions(domain, SOCK_STREAM, 0, 1, 1); + fd3 = tor_open_socket(domain, SOCK_STREAM, 0); + fd4 = tor_open_socket_nonblocking(domain, SOCK_STREAM, 0); tt_assert(SOCKET_OK(fd3)); tt_assert(SOCKET_OK(fd4)); tt_int_op(get_n_open_sockets(), OP_EQ, n + 4); @@ -4412,8 +4424,15 @@ test_util_socketpair(void *arg) int n = get_n_open_sockets(); tor_socket_t fds[2] = {TOR_INVALID_SOCKET, TOR_INVALID_SOCKET}; const int family = AF_UNIX; + int socketpair_result = 0; - tt_int_op(0, OP_EQ, tor_socketpair_fn(family, SOCK_STREAM, 0, fds)); + socketpair_result = tor_socketpair_fn(family, SOCK_STREAM, 0, fds); + if (ersatz && SOCKET_EPROTO(socketpair_result)) { + /* Assume we're on an IPv6-only system, and give up now. + * (tor_ersatz_socketpair uses IPv4.) */ + goto done; + } + tt_int_op(0, OP_EQ, socketpair_result); tt_assert(SOCKET_OK(fds[0])); tt_assert(SOCKET_OK(fds[1])); tt_int_op(get_n_open_sockets(), OP_EQ, n + 2); @@ -4433,6 +4452,8 @@ test_util_socketpair(void *arg) tor_close_socket(fds[1]); } +#undef SOCKET_EPROTO + static void test_util_max_mem(void *arg) { @@ -4636,7 +4657,10 @@ struct testcase_t util_tests[] = { UTIL_TEST(write_chunks_to_file, 0), UTIL_TEST(mathlog, 0), UTIL_TEST(weak_random, 0), - UTIL_TEST(socket, TT_FORK), + { "socket_ipv4", test_util_socket, TT_FORK, &passthrough_setup, + (void*)"4" }, + { "socket_ipv6", test_util_socket, TT_FORK, + &passthrough_setup, (void*)"6" }, { "socketpair", test_util_socketpair, TT_FORK, &passthrough_setup, (void*)"0" }, { "socketpair_ersatz", test_util_socketpair, TT_FORK,

1 0