- tor-commits - lists.torproject.org

[tor/release-0.2.2] Unbreak the build on libevent 1.x systems
by arma＠torproject.org 29 May '11

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

29 May '11

commit 0caa37db4df76fc50af48a107a14e4f139b7fa55 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun May 15 08:23:29 2011 -0700 Fix some comments --- src/common/log.c | 2 +- src/common/torlog.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index d14563c..ac98f13 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -390,7 +390,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname, /** Output a message to the log. It gets logged to all logfiles that * care about messages with severity in domain. The content - * is formatted printf style basedc on format and extra arguments. + * is formatted printf-style based on format and extra arguments. * */ void tor_log(int severity, log_domain_mask_t domain, const char *format, ...) diff --git a/src/common/torlog.h b/src/common/torlog.h index 000e32d..541a0d1 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -146,7 +146,6 @@ void change_callback_log_severity(int loglevelMin, int loglevelMax, void flush_pending_log_callbacks(void); void log_set_application_name(const char *name); -/* 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 */

1 0

[tor/release-0.2.2] Fix trailing asterisk in the output of "GETINFO info/names"
by arma＠torproject.org 29 May '11

29 May '11

commit 90f810801e92e8ee5d0b1341172f83e844af56c8 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed May 18 04:13:21 2011 -0700 Fix trailing asterisk in the output of "GETINFO info/names" --- changes/exit-policy-default-is-not-a-prefix | 5 +++++ src/or/control.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/exit-policy-default-is-not-a-prefix b/changes/exit-policy-default-is-not-a-prefix new file mode 100644 index 0000000..6eb1e8d --- /dev/null +++ b/changes/exit-policy-default-is-not-a-prefix @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Remove a trailing asterisk from "exit-policy/default" in the + output of the control port command "GETINFO info/names". Bugfix + on 0.1.2.5-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 67e8b00..f7ff92a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1907,8 +1907,8 @@ static const getinfo_item_t getinfo_items[] = { "v2 networkstatus docs as retrieved from a DirPort."), ITEM("dir/status-vote/current/consensus", dir, "v3 Networkstatus consensus as retrieved from a DirPort."), - PREFIX("exit-policy/default", policies, - "The default value appended to the configured exit policy."), + ITEM("exit-policy/default", policies, + "The default value appended to the configured exit policy."), PREFIX("ip-to-country/", geoip, "Perform a GEOIP lookup"), { NULL, NULL, NULL, 0 } };

1 0

[tor/release-0.2.2] Exit immediately if we can't monitor our owning controller process
by arma＠torproject.org 29 May '11

29 May '11

commit b3133d1cadec0540105a855b1fd2eb741d4eec9d Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon May 16 10:25:59 2011 -0700 Exit immediately if we can't monitor our owning controller process tor_process_monitor_new can't currently return NULL, but if it ever can, we want that to be an explicitly fatal error, without relying on the fact that monitor_owning_controller_process's chain of caller will exit if it fails. --- src/or/config.c | 5 +---- src/or/control.c | 20 ++++++++++---------- src/or/control.h | 2 +- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index b2bc9f3..0d1c37f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1232,10 +1232,7 @@ options_act(or_options_t *old_options) return -1; } - if (monitor_owning_controller_process(options->OwningControllerProcess)) { - log_warn(LD_CONFIG, "Error monitoring owning controller process"); - return -1; - } + monitor_owning_controller_process(options->OwningControllerProcess); /* reload keys as needed for rendezvous services. */ if (rend_service_load_keys()<0) { diff --git a/src/or/control.c b/src/or/control.c index 3a96904..67e8b00 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3815,8 +3815,8 @@ owning_controller_procmon_cb(void *unused) } /** Set process_spec as Tor's owning controller process. - * Return 0 on success, -1 on failure. */ -int + * Exit on failure. */ +void monitor_owning_controller_process(const char *process_spec) { const char *msg; @@ -3829,7 +3829,7 @@ monitor_owning_controller_process(const char *process_spec) owning_controller_process_spec)) { /* Same process -- return now, instead of disposing of and * recreating the process-termination monitor. */ - return 0; + return; } /* We are currently owned by a process, and we should no longer be @@ -3845,7 +3845,7 @@ monitor_owning_controller_process(const char *process_spec) (owning_controller_process_monitor == NULL)); if (process_spec == NULL) - return 0; + return; owning_controller_process_spec = tor_strdup(process_spec); owning_controller_process_monitor = @@ -3856,13 +3856,13 @@ monitor_owning_controller_process(const char *process_spec) &msg); if (owning_controller_process_monitor == NULL) { - log_warn(LD_CONTROL, "Couldn't create process-termination monitor for " - "owning controller: %s", - msg); - return -1; + log_err(LD_BUG, "Couldn't create process-termination monitor for " + "owning controller: %s. Exiting.", + msg); + owning_controller_process_spec = NULL; + tor_cleanup(); + exit(0); } - - return 0; } /** Convert the name of a bootstrapping phase s into strings diff --git a/src/or/control.h b/src/or/control.h index 81c2301..a83e374 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -70,7 +70,7 @@ smartlist_t *decode_hashed_passwords(config_line_t *passwords); void disable_control_logging(void); void enable_control_logging(void); -int monitor_owning_controller_process(const char *process_spec); +void monitor_owning_controller_process(const char *process_spec); void control_event_bootstrap(bootstrap_status_t status, int progress); void control_event_bootstrap_problem(const char *warn, int reason);

1 0

[tor/release-0.2.2] Implement TAKEOWNERSHIP command
by arma＠torproject.org 29 May '11

29 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/release-0.2.2] Add changes file for #3049
by arma＠torproject.org 29 May '11

29 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/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