- tor-commits - lists.torproject.org

[tor/release-0.2.2] Fix comment typo
by arma＠torproject.org 29 May '11

29 May '11

commit 86aeb152cab3d0c9d5d8b301e5eb5e3afe497ea9 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed May 18 04:35:20 2011 -0700 Fix comment typo --- src/or/or.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 546c38a..52da63a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1009,7 +1009,7 @@ typedef struct connection_t { /* XXXX023 move this field, and all the listener-only fields (just socket_family, I think), into a new listener_connection_t subtype. */ /** If the connection is a CONN_TYPE_AP_DNS_LISTENER, this field points - * to the evdns_server_port is uses to listen to and answer connections. */ + * to the evdns_server_port it uses to listen to and answer connections. */ struct evdns_server_port *dns_server_port; /** Unique ID for measuring tunneled network status requests. */

1 0

[tor/release-0.2.2] Add an XXX
by arma＠torproject.org 29 May '11

29 May '11

commit 36afdebe1ac08fe02c938a73270bd2f11999d677 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed May 18 04:33:48 2011 -0700 Add an XXX --- src/or/control.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index f7ff92a..47e7081 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2894,6 +2894,9 @@ connection_control_process_inbuf(control_connection_t *conn) return 0; } + /* XXXX Why is this not implemented as a table like the GETINFO + * items are? Even handling the plus signs at the beginnings of + * commands wouldn't be very hard with proper macros. */ cmd_data_len = (uint32_t)data_len; if (!strcasecmp(conn->incoming_cmd, "SETCONF")) { if (handle_control_setconf(conn, cmd_data_len, args))

1 0

[tor/release-0.2.2] Split control connection cleanup out of connection_free
by arma＠torproject.org 29 May '11

29 May '11

commit 338a0266101e3addecbaf5771f62a860244896b3 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu May 19 16:27:51 2011 -0700 Split control connection cleanup out of connection_free --- src/or/connection.c | 3 +-- src/or/control.c | 10 ++++++++++ src/or/control.h | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index fc2097f..24ab593 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -479,8 +479,7 @@ connection_free(connection_t *conn) } } if (conn->type == CONN_TYPE_CONTROL) { - TO_CONTROL_CONN(conn)->event_mask = 0; - control_update_global_event_mask(); + connection_control_closed(TO_CONTROL_CONN(conn)); } connection_unregister_events(conn); _connection_free(conn); diff --git a/src/or/control.c b/src/or/control.c index 47e7081..0ddbee9 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2739,6 +2739,16 @@ connection_control_reached_eof(control_connection_t *conn) return 0; } +/** Called when conn is being freed. */ +void +connection_control_closed(control_connection_t *conn) +{ + tor_assert(conn); + + conn->event_mask = 0; + control_update_global_event_mask(); +} + /** Return true iff cmd is allowable (or at least forgivable) at this * stage of the protocol. */ static int diff --git a/src/or/control.h b/src/or/control.h index a83e374..6694c96 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -25,6 +25,8 @@ void control_adjust_event_log_severity(void); int connection_control_finished_flushing(control_connection_t *conn); int connection_control_reached_eof(control_connection_t *conn); +void connection_control_closed(control_connection_t *conn); + int connection_control_process_inbuf(control_connection_t *conn); #define EVENT_AUTHDIR_NEWDESCS 0x000D

1 0

[tor/release-0.2.2] naked constants are ugly
by arma＠torproject.org 29 May '11

29 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/release-0.2.2] Split out owning-controller-loss shutdown code into a function
by arma＠torproject.org 29 May '11

29 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/release-0.2.2] finish a comment nickm started in 8ebceeb3
by arma＠torproject.org 29 May '11

29 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/release-0.2.2] Appease make check-spaces wrt procmon.h
by arma＠torproject.org 29 May '11

29 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/release-0.2.2] Fix comment typo
by arma＠torproject.org 29 May '11

29 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/release-0.2.2] Fix comment typo
by arma＠torproject.org 29 May '11

29 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

[tor/release-0.2.2] Improve a documentation comment
by arma＠torproject.org 29 May '11

29 May '11

commit c714a098ea96fcd452a223ce7bbc6bfa2a6f0d02 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu May 12 02:57:09 2011 -0700 Improve a documentation comment --- src/common/util.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 38c0ad0..014b334 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -769,13 +769,17 @@ tor_digest256_is_zero(const char *digest) if (next) *next = endptr; \ return 0 -/** Extract a long from the start of s, in the given numeric base. If - * there is unconverted data and next is provided, set *next to the - * first unconverted character. An error has occurred if no characters - * are converted; or if there are unconverted characters and next is NULL; or - * if the parsed value is not between min and max. When no error occurs, - * return the parsed value and set *ok (if provided) to 1. When an error - * occurs, return 0 and set *ok (if provided) to 0. +/** Extract a long from the start of s, in the given numeric + * base. If base is 0, s is parsed as a decimal, + * octal, or hex number in the syntax of a C integer literal. If + * there is unconverted data and next is provided, set + * *next to the first unconverted character. An error has + * occurred if no characters are converted; or if there are + * unconverted characters and next is NULL; or if the parsed + * value is not between min and max. When no error + * occurs, return the parsed value and set *ok (if provided) to + * 1. When an error occurs, return 0 and set *ok (if provided) + * to 0. */ long tor_parse_long(const char *s, int base, long min, long max,

1 0