- tor-commits - lists.torproject.org

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

23 May '11

commit 6f200b61b7effe811809fe60459b0b5b58cb3dbb Merge: 2527acb 6cac100 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 02:16:25 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' src/common/procmon.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/master] Unbreak the build on libevent 1.x systems
by nickm＠torproject.org 23 May '11

23 May '11

commit 6cac100b13794b74db8e831bed56df2f0443ea13 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 22 22:54:02 2011 -0700 Unbreak the build on libevent 1.x systems --- src/common/procmon.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/common/procmon.c b/src/common/procmon.c index bd25bc1..8fcc1af 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -152,7 +152,11 @@ tor_validate_process_specifier(const char *process_spec, #define PERIODIC_TIMER_FLAGS (0) #endif -static const struct timeval poll_interval_tv = {15, 0}; +static struct timeval poll_interval_tv = {15, 0}; +/* Note: If you port this file to plain Libevent 2, you can make + * poll_interval_tv const. It has to be non-const here because in + * libevent 1.x, event_add expects a pointer to a non-const struct + * timeval. */ /** Create a process-termination monitor for the process specifier * given in process_spec. Return a newly allocated

1 0

[tor/maint-0.2.2] Unbreak the build on libevent 1.x systems
by nickm＠torproject.org 23 May '11

23 May '11

commit 6cac100b13794b74db8e831bed56df2f0443ea13 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 22 22:54:02 2011 -0700 Unbreak the build on libevent 1.x systems --- src/common/procmon.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/common/procmon.c b/src/common/procmon.c index bd25bc1..8fcc1af 100644 --- a/src/common/procmon.c +++ b/src/common/procmon.c @@ -152,7 +152,11 @@ tor_validate_process_specifier(const char *process_spec, #define PERIODIC_TIMER_FLAGS (0) #endif -static const struct timeval poll_interval_tv = {15, 0}; +static struct timeval poll_interval_tv = {15, 0}; +/* Note: If you port this file to plain Libevent 2, you can make + * poll_interval_tv const. It has to be non-const here because in + * libevent 1.x, event_add expects a pointer to a non-const struct + * timeval. */ /** Create a process-termination monitor for the process specifier * given in process_spec. Return a newly allocated

1 0

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

23 May '11

commit c4bba8b626c3704370c760dbdbd0357f8f46d11b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 22 14:18:34 2011 -0700 Document __OwningControllerProcess option --- control-spec.txt | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index a5d2076..0616bd7 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1893,6 +1893,14 @@ (Boolean. Default: "1") + __OwningControllerProcess + + If this option is set to a process ID, Tor will periodically check + whether a process with the specified PID exists, and exit if one + does not. Added in Tor 0.2.2.28-beta. + + (String. Default: unset.) + 5.5. Phases from the Bootstrap status event. This section describes the various bootstrap phases currently reported

1 0

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

23 May '11

commit 37d7a9e4c2419ad02755424dd0fb8cce1ad04166 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 22 14:18:45 2011 -0700 Document TAKEOWNERSHIP command --- control-spec.txt | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 0616bd7..d8889a8 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -924,6 +924,17 @@ [LOADCONF was added in Tor 0.2.1.1-alpha.] +3.23. TAKEOWNERSHIP + + The syntax is: + "TAKEOWNERSHIP" CRLF + + This command instructs Tor to shut down (as if it had received + SIGINT or a "SIGNAL INT" controller command) when this control + connection is closed. + + [TAKEOWNERSHIP was added in Tor 0.2.2.28-beta.] + 4. Replies Reply codes follow the same 3-character format as used by SMTP, with the

1 0

[torspec/master] Document the intended use of the ‘owning controller’ features
by nickm＠torproject.org 23 May '11

23 May '11

commit b91918eeada8b029dc677c3c5aa1326a6ee2cf9b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 22 21:46:20 2011 -0700 Document the intended use of the ‘owning controller’ features --- control-spec.txt | 40 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 38 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index d8889a8..1d5c341 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -931,7 +931,37 @@ This command instructs Tor to shut down (as if it had received SIGINT or a "SIGNAL INT" controller command) when this control - connection is closed. + connection is closed. This command affects each control connection + that sends it independently; if multiple control connections send + the TAKEOWNERSHIP command to a Tor instance, Tor will shut down when + any of those connections closes. + + This command is intended to be used with the + __OwningControllerProcess configuration option. A controller that + starts a Tor process which the user cannot easily control or stop + should 'own' that Tor process: + + * When starting Tor, the controller should specify its PID in an + __OwningControllerProcess on Tor's command line. This will + cause Tor to poll for the existence of a process with that PID, + and exit if it does not find such a process. (This is not a + completely reliable way to detect whether the 'owning + controller' is still running, but it should work well enough in + most cases.) + + * Once the controller has connected to Tor's control port, it + should send the TAKEOWNERSHIP command along its control + connection. At this point, *both* the TAKEOWNERSHIP command and + the __OwningControllerProcess option are in effect: Tor will + exit when the control connection ends *and* Tor will exit if it + detects that there is no process with the PID specified in the + __OwningControllerProcess option. + + * After the controller has sent the TAKEOWNERSHIP command, it + should send "RESETCONF __OwningControllerProcess" along its + control connection. This will cause Tor to stop polling for the + existence of a process with its owning controller's PID; Tor + will still exit when the control connection ends. [TAKEOWNERSHIP was added in Tor 0.2.2.28-beta.] @@ -1908,7 +1938,13 @@ If this option is set to a process ID, Tor will periodically check whether a process with the specified PID exists, and exit if one - does not. Added in Tor 0.2.2.28-beta. + does not. Added in Tor 0.2.2.28-beta. This option's intended use + is documented in section 3.23 with the related TAKEOWNERSHIP + command. + + Note that this option can only specify a single process ID, unlike + the TAKEOWNERSHIP command which can be sent along multiple control + connections. (String. Default: unset.)

1 0

[torspec/master] Merge branch 'feature3049-squashed'
by nickm＠torproject.org 23 May '11

23 May '11

commit 75aae8d19a898ff71ef532024cac81592bccd43d Merge: 757f6dc b91918e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 23 01:25:03 2011 -0400 Merge branch 'feature3049-squashed' control-spec.txt | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-)

1 0

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