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

[tor/release-0.2.6] Extract main part of main loop into a separate function
by nickm＠torproject.org 18 Mar '15

18 Mar '15

commit b78803f9f543c83bf50d0751eb160e80ed602eae Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 14 14:24:18 2015 -0400 Extract main part of main loop into a separate function For 15176; Shadow would like this. Based on a patch by Rob Jansen, but revised to have a minimal-sized diff. --- changes/ticket15176 | 3 +++ src/or/main.c | 23 ++++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/changes/ticket15176 b/changes/ticket15176 new file mode 100644 index 0000000..6d12723 --- /dev/null +++ b/changes/ticket15176 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Refactor main loop to extract the 'loop' part. This makes it easier + to run Tor under Shadow. Closes ticket 15176. diff --git a/src/or/main.c b/src/or/main.c index bc89458..f5bca4e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -97,6 +97,7 @@ static void second_elapsed_callback(periodic_timer_t *timer, void *args); static int conn_close_if_marked(int i); static void connection_start_reading_from_linked_conn(connection_t *conn); static int connection_should_read_from_linked_conn(connection_t *conn); +static int run_main_loop_until_done(void); /********* START VARIABLES **********/ @@ -1955,7 +1956,6 @@ do_hup(void) int do_main_loop(void) { - int loop_result; time_t now; /* initialize dns resolve map, spawn workers if needed */ @@ -2084,7 +2084,14 @@ do_main_loop(void) } #endif - for (;;) { + return run_main_loop_until_done(); +} + +static int +run_main_loop_once(void) +{ + int loop_result; + if (1) { if (nt_service_is_stopping()) return 0; @@ -2125,10 +2132,20 @@ do_main_loop(void) log_debug(LD_NET,"libevent call interrupted."); /* You can't trust the results of this poll(). Go back to the * top of the big for loop. */ - continue; + return 1; } } } + return 1; +} + +static int +run_main_loop_until_done(void) +{ + int loop_result = 1; + while ((loop_result = run_main_loop_once()) == 1) + continue; + return loop_result; } #ifndef _WIN32 /* Only called when we're willing to use signals */

1 0

[tor/release-0.2.6] Add comments for new functions
by nickm＠torproject.org 18 Mar '15

18 Mar '15

commit ddb1889eb8bc128ec0fca35f15b1bf90d2b629ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 14 14:27:33 2015 -0400 Add comments for new functions --- src/or/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 888dabe..dd21b1a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2087,6 +2087,10 @@ do_main_loop(void) return run_main_loop_until_done(); } +/** + * Run the main loop a single time. Return 0 for "exit"; -1 for "exit with + * error", and 1 for "run this again." + */ static int run_main_loop_once(void) { @@ -2139,6 +2143,11 @@ run_main_loop_once(void) return 1; } +/** Run the run_main_loop_once() function until it declares itself done, + * and return its final return value. + * + * Shadow won't invoke this function, so don't fill it up with things. + */ static int run_main_loop_until_done(void) {

1 0

[tor/release-0.2.6] Simplify the loop.
by nickm＠torproject.org 18 Mar '15

18 Mar '15

commit a0f892f19094efd963564cf788be887f694be796 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 14 14:30:08 2015 -0400 Simplify the loop. --- src/or/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index dd21b1a..d0fe8cb 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2151,10 +2151,11 @@ run_main_loop_once(void) static int run_main_loop_until_done(void) { - int loop_result = 1; - while ((loop_result = run_main_loop_once()) == 1) - continue; - return loop_result; + int loop_result = 1; + do { + loop_result = run_main_loop_once(); + } while (loop_result == 1); + return loop_result; } #ifndef _WIN32 /* Only called when we're willing to use signals */

1 0

[tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
by nickm＠torproject.org 18 Mar '15

18 Mar '15

commit bbf304be26b5d677bb08d91e8c41a4ba478a1f63 Merge: 91f7771 a0f892f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 09:06:21 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6 changes/ticket15176 | 3 ++ src/or/main.c | 105 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 69 insertions(+), 39 deletions(-)

1 0

[tor/release-0.2.6] remove a needless "if (1)" that was there for indentation; fix indentation.
by nickm＠torproject.org 18 Mar '15

18 Mar '15

commit 92d04721a2a614e40d6393ccc64ff2e86b71d778 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 14 14:25:37 2015 -0400 remove a needless "if (1)" that was there for indentation; fix indentation. --- src/or/main.c | 76 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index f5bca4e..888dabe 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2091,51 +2091,51 @@ static int run_main_loop_once(void) { int loop_result; - if (1) { - if (nt_service_is_stopping()) - return 0; + + if (nt_service_is_stopping()) + return 0; #ifndef _WIN32 - /* Make it easier to tell whether libevent failure is our fault or not. */ - errno = 0; + /* Make it easier to tell whether libevent failure is our fault or not. */ + errno = 0; #endif - /* All active linked conns should get their read events activated. */ - SMARTLIST_FOREACH(active_linked_connection_lst, connection_t *, conn, - event_active(conn->read_event, EV_READ, 1)); - called_loop_once = smartlist_len(active_linked_connection_lst) ? 1 : 0; - - update_approx_time(time(NULL)); - - /* poll until we have an event, or the second ends, or until we have - * some active linked connections to trigger events for. */ - loop_result = event_base_loop(tor_libevent_get_base(), - called_loop_once ? EVLOOP_ONCE : 0); - - /* let catch() handle things like ^c, and otherwise don't worry about it */ - if (loop_result < 0) { - int e = tor_socket_errno(-1); - /* let the program survive things like ^z */ - if (e != EINTR && !ERRNO_IS_EINPROGRESS(e)) { - log_err(LD_NET,"libevent call with %s failed: %s [%d]", - tor_libevent_get_method(), tor_socket_strerror(e), e); - return -1; + /* All active linked conns should get their read events activated. */ + SMARTLIST_FOREACH(active_linked_connection_lst, connection_t *, conn, + event_active(conn->read_event, EV_READ, 1)); + called_loop_once = smartlist_len(active_linked_connection_lst) ? 1 : 0; + + update_approx_time(time(NULL)); + + /* poll until we have an event, or the second ends, or until we have + * some active linked connections to trigger events for. */ + loop_result = event_base_loop(tor_libevent_get_base(), + called_loop_once ? EVLOOP_ONCE : 0); + + /* let catch() handle things like ^c, and otherwise don't worry about it */ + if (loop_result < 0) { + int e = tor_socket_errno(-1); + /* let the program survive things like ^z */ + if (e != EINTR && !ERRNO_IS_EINPROGRESS(e)) { + log_err(LD_NET,"libevent call with %s failed: %s [%d]", + tor_libevent_get_method(), tor_socket_strerror(e), e); + return -1; #ifndef _WIN32 - } else if (e == EINVAL) { - log_warn(LD_NET, "EINVAL from libevent: should you upgrade libevent?"); - if (got_libevent_error()) - return -1; + } else if (e == EINVAL) { + log_warn(LD_NET, "EINVAL from libevent: should you upgrade libevent?"); + if (got_libevent_error()) + return -1; #endif - } else { - if (ERRNO_IS_EINPROGRESS(e)) - log_warn(LD_BUG, - "libevent call returned EINPROGRESS? Please report."); - log_debug(LD_NET,"libevent call interrupted."); - /* You can't trust the results of this poll(). Go back to the - * top of the big for loop. */ - return 1; - } + } else { + if (ERRNO_IS_EINPROGRESS(e)) + log_warn(LD_BUG, + "libevent call returned EINPROGRESS? Please report."); + log_debug(LD_NET,"libevent call interrupted."); + /* You can't trust the results of this poll(). Go back to the + * top of the big for loop. */ + return 1; } } + return 1; }

1 0

[tor/release-0.2.6] Fold everything into changelog, remove already-folded-in changes
by nickm＠torproject.org 18 Mar '15

18 Mar '15

commit 90a0a0ca7ae5495cf990d7694f11e4b454e5cf6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 18 09:07:52 2015 -0400 Fold everything into changelog, remove already-folded-in changes --- ChangeLog | 4 ++++ changes/bug15240 | 6 ------ changes/bug15245 | 5 ----- changes/bug9495_redux | 4 ---- changes/ticket15176 | 3 --- changes/ticket15212 | 6 ------ 6 files changed, 4 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1009be..2e86892 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,10 @@ Changes in version 0.2.6.5-?? - 2015-03-?? know if removing support for very old versions of the Tor protocols is harming the network. Closes ticket 15212. + o Code simplification and refactoring: + - Refactor main loop to extract the 'loop' part. This makes it + easier to run Tor under Shadow. Closes ticket 15176. + Changes in version 0.2.5.11 - 2015-03-17 Tor 0.2.5.11 is the second stable release in the 0.2.5 series. diff --git a/changes/bug15240 b/changes/bug15240 deleted file mode 100644 index e11f804..0000000 --- a/changes/bug15240 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes (pluggable transports): - - Initialize the extended OR Port authentication cookie before launching - pluggable transports. This prevents a race condition that occured when - server-side pluggable transports would cache the authentication cookie - before it has been (re)generated. Fixes bug 15240; bugfix on - 0.2.5.1-alpha. diff --git a/changes/bug15245 b/changes/bug15245 deleted file mode 100644 index 520a370..0000000 --- a/changes/bug15245 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Avoid crashing when making certain configuration option changes - on clients. Fixes bug 15245; bugfix on 0.2.6.3-alpha. Reported - by "anonym". - diff --git a/changes/bug9495_redux b/changes/bug9495_redux deleted file mode 100644 index 74b0cdf..0000000 --- a/changes/bug9495_redux +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes (portability): - - Do not crash on startup when running on Solaris. Fixes a bug - related to our fix for 9495; bugfix on 0.2.6.1-alpha. Reported - by "ruebezahl". diff --git a/changes/ticket15176 b/changes/ticket15176 deleted file mode 100644 index 6d12723..0000000 --- a/changes/ticket15176 +++ /dev/null @@ -1,3 +0,0 @@ - o Code simplification and refactoring: - - Refactor main loop to extract the 'loop' part. This makes it easier - to run Tor under Shadow. Closes ticket 15176. diff --git a/changes/ticket15212 b/changes/ticket15212 deleted file mode 100644 index 2c41e38..0000000 --- a/changes/ticket15212 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor features (heartbeat): - - - On relays, report how many connections we negotiated using each - version of the Tor link protocols. This information will let us - know if removing support for very old versions of the Tor - protocols is harming the network. Closes ticket 15212.

1 0

[tor/master] Extract main part of main loop into a separate function
by nickm＠torproject.org 18 Mar '15

18 Mar '15

commit b78803f9f543c83bf50d0751eb160e80ed602eae Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 14 14:24:18 2015 -0400 Extract main part of main loop into a separate function For 15176; Shadow would like this. Based on a patch by Rob Jansen, but revised to have a minimal-sized diff. --- changes/ticket15176 | 3 +++ src/or/main.c | 23 ++++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/changes/ticket15176 b/changes/ticket15176 new file mode 100644 index 0000000..6d12723 --- /dev/null +++ b/changes/ticket15176 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Refactor main loop to extract the 'loop' part. This makes it easier + to run Tor under Shadow. Closes ticket 15176. diff --git a/src/or/main.c b/src/or/main.c index bc89458..f5bca4e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -97,6 +97,7 @@ static void second_elapsed_callback(periodic_timer_t *timer, void *args); static int conn_close_if_marked(int i); static void connection_start_reading_from_linked_conn(connection_t *conn); static int connection_should_read_from_linked_conn(connection_t *conn); +static int run_main_loop_until_done(void); /********* START VARIABLES **********/ @@ -1955,7 +1956,6 @@ do_hup(void) int do_main_loop(void) { - int loop_result; time_t now; /* initialize dns resolve map, spawn workers if needed */ @@ -2084,7 +2084,14 @@ do_main_loop(void) } #endif - for (;;) { + return run_main_loop_until_done(); +} + +static int +run_main_loop_once(void) +{ + int loop_result; + if (1) { if (nt_service_is_stopping()) return 0; @@ -2125,10 +2132,20 @@ do_main_loop(void) log_debug(LD_NET,"libevent call interrupted."); /* You can't trust the results of this poll(). Go back to the * top of the big for loop. */ - continue; + return 1; } } } + return 1; +} + +static int +run_main_loop_until_done(void) +{ + int loop_result = 1; + while ((loop_result = run_main_loop_once()) == 1) + continue; + return loop_result; } #ifndef _WIN32 /* Only called when we're willing to use signals */

1 0

[tor/master] remove a needless "if (1)" that was there for indentation; fix indentation.
by nickm＠torproject.org 18 Mar '15

18 Mar '15

commit 92d04721a2a614e40d6393ccc64ff2e86b71d778 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 14 14:25:37 2015 -0400 remove a needless "if (1)" that was there for indentation; fix indentation. --- src/or/main.c | 76 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index f5bca4e..888dabe 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2091,51 +2091,51 @@ static int run_main_loop_once(void) { int loop_result; - if (1) { - if (nt_service_is_stopping()) - return 0; + + if (nt_service_is_stopping()) + return 0; #ifndef _WIN32 - /* Make it easier to tell whether libevent failure is our fault or not. */ - errno = 0; + /* Make it easier to tell whether libevent failure is our fault or not. */ + errno = 0; #endif - /* All active linked conns should get their read events activated. */ - SMARTLIST_FOREACH(active_linked_connection_lst, connection_t *, conn, - event_active(conn->read_event, EV_READ, 1)); - called_loop_once = smartlist_len(active_linked_connection_lst) ? 1 : 0; - - update_approx_time(time(NULL)); - - /* poll until we have an event, or the second ends, or until we have - * some active linked connections to trigger events for. */ - loop_result = event_base_loop(tor_libevent_get_base(), - called_loop_once ? EVLOOP_ONCE : 0); - - /* let catch() handle things like ^c, and otherwise don't worry about it */ - if (loop_result < 0) { - int e = tor_socket_errno(-1); - /* let the program survive things like ^z */ - if (e != EINTR && !ERRNO_IS_EINPROGRESS(e)) { - log_err(LD_NET,"libevent call with %s failed: %s [%d]", - tor_libevent_get_method(), tor_socket_strerror(e), e); - return -1; + /* All active linked conns should get their read events activated. */ + SMARTLIST_FOREACH(active_linked_connection_lst, connection_t *, conn, + event_active(conn->read_event, EV_READ, 1)); + called_loop_once = smartlist_len(active_linked_connection_lst) ? 1 : 0; + + update_approx_time(time(NULL)); + + /* poll until we have an event, or the second ends, or until we have + * some active linked connections to trigger events for. */ + loop_result = event_base_loop(tor_libevent_get_base(), + called_loop_once ? EVLOOP_ONCE : 0); + + /* let catch() handle things like ^c, and otherwise don't worry about it */ + if (loop_result < 0) { + int e = tor_socket_errno(-1); + /* let the program survive things like ^z */ + if (e != EINTR && !ERRNO_IS_EINPROGRESS(e)) { + log_err(LD_NET,"libevent call with %s failed: %s [%d]", + tor_libevent_get_method(), tor_socket_strerror(e), e); + return -1; #ifndef _WIN32 - } else if (e == EINVAL) { - log_warn(LD_NET, "EINVAL from libevent: should you upgrade libevent?"); - if (got_libevent_error()) - return -1; + } else if (e == EINVAL) { + log_warn(LD_NET, "EINVAL from libevent: should you upgrade libevent?"); + if (got_libevent_error()) + return -1; #endif - } else { - if (ERRNO_IS_EINPROGRESS(e)) - log_warn(LD_BUG, - "libevent call returned EINPROGRESS? Please report."); - log_debug(LD_NET,"libevent call interrupted."); - /* You can't trust the results of this poll(). Go back to the - * top of the big for loop. */ - return 1; - } + } else { + if (ERRNO_IS_EINPROGRESS(e)) + log_warn(LD_BUG, + "libevent call returned EINPROGRESS? Please report."); + log_debug(LD_NET,"libevent call interrupted."); + /* You can't trust the results of this poll(). Go back to the + * top of the big for loop. */ + return 1; } } + return 1; }

1 0

[tor/master] Add comments for new functions
by nickm＠torproject.org 18 Mar '15

18 Mar '15

commit ddb1889eb8bc128ec0fca35f15b1bf90d2b629ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 14 14:27:33 2015 -0400 Add comments for new functions --- src/or/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 888dabe..dd21b1a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2087,6 +2087,10 @@ do_main_loop(void) return run_main_loop_until_done(); } +/** + * Run the main loop a single time. Return 0 for "exit"; -1 for "exit with + * error", and 1 for "run this again." + */ static int run_main_loop_once(void) { @@ -2139,6 +2143,11 @@ run_main_loop_once(void) return 1; } +/** Run the run_main_loop_once() function until it declares itself done, + * and return its final return value. + * + * Shadow won't invoke this function, so don't fill it up with things. + */ static int run_main_loop_until_done(void) {

1 0

[tor/master] Simplify the loop.
by nickm＠torproject.org 18 Mar '15

18 Mar '15

commit a0f892f19094efd963564cf788be887f694be796 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 14 14:30:08 2015 -0400 Simplify the loop. --- src/or/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index dd21b1a..d0fe8cb 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2151,10 +2151,11 @@ run_main_loop_once(void) static int run_main_loop_until_done(void) { - int loop_result = 1; - while ((loop_result = run_main_loop_once()) == 1) - continue; - return loop_result; + int loop_result = 1; + do { + loop_result = run_main_loop_once(); + } while (loop_result == 1); + return loop_result; } #ifndef _WIN32 /* Only called when we're willing to use signals */

1 0