- tor-commits - lists.torproject.org

[tor/master] Add changes file for #3049
by nickm＠torproject.org 23 May '11

23 May '11

commit 76093af02ddd0d91225ec6ca064580f9d52fd644 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu May 19 16:45:09 2011 -0700 Add changes file for #3049 --- changes/feature3049 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/feature3049 b/changes/feature3049 new file mode 100644 index 0000000..7960a1f --- /dev/null +++ b/changes/feature3049 @@ -0,0 +1,6 @@ + o Major features: + - Add an __OwningControllerProcess configuration option and a + TAKEOWNERSHIP control-port command, so that a Tor controller can + ensure that when it exits, Tor will shut down. Implements + feature 3049. +

1 0

[tor/master] finish a comment nickm started in 8ebceeb3
by nickm＠torproject.org 23 May '11

23 May '11

commit 6b54edef4f93748e8247067242aad7158e82a148 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 18:34:55 2011 -0400 finish a comment nickm started in 8ebceeb3 --- src/or/router.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 0beb960..777441a 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -503,7 +503,8 @@ init_keys(void) if (!key_lock) key_lock = tor_mutex_new(); - /* There are a couple of paths that put us here before */ + /* There are a couple of paths that put us here before we've asked + * openssl to initialize itself. */ if (crypto_global_init(get_options()->HardwareAccel, get_options()->AccelName, get_options()->AccelDir)) {

1 0

[tor/master] naked constants are ugly
by nickm＠torproject.org 23 May '11

23 May '11

commit 1ba1bdee4bd8f3c00e603fe9b0fd2f14eeb60466 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 21 18:55:23 2011 -0400 naked constants are ugly --- src/or/router.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 777441a..184715b 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -490,8 +490,8 @@ init_keys(void) char fingerprint_line[MAX_NICKNAME_LEN+FINGERPRINT_LEN+3]; const char *mydesc; crypto_pk_env_t *prkey; - char digest[20]; - char v3_digest[20]; + char digest[DIGEST_LEN]; + char v3_digest[DIGEST_LEN]; char *cp; or_options_t *options = get_options(); authority_type_t type;

1 0

[tor/master] Split out owning-controller-loss shutdown code into a function
by nickm＠torproject.org 23 May '11

23 May '11

commit 7b34e3a9659a0f992dc43a568c2ea8af57e9c6d3 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri May 20 08:21:11 2011 -0700 Split out owning-controller-loss shutdown code into a function --- src/or/control.c | 57 +++++++++++++++++++++++------------------------------ 1 files changed, 25 insertions(+), 32 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index b6f802d..b7e9047 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2759,6 +2759,29 @@ connection_control_reached_eof(control_connection_t *conn) return 0; } +/** Shut down this Tor instance in the same way that SIGINT would, but + * with a log message appropriate for the loss of an owning controller. */ +static void +lost_owning_controller(const char *owner_type, const char *loss_manner) +{ + int shutdown_slowly = server_mode(get_options()); + + log_notice(LD_CONTROL, "Owning controller %s has %s -- %s.", + owner_type, loss_manner, + shutdown_slowly ? "shutting down" : "exiting now"); + + /* XXXX Perhaps this chunk of code should be a separate function, + * called here and by process_signal(SIGINT). */ + + if (!shutdown_slowly) { + tor_cleanup(); + exit(0); + } + /* XXXX This will close all listening sockets except control-port + * listeners. Perhaps we should close those too. */ + hibernate_begin_shutdown(); +} + /** Called when conn is being freed. */ void connection_control_closed(control_connection_t *conn) @@ -2769,22 +2792,7 @@ connection_control_closed(control_connection_t *conn) control_update_global_event_mask(); if (conn->is_owning_control_connection) { - int shutdown_slowly = server_mode(get_options()); - - log_notice(LD_CONTROL, "Owning controller connection has closed -- %s.", - shutdown_slowly ? "shutting down" : "exiting now"); - - /* XXXX This chunk of code should be a separate function, called - * here, in owning_controller_procmon_cb, and by - * process_signal(SIGINT). */ - - if (!shutdown_slowly) { - tor_cleanup(); - exit(0); - } - /* XXXX This will close all listening sockets except control-port - * listeners. Perhaps we should close those too. */ - hibernate_begin_shutdown(); + lost_owning_controller("connection", "closed"); } } @@ -3849,24 +3857,9 @@ static tor_process_monitor_t *owning_controller_process_monitor = NULL; static void owning_controller_procmon_cb(void *unused) { - int shutdown_slowly = server_mode(get_options()); - (void)unused; - log_notice(LD_CONTROL, "Owning controller process has vanished -- " - "%s.", - shutdown_slowly ? "shutting down" : "exiting now"); - - /* XXXX This chunk of code should be a separate function, called - * here, in connection_control_closed, and by process_signal(SIGINT). */ - - if (!shutdown_slowly) { - tor_cleanup(); - exit(0); - } - /* XXXX This will close all listening sockets except control-port - * listeners. Perhaps we should close those too. */ - hibernate_begin_shutdown(); + lost_owning_controller("process", "vanished"); } /** Set process_spec as Tor's owning controller process.

1 0

[tor/master] Merge branch 'feature3049-v2' into maint-0.2.2
by nickm＠torproject.org 23 May '11

23 May '11

commit b80a8bba199b9adfb9c893641ba770566fa548e1 Merge: 1ba1bde 1e69c60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 01:19:04 2011 -0400 Merge branch 'feature3049-v2' into maint-0.2.2 Conflicts: src/common/Makefile.am changes/exit-policy-default-is-not-a-prefix | 5 + changes/feature3049 | 6 + src/common/Makefile.am | 4 +- src/common/compat.h | 2 +- src/common/compat_libevent.c | 2 +- src/common/log.c | 2 +- src/common/procmon.c | 332 +++++++++++++++++++++++++++ src/common/procmon.h | 30 +++ src/common/torlog.h | 1 - src/common/util.c | 18 +- src/or/config.c | 15 ++ src/or/connection.c | 3 +- src/or/control.c | 138 +++++++++++- src/or/control.h | 4 + src/or/or.h | 10 +- 15 files changed, 554 insertions(+), 18 deletions(-) diff --cc src/common/Makefile.am index 2d009bd,8889245..6952591 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@@ -12,11 -12,11 +12,11 @@@ libor_extra_source endif libor_a_SOURCES = address.c log.c util.c compat.c container.c mempool.c \ - memarea.c di_ops.c util_codedigest.c $(libor_extra_source) - memarea.c util_codedigest.c procmon.c $(libor_extra_source) ++ memarea.c di_ops.c procmon.c util_codedigest.c $(libor_extra_source) libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c libor_event_a_SOURCES = compat_libevent.c - noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h di_ops.h -noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h procmon.h ciphers.inc compat_libevent.h tortls_states.h ++noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h di_ops.h procmon.h common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \

1 0

[tor/master] The first argument for a libevent callback should be evutil_socket_t
by nickm＠torproject.org 23 May '11

23 May '11

commit 1e69c60dccc358a7146c2b5e7825ea729498b41b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 01:12:00 2011 -0400 The first argument for a libevent callback should be evutil_socket_t --- src/common/procmon.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/procmon.c b/src/common/procmon.c index cee956a..bd25bc1 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -34,7 +34,7 @@ typedef int pid_t; /* Currently we need to poll in some way on all systems. */ #ifdef PROCMON_POLLS -static void tor_process_monitor_poll_cb(int unused1, short unused2, +static void tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2, void *procmon_); #endif @@ -232,7 +232,8 @@ tor_process_monitor_new(struct event_base *base, /** Libevent callback to poll for the existence of the process * monitored by procmon_. */ static void -tor_process_monitor_poll_cb(int unused1, short unused2, void *procmon_) +tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2, + void *procmon_) { tor_process_monitor_t *procmon = (tor_process_monitor_t *)(procmon_); int its_dead_jim;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 23 May '11

23 May '11

commit 2527acb2dc8b71515ac0c882e3af4fc034ab1b48 Merge: cb7fff1 b80a8bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 01:23:53 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/common/Makefile.am src/or/control.c changes/exit-policy-default-is-not-a-prefix | 5 + changes/feature3049 | 6 + src/common/Makefile.am | 2 + src/common/compat.h | 2 +- src/common/compat_libevent.c | 2 +- src/common/log.c | 2 +- src/common/procmon.c | 332 +++++++++++++++++++++++++++ src/common/procmon.h | 30 +++ src/common/torlog.h | 1 - src/common/util.c | 18 +- src/or/config.c | 15 ++ src/or/connection.c | 3 +- src/or/control.c | 138 +++++++++++- src/or/control.h | 4 + src/or/or.h | 10 +- src/or/router.c | 7 +- 16 files changed, 558 insertions(+), 19 deletions(-) diff --cc src/common/Makefile.am index 3a80eb8,6952591..4821849 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@@ -11,46 -11,12 +11,48 @@@ els libor_extra_source= endif -libor_a_SOURCES = address.c log.c util.c compat.c container.c mempool.c \ - memarea.c di_ops.c procmon.c util_codedigest.c $(libor_extra_source) -libor_crypto_a_SOURCES = crypto.c aes.c tortls.c torgzip.c +libor_a_SOURCES = \ + address.c \ + compat.c \ + container.c \ + di_ops.c \ + log.c \ + memarea.c \ + mempool.c \ ++ procmon.c \ + util.c \ + util_codedigest.c \ + $(libor_extra_source) + +libor_crypto_a_SOURCES = \ + aes.c \ + crypto.c \ + torgzip.c \ + tortls.c + libor_event_a_SOURCES = compat_libevent.c -noinst_HEADERS = address.h torlog.h crypto.h util.h compat.h aes.h torint.h tortls.h strlcpy.c strlcat.c torgzip.h container.h ht.h mempool.h memarea.h ciphers.inc compat_libevent.h tortls_states.h di_ops.h procmon.h +noinst_HEADERS = \ + address.h \ + aes.h \ + ciphers.inc \ + compat.h \ + compat_libevent.h \ + container.h \ + crypto.h \ + di_ops.h \ + ht.h \ + memarea.h \ + mempool.h \ ++ procmon.h \ + strlcat.c \ + strlcpy.c \ + torgzip.h \ + torint.h \ + torlog.h \ + tortls.h \ + tortls_states.h \ + util.h common_sha1.i: $(libor_SOURCES) $(libor_crypto_a_SOURCES) $(noinst_HEADERS) if test "@SHA1SUM@" != none; then \ diff --cc src/common/torlog.h index b8f5ea4,541a0d1..4c5729e --- a/src/common/torlog.h +++ b/src/common/torlog.h @@@ -147,9 -145,7 +147,8 @@@ void change_callback_log_severity(int l log_callback cb); void flush_pending_log_callbacks(void); void log_set_application_name(const char *name); +void set_log_time_granularity(int granularity_msec); - /* Outputs a message to stdout */ void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) CHECK_PRINTF(3,4); #define log tor_log /* hack it so we don't conflict with log() as much */ diff --cc src/or/control.c index e0e8f7e,0dad1b9..9856073 --- a/src/or/control.c +++ b/src/or/control.c @@@ -33,11 -32,8 +33,13 @@@ #include "routerlist.h" #include "routerparse.h" +#ifndef MS_WINDOWS +#include <pwd.h> +#include <sys/resource.h> +#endif + + #include "procmon.h" + /** Yield true iff s is the state of a control_connection_t that has * finished authentication and is accepting commands. */ #define STATE_IS_OPEN(s) ((s) == CONTROL_CONN_STATE_OPEN) diff --cc src/or/router.c index 63ed4cf,184715b..2b11a52 --- a/src/or/router.c +++ b/src/or/router.c @@@ -492,11 -490,11 +492,11 @@@ init_keys(void char fingerprint_line[MAX_NICKNAME_LEN+FINGERPRINT_LEN+3]; const char *mydesc; crypto_pk_env_t *prkey; - char digest[20]; - char v3_digest[20]; + char digest[DIGEST_LEN]; + char v3_digest[DIGEST_LEN]; char *cp; or_options_t *options = get_options(); - authority_type_t type; + dirinfo_type_t type; time_t now = time(NULL); trusted_dir_server_t *ds; int v3_digest_set = 0;

1 0

[tor/master] Appease make check-spaces wrt procmon.h
by nickm＠torproject.org 23 May '11

23 May '11

commit 93b699e1ea5f4107f545cca97de627a3746e1daf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 01:10:49 2011 -0400 Appease make check-spaces wrt procmon.h --- src/common/procmon.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/common/procmon.h b/src/common/procmon.h index f8c7444..02eb2da 100644 --- a/src/common/procmon.h +++ b/src/common/procmon.h @@ -27,3 +27,4 @@ tor_process_monitor_t *tor_process_monitor_new(struct event_base *base, void tor_process_monitor_free(tor_process_monitor_t *procmon); #endif +

1 0

[tor/master] Fix comment typo
by nickm＠torproject.org 23 May '11

23 May '11

commit cb9df5e53c169efc0ec1ccbfeea4c8d2878b1a39 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu May 12 00:27:19 2011 -0700 Fix comment typo --- src/common/compat_libevent.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 3ad9be1..6d89be8 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -48,7 +48,7 @@ typedef uint32_t le_version_t; * it is. */ #define LE_OLD V(0,0,0) /** Represents a version of libevent so weird we can't figure out what version - * it it. */ + * it is. */ #define LE_OTHER V(0,0,99) static le_version_t tor_get_libevent_version(const char **v_out);

1 0

[tor/master] Fix comment typo
by nickm＠torproject.org 23 May '11

23 May '11

commit b7452dcbcb2f086e3fd7daf0c31b95d9e777190a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue May 10 05:15:02 2011 -0700 Fix comment typo --- src/common/compat.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index af795ff..8144026 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -398,7 +398,7 @@ int get_n_open_sockets(void); #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) -/** Implementatino of struct in6_addr for platforms that do not have it. +/** Implementation of struct in6_addr for platforms that do not have it. * Generally, these platforms are ones without IPv6 support, but we want to * have a working in6_addr there anyway, so we can use it to parse IPv6 * addresses. */

1 0