- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Split control connection cleanup out of connection_free
by nickm＠torproject.org 23 May '11

23 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/maint-0.2.2] Fix comment typo
by nickm＠torproject.org 23 May '11

23 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/maint-0.2.2] 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/maint-0.2.2] Implement TAKEOWNERSHIP command
by nickm＠torproject.org 23 May '11

23 May '11

commit bb860cedb29be0d95740bcf50577ae96bf666a18 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu May 19 16:34:40 2011 -0700 Implement TAKEOWNERSHIP command --- src/or/control.c | 44 +++++++++++++++++++++++++++++++++++++++++++- src/or/or.h | 3 +++ 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 0ddbee9..b6f802d 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1230,6 +1230,26 @@ handle_control_signal(control_connection_t *conn, uint32_t len, return 0; } +/** Called when we get a TAKEOWNERSHIP command. Mark this connection + * as an owning connection, so that we will exit if the connection + * closes. */ +static int +handle_control_takeownership(control_connection_t *conn, uint32_t len, + const char *body) +{ + (void)len; + (void)body; + + conn->is_owning_control_connection = 1; + + log_info(LD_CONTROL, "Control connection %d has taken ownership of this " + "Tor instance.", + (int)(conn->_base.s)); + + send_control_done(conn); + return 0; +} + /** Called when we get a MAPADDRESS command; try to bind all listed addresses, * and report success or failure. */ static int @@ -2747,6 +2767,25 @@ connection_control_closed(control_connection_t *conn) conn->event_mask = 0; 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(); + } } /** Return true iff cmd is allowable (or at least forgivable) at this @@ -2932,6 +2971,9 @@ connection_control_process_inbuf(control_connection_t *conn) } else if (!strcasecmp(conn->incoming_cmd, "SIGNAL")) { if (handle_control_signal(conn, cmd_data_len, args)) return -1; + } else if (!strcasecmp(conn->incoming_cmd, "TAKEOWNERSHIP")) { + if (handle_control_takeownership(conn, cmd_data_len, args)) + return -1; } else if (!strcasecmp(conn->incoming_cmd, "MAPADDRESS")) { if (handle_control_mapaddress(conn, cmd_data_len, args)) return -1; @@ -3816,7 +3858,7 @@ owning_controller_procmon_cb(void *unused) shutdown_slowly ? "shutting down" : "exiting now"); /* XXXX This chunk of code should be a separate function, called - * here and by process_signal(SIGINT). */ + * here, in connection_control_closed, and by process_signal(SIGINT). */ if (!shutdown_slowly) { tor_cleanup(); diff --git a/src/or/or.h b/src/or/or.h index 52da63a..cbfe362 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1242,6 +1242,9 @@ typedef struct control_connection_t { /** True if we have sent a protocolinfo reply on this connection. */ unsigned int have_sent_protocolinfo:1; + /** True if we have received a takeownership command on this + * connection. */ + unsigned int is_owning_control_connection:1; /** Amount of space allocated in incoming_cmd. */ uint32_t incoming_cmd_len;

1 0

[tor/maint-0.2.2] 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/maint-0.2.2] 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

[torspec/master] Document LOADCONF
by nickm＠torproject.org 23 May '11

23 May '11

commit 757f6dc617b4283b57491a5752cf8841cd707b53 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat May 21 23:30:46 2011 -0700 Document LOADCONF Fixes bug 3222. --- control-spec.txt | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 21f81af..a5d2076 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -913,6 +913,17 @@ [PROTOCOLINFO was not supported before Tor 0.2.0.5-alpha.] +3.22. LOADCONF + + The syntax is: + "+LOADCONF" CRLF ConfigText CRLF "." CRLF + + This command allows a controller to upload the text of a config file + to Tor over the control port. This config file is then loaded as if + it had been read from disk. + + [LOADCONF was added in Tor 0.2.1.1-alpha.] + 4. Replies Reply codes follow the same 3-character format as used by SMTP, with the

1 0

[torspec/master] Fix minor issue
by nickm＠torproject.org 23 May '11

23 May '11

commit c8ab383e4756348f8091603dd42403014a0377a3 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat May 21 23:30:25 2011 -0700 Fix minor issue --- control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 00bfbfe..21f81af 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -788,7 +788,7 @@ 3.17. CLOSECIRCUIT The syntax is: - CLOSECIRCUIT SP CircuitID *(SP Flag) CRLF + "CLOSECIRCUIT" SP CircuitID *(SP Flag) CRLF Flag = "IfUnused" Tells the server to close the specified circuit. If "IfUnused" is

1 0

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

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

21 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