tor-commits November 2015

tor-commits@lists.torproject.org

20 participants
856 discussions

[tor/master] Decouple ..attach_circuit() from most of its callers.
by nickm＠torproject.org 19 Nov '15

19 Nov '15

commit b1d56fc5890fb6d594e70520c09d040e9b2e1544 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 13 13:38:01 2015 -0500 Decouple ..attach_circuit() from most of its callers. Long ago we used to call connection_ap_handshake_attach_circuit() only in a few places, since connection_ap_attach_pending() attaches all the pending connections, and does so regularly. But this turned out to have a performance problem: it would introduce a delay to launching or connecting a stream. We couldn't just call connection_ap_attach_pending() every time we make a new connection, since it walks the whole connection list. So we started calling connection_ap_attach_pending all over, instead! But that's kind of ugly and messes up our callgraph. So instead, we now have connection_ap_attach_pending() use a list only of the pending connections, so we can call it much more frequently. We have a separate function to scan the whole connection array to see if we missed adding anything, and log a warning if so. Closes ticket #17590 --- changes/decouple_conn_attach | 6 ++ src/or/circuituse.c | 2 +- src/or/connection_edge.c | 143 +++++++++++++++++++++++++++++++++++------- src/or/connection_edge.h | 2 + src/or/main.c | 5 ++ src/or/rendclient.c | 7 +-- 6 files changed, 137 insertions(+), 28 deletions(-) diff --git a/changes/decouple_conn_attach b/changes/decouple_conn_attach new file mode 100644 index 0000000..6167b4e --- /dev/null +++ b/changes/decouple_conn_attach @@ -0,0 +1,6 @@ + o Code simplification and refactorings: + - Decouple the list of streams needing to be attached to circuits + from the overall connection list. This change makes it possible to + attach streams quickly while both simplifying Tor's callgraph and + avoiding O(N) scans of the entire connection list. Closes ticket + 17590. diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 00340fd..3a1d154 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1123,7 +1123,7 @@ circuit_build_needed_circs(time_t now) * don't require an exit circuit, review in #13814. * This allows HSs to function in a consensus without exits. */ if (router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN) - connection_ap_attach_pending(); + connection_ap_rescan_and_attach_pending(); /* make sure any hidden services have enough intro points * HS intro point streams only require an internal circuit */ diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 729ef8a..ce6bace 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -503,6 +503,15 @@ connection_edge_finished_connecting(edge_connection_t *edge_conn) return connection_edge_process_inbuf(edge_conn, 1); } +/** A list of all the entry_connection_t * objects that are not marked + * for close, and are in AP_CONN_STATE_CIRCUIT_WAIT. + * + * (Right now, we check in several places to make sure that this list is + * correct. When it's incorrect, we'll fix it, and log a BUG message.) + */ +/* XXXXX Free this list on exit. */ +static smartlist_t *pending_entry_connections = NULL; + /** Common code to connection_(ap|exit)_about_to_close. */ static void connection_edge_about_to_close(edge_connection_t *edge_conn) @@ -514,6 +523,27 @@ connection_edge_about_to_close(edge_connection_t *edge_conn) conn->marked_for_close_file, conn->marked_for_close); tor_fragile_assert(); } + + if (TO_CONN(edge_conn)->type != CONN_TYPE_AP || + PREDICT_UNLIKELY(NULL == pending_entry_connections)) + return; + + entry_connection_t *entry_conn = EDGE_TO_ENTRY_CONN(edge_conn); + + if (TO_CONN(edge_conn)->state == AP_CONN_STATE_CIRCUIT_WAIT) { + smartlist_remove(pending_entry_connections, entry_conn); + } + +#if 1 + /* Check to make sure that this isn't in pending_entry_connections if it + * didn't actually belong there. */ + if (TO_CONN(edge_conn)->type == CONN_TYPE_AP && + smartlist_contains(pending_entry_connections, entry_conn)) { + log_warn(LD_BUG, "What was %p doing in pending_entry_connections???", + entry_conn); + smartlist_remove(pending_entry_connections, entry_conn); + } +#endif } /** Called when we're about to finally unlink and free an AP (client) @@ -711,26 +741,104 @@ connection_ap_expire_beginning(void) } SMARTLIST_FOREACH_END(base_conn); } -/** Tell any AP streams that are waiting for a new circuit to try again, - * either attaching to an available circ or launching a new one. +/** + * As connection_ap_attach_pending, but first scans the entire connection + * array to see if any elements are missing. */ void -connection_ap_attach_pending(void) +connection_ap_rescan_and_attach_pending(void) { entry_connection_t *entry_conn; smartlist_t *conns = get_connection_array(); + + if (PREDICT_UNLIKELY(NULL == pending_entry_connections)) + pending_entry_connections = smartlist_new(); + SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { if (conn->marked_for_close || conn->type != CONN_TYPE_AP || conn->state != AP_CONN_STATE_CIRCUIT_WAIT) continue; + entry_conn = TO_ENTRY_CONN(conn); + if (! smartlist_contains(pending_entry_connections, entry_conn)) { + log_warn(LD_BUG, "Found a connection %p that was supposed to be " + "in pending_entry_connections, but wasn't. No worries; " + "adding it.", + pending_entry_connections); + smartlist_add(pending_entry_connections, entry_conn); + } + + } SMARTLIST_FOREACH_END(conn); + + connection_ap_attach_pending(); +} + +/** 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. + */ +void +connection_ap_attach_pending(void) +{ + if (PREDICT_UNLIKELY(!pending_entry_connections)) { + return; + } + + SMARTLIST_FOREACH_BEGIN(pending_entry_connections, + entry_connection_t *, entry_conn) { + connection_t *conn = ENTRY_TO_CONN(entry_conn); + if (conn->marked_for_close) { + SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); + continue; + } + if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { + log_warn(LD_BUG, "%p is no longer in circuit_wait. Why is it on " + "pending_entry_connections?", entry_conn); + SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); + continue; + } + if (connection_ap_handshake_attach_circuit(entry_conn) < 0) { if (!conn->marked_for_close) connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_CANT_ATTACH); } - } SMARTLIST_FOREACH_END(conn); + + if (conn->marked_for_close || + conn->type != CONN_TYPE_AP || + conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { + SMARTLIST_DEL_CURRENT(pending_entry_connections, entry_conn); + } + + } SMARTLIST_FOREACH_END(entry_conn); +} + +/** Mark entry_conn as needing to get attached to a circuit. + * + * And entry_conn must be in AP_CONN_STATE_CIRCUIT_WAIT, + * should not already be pending a circuit. The circuit will get + * launched or the connection will get attached the next time we + * call connection_ap_attach_pending(). + */ +void +connection_ap_mark_as_pending_circuit(entry_connection_t *entry_conn) +{ + connection_t *conn = ENTRY_TO_CONN(entry_conn); + tor_assert(conn->state == AP_CONN_STATE_CIRCUIT_WAIT); + if (conn->marked_for_close) + return; + + if (PREDICT_UNLIKELY(NULL == pending_entry_connections)) + pending_entry_connections = smartlist_new(); + + if (PREDICT_UNLIKELY(smartlist_contains(pending_entry_connections, + entry_conn))) { + log_warn(LD_BUG, "What?? pending_entry_connections already contains %p!", + entry_conn); + return; + } + + smartlist_add(pending_entry_connections, entry_conn); } /** Tell any AP streams that are waiting for a one-hop tunnel to @@ -851,12 +959,12 @@ connection_ap_detach_retriable(entry_connection_t *conn, * a tunneled directory connection, then just attach it. */ ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_CIRCUIT_WAIT; circuit_detach_stream(TO_CIRCUIT(circ),ENTRY_TO_EDGE_CONN(conn)); - return connection_ap_handshake_attach_circuit(conn); + connection_ap_mark_as_pending_circuit(conn); } else { ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_CONTROLLER_WAIT; circuit_detach_stream(TO_CIRCUIT(circ),ENTRY_TO_EDGE_CONN(conn)); - return 0; } + return 0; } /** Check if conn is using a dangerous port. Then warn and/or @@ -1454,10 +1562,12 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, /* If we were given a circuit to attach to, try to attach. Otherwise, * try to find a good one and attach to that. */ int rv; - if (circ) - rv = connection_ap_handshake_attach_chosen_circuit(conn, circ, cpath); - else - rv = connection_ap_handshake_attach_circuit(conn); + if (circ) { + rv = connection_ap_handshake_attach_chosen_circuit(conn, circ, cpath); + } else { + connection_ap_mark_as_pending_circuit(conn); + rv = 0; + } /* If the above function returned 0 then we're waiting for a circuit. * if it returned 1, we're attached. Both are okay. But if it returned @@ -1564,11 +1674,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, /* We have the descriptor so launch a connection to the HS. */ base_conn->state = AP_CONN_STATE_CIRCUIT_WAIT; log_info(LD_REND, "Descriptor is here. Great."); - if (connection_ap_handshake_attach_circuit(conn) < 0) { - if (!base_conn->marked_for_close) - connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH); - return -1; - } + connection_ap_mark_as_pending_circuit(conn); return 0; } @@ -2324,12 +2430,7 @@ connection_ap_make_link(connection_t *partner, control_event_stream_status(conn, STREAM_EVENT_NEW, 0); /* attaching to a dirty circuit is fine */ - if (connection_ap_handshake_attach_circuit(conn) < 0) { - if (!base_conn->marked_for_close) - connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH); - return NULL; - } - + connection_ap_mark_as_pending_circuit(conn); log_info(LD_APP,"... application connection created and linked."); return conn; } diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 7c0b9c0..2030999 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -64,7 +64,9 @@ int connection_edge_is_rendezvous_stream(edge_connection_t *conn); 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_mark_as_pending_circuit(entry_connection_t *entry_conn); void connection_ap_fail_onehop(const char *failed_digest, cpath_build_state_t *build_state); void circuit_discard_optional_exit_enclaves(extend_info_t *info); diff --git a/src/or/main.c b/src/or/main.c index afcb313..bfa41b9 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2505,6 +2505,11 @@ 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(); + return 1; } diff --git a/src/or/rendclient.c b/src/or/rendclient.c index a39e518..3846ef0 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -1226,12 +1226,7 @@ rend_client_desc_trynow(const char *query) base_conn->timestamp_lastread = now; base_conn->timestamp_lastwritten = now; - if (connection_ap_handshake_attach_circuit(conn) < 0) { - /* it will never work */ - log_warn(LD_REND,"Rendezvous attempt failed. Closing."); - if (!base_conn->marked_for_close) - connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH); - } + connection_ap_mark_as_pending_circuit(conn); } else { /* 404, or fetch didn't get that far */ log_notice(LD_REND,"Closing stream for '%s.onion': hidden service is " "unavailable (try again later).",

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] 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] 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] 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] 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] 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] 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

[tor/master] Fix a startup time assert caused by periodic events not being initialized.
by nickm＠torproject.org 18 Nov '15

18 Nov '15

commit 85bb71049ac582e886144fd74fb869f4c7bdc5a8 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Nov 18 11:27:24 2015 +0000 Fix a startup time assert caused by periodic events not being initialized. Loading a on disk bridge descriptor causes a directory download to be scheduled, which asserts due to the periodic events not being initialized yet. Fixes bug #17635, not in any released version of tor. --- src/or/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 0b8591f..7aeacd1 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2299,6 +2299,13 @@ do_main_loop(void) { time_t now; + /* initialize the periodic events first, so that code that depends on the + * events being present does not assert. + */ + if (! periodic_events_initialized) { + initialize_periodic_events(); + } + /* initialize dns resolve map, spawn workers if needed */ if (dns_init() < 0) { if (get_options()->ServerDNSAllowBrokenConfig) @@ -2401,10 +2408,6 @@ do_main_loop(void) tor_assert(second_timer); } - if (! periodic_events_initialized) { - initialize_periodic_events(); - } - #ifdef HAVE_SYSTEMD_209 uint64_t watchdog_delay; /* set up systemd watchdog notification. */

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2015