- tor-commits - lists.torproject.org

[tor/master] Escape configuration values before sending them via CONF_CHANGED.
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 643913de75b51b4fa50f3c6b0c68e25f6e7a96c1 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Aug 9 15:25:16 2011 +0500 Escape configuration values before sending them via CONF_CHANGED. --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 02dc7eb..28c83ad 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -718,7 +718,7 @@ set_options(or_options_t *new_val, char **msg) if (!option_is_same(&options_format, new_val, old_options, options_format.vars[i].name)) { line = get_assigned_option(&options_format, new_val, - options_format.vars[i].name, 0); + options_format.vars[i].name, 1); if (line) { for (; line; line = line->next) {

1 0

[tor/master] Merge branch 'bug1692-squashed'
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit b76f46c6d8ba5e7b3efa91ae5ef487ba05d3b3c4 Merge: 333df60 02a735d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 10 15:04:36 2011 -0400 Merge branch 'bug1692-squashed' changes/bug1692 | 5 +++++ src/common/util.c | 24 ++++++++++++++++++++++++ src/common/util.h | 5 +++++ src/or/config.c | 28 +++++++++++++++++++++++++++- src/or/control.c | 36 +++++++++++++++++++++++++++++++++++- src/or/control.h | 1 + 6 files changed, 97 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix a const warning in bug1692 code
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 5252c9434f3eb8873f1d98aa3cf279e66fb2517d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 10 15:06:11 2011 -0400 Fix a const warning in bug1692 code --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index e2e5cd3..5a45dfb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -729,7 +729,7 @@ set_options(or_options_t *new_val, char **msg) smartlist_add(elements, line->value); } } else { - smartlist_add(elements, options_format.vars[i].name); + smartlist_add(elements, (char*)options_format.vars[i].name); smartlist_add(elements, NULL); } }

1 0

[tor/master] Whitespace tweaks
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 5da9f722f27c0df9e90a59318ea8182743ab0e44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 10 15:06:45 2011 -0400 Whitespace tweaks --- src/or/config.c | 2 +- src/or/control.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 5a45dfb..b4d733a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4980,7 +4980,7 @@ parse_client_port_config(smartlist_t *out, mainport = (int)tor_parse_long(ports->value, 10, 0, 65535, &ok, NULL); if (!ok) { log_warn(LD_CONFIG, "%sListenAddress can only be used with a single " - "%sPort with value \"auto\" or 1-65535.", portname, portname); + "%sPort with value \"auto\" or 1-65535.", portname, portname); return -1; } } diff --git a/src/or/control.c b/src/or/control.c index afd0662..ff96194 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4008,7 +4008,8 @@ control_event_conf_changed(smartlist_t *elements) int i; char *result; smartlist_t *lines; - if (!EVENT_IS_INTERESTING(EVENT_CONF_CHANGED) || smartlist_len(elements) == 0) { + if (!EVENT_IS_INTERESTING(EVENT_CONF_CHANGED) || + smartlist_len(elements) == 0) { return 0; } lines = smartlist_create();

1 0

[tor/master] Emits CONF_CHANGED events whenever Tor's configuration values change.
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 5a801a8c8b71c9551a80913398135809cb10cecd Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Aug 8 04:38:53 2011 +0500 Emits CONF_CHANGED events whenever Tor's configuration values change. --- src/or/config.c | 35 ++++++++++++++++++++++++++++++++++- src/or/control.c | 17 ++++++++++++++++- src/or/control.h | 1 + 3 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 088617b..653e23d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -10,6 +10,7 @@ **/ #define CONFIG_PRIVATE +#define CONTROL_PRIVATE #include "or.h" #include "circuitbuild.h" @@ -693,6 +694,10 @@ get_options(void) int set_options(or_options_t *new_val, char **msg) { + int i; + char *result; + smartlist_t *elements; + config_line_t *line; or_options_t *old_options = global_options; global_options = new_val; /* Note that we pass the *old* options below, for comparison. It @@ -707,7 +712,35 @@ set_options(or_options_t *new_val, char **msg) "Acting on config options left us in a broken state. Dying."); exit(1); } - + /* Issues a CONF_CHANGED event to notify controller of the change. If Tor is + * just starting up then the old_options will be undefined. */ + if (old_options) { + elements = smartlist_create(); + for (i=0; options_format.vars[i].name; ++i) { + if (!option_is_same(&options_format, new_val, old_options, + options_format.vars[i].name)) { + line = get_assigned_option(&options_format, new_val, + options_format.vars[i].name, 0); + + if (line) { + for (; line; line = line->next) { + char *tmp; + tor_asprintf(&tmp, "650-%s=%s", line->key, line->value); + smartlist_add(elements, tmp); + } + } else { + char *tmp; + tor_asprintf(&tmp, "650-%s", options_format.vars[i].name); + smartlist_add(elements, tmp); + } + } + } + result = smartlist_join_strings(elements, "\r\n", 0, NULL); + control_event_conf_changed(result); + tor_free(result); + SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); + smartlist_free(elements); + } config_free(&options_format, old_options); return 0; diff --git a/src/or/control.c b/src/or/control.c index ad11350..0b19a25 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -74,7 +74,8 @@ #define EVENT_NEWCONSENSUS 0x0016 #define EVENT_BUILDTIMEOUT_SET 0x0017 #define EVENT_SIGNAL 0x0018 -#define _EVENT_MAX 0x0018 +#define EVENT_CONF_CHANGED 0x0019 +#define _EVENT_MAX 0x0019 /* If _EVENT_MAX ever hits 0x0020, we need to make the mask wider. */ /** Bitfield: The bit 1<<e is set if any open control @@ -946,6 +947,7 @@ static const struct control_event_t control_event_table[] = { { EVENT_NEWCONSENSUS, "NEWCONSENSUS" }, { EVENT_BUILDTIMEOUT_SET, "BUILDTIMEOUT_SET" }, { EVENT_SIGNAL, "SIGNAL" }, + { EVENT_CONF_CHANGED, "CONF_CHANGED"}, { 0, NULL }, }; @@ -3996,6 +3998,19 @@ control_event_guard(const char *nickname, const char *digest, return 0; } +/** Called when a configuration option changes. This is generally triggered + * by SETCONF requests and RELOAD/SIGHUP signals. The values are the + * keyword/value pairs for the configuration changes tor is using. */ +int +control_event_conf_changed(const char *values) +{ + if(strlen(values) > 0) { + send_control_event(EVENT_CONF_CHANGED, 0, + "650-CONF_CHANGED\r\n%s\r\n650 OK\r\n", values); + } + return 0; +} + /** Helper: Return a newly allocated string containing a path to the * file where we store our authentication cookie. */ static char * diff --git a/src/or/control.h b/src/or/control.h index 147a5af..ed83f53 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -66,6 +66,7 @@ int control_event_server_status(int severity, const char *format, ...) CHECK_PRINTF(2,3); int control_event_guard(const char *nickname, const char *digest, const char *status); +int control_event_conf_changed(const char *values); int control_event_buildtimeout_set(const circuit_build_times_t *cbt, buildtimeout_set_event_t type); int control_event_signal(uintptr_t signal);

1 0

[tor/master] Add changes file.
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 3b85fe8a5dd0fed88163ffc3bcb4eec8bf2053bc Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Aug 9 03:02:40 2011 +0500 Add changes file. --- changes/bug1692 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug1692 b/changes/bug1692 new file mode 100644 index 0000000..c2a71cc --- /dev/null +++ b/changes/bug1692 @@ -0,0 +1,5 @@ + o Minor features: + - CONF_CHANGED event is provided so that controllers can be notified + of any configuration changes made by other controllers/SETCONF/HUP. + Implements #1692. +

1 0

[tor/master] Refactor to do CONF_CHANGED event formatting inside control.c
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 02c62b2966083ce549fc6ba6c743d5c37f357fe6 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Aug 8 19:19:06 2011 +0500 Refactor to do CONF_CHANGED event formatting inside control.c --- src/or/config.c | 17 +++++------------ src/or/control.c | 30 ++++++++++++++++++++++++++---- src/or/control.h | 2 +- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 653e23d..02dc7eb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -10,7 +10,6 @@ **/ #define CONFIG_PRIVATE -#define CONTROL_PRIVATE #include "or.h" #include "circuitbuild.h" @@ -695,7 +694,6 @@ int set_options(or_options_t *new_val, char **msg) { int i; - char *result; smartlist_t *elements; config_line_t *line; or_options_t *old_options = global_options; @@ -724,21 +722,16 @@ set_options(or_options_t *new_val, char **msg) if (line) { for (; line; line = line->next) { - char *tmp; - tor_asprintf(&tmp, "650-%s=%s", line->key, line->value); - smartlist_add(elements, tmp); + smartlist_add(elements, line->key); + smartlist_add(elements, line->value); } } else { - char *tmp; - tor_asprintf(&tmp, "650-%s", options_format.vars[i].name); - smartlist_add(elements, tmp); + smartlist_add(elements, options_format.vars[i].name); + smartlist_add(elements, NULL); } } } - result = smartlist_join_strings(elements, "\r\n", 0, NULL); - control_event_conf_changed(result); - tor_free(result); - SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp)); + control_event_conf_changed(elements); smartlist_free(elements); } config_free(&options_format, old_options); diff --git a/src/or/control.c b/src/or/control.c index 0b19a25..0579703 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4002,12 +4002,34 @@ control_event_guard(const char *nickname, const char *digest, * by SETCONF requests and RELOAD/SIGHUP signals. The values are the * keyword/value pairs for the configuration changes tor is using. */ int -control_event_conf_changed(const char *values) +control_event_conf_changed(smartlist_t *elements) { - if(strlen(values) > 0) { - send_control_event(EVENT_CONF_CHANGED, 0, - "650-CONF_CHANGED\r\n%s\r\n650 OK\r\n", values); + int i; + char *result; + smartlist_t *lines; + if (smartlist_len(elements) == 0) { + return 0; } + lines = smartlist_create(); + for (i = 0; i < smartlist_len(elements); i += 2) { + char *k = smartlist_get(elements, i); + char *v = smartlist_get(elements, i+1); + if (v == NULL) { + char *tmp; + tor_asprintf(&tmp, "650-%s", k); + smartlist_add(lines, tmp); + } else { + char *tmp; + tor_asprintf(&tmp, "650-%s=%s", k, v); + smartlist_add(lines, tmp); + } + } + result = smartlist_join_strings(lines, "\r\n", 0, NULL); + send_control_event(EVENT_CONF_CHANGED, 0, + "650-CONF_CHANGED\r\n%s\r\n650 OK\r\n", result); + tor_free(result); + SMARTLIST_FOREACH(lines, char *, cp, tor_free(cp)); + smartlist_free(lines); return 0; } diff --git a/src/or/control.h b/src/or/control.h index ed83f53..544a9fc 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -66,7 +66,7 @@ int control_event_server_status(int severity, const char *format, ...) CHECK_PRINTF(2,3); int control_event_guard(const char *nickname, const char *digest, const char *status); -int control_event_conf_changed(const char *values); +int control_event_conf_changed(smartlist_t *elements); int control_event_buildtimeout_set(const circuit_build_times_t *cbt, buildtimeout_set_event_t type); int control_event_signal(uintptr_t signal);

1 0

[tor/master] Minor comment fix.
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 23ef12462adab98d5d63bc9579892dbc6f1dea6f Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Aug 8 19:58:43 2011 +0500 Minor comment fix. --- src/or/control.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 0579703..f679493 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3999,8 +3999,9 @@ control_event_guard(const char *nickname, const char *digest, } /** Called when a configuration option changes. This is generally triggered - * by SETCONF requests and RELOAD/SIGHUP signals. The values are the - * keyword/value pairs for the configuration changes tor is using. */ + * by SETCONF requests and RELOAD/SIGHUP signals. The elements is + * a smartlist_t containing (key, value, ...) pairs in sequence. + * value can be NULL. */ int control_event_conf_changed(smartlist_t *elements) {

1 0

[tor/master] Minor code readability fix.
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 5f624805e71d3f160ed7de28b17ecad892827758 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Aug 9 03:17:21 2011 +0500 Minor code readability fix. --- src/or/control.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index f679493..3943aff 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4015,15 +4015,13 @@ control_event_conf_changed(smartlist_t *elements) for (i = 0; i < smartlist_len(elements); i += 2) { char *k = smartlist_get(elements, i); char *v = smartlist_get(elements, i+1); + char *tmp; if (v == NULL) { - char *tmp; tor_asprintf(&tmp, "650-%s", k); - smartlist_add(lines, tmp); } else { - char *tmp; tor_asprintf(&tmp, "650-%s=%s", k, v); - smartlist_add(lines, tmp); } + smartlist_add(lines, tmp); } result = smartlist_join_strings(lines, "\r\n", 0, NULL); send_control_event(EVENT_CONF_CHANGED, 0,

1 0

[tor/master] Use smartlist_asprintf_add() to improve readability.
by nickm＠torproject.org 10 Aug '11

10 Aug '11

commit 86f68ed6953620e14c7f9894e01ab2eafea250e7 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Aug 9 15:18:57 2011 +0500 Use smartlist_asprintf_add() to improve readability. --- src/or/control.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 3943aff..706d871 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4015,13 +4015,11 @@ control_event_conf_changed(smartlist_t *elements) for (i = 0; i < smartlist_len(elements); i += 2) { char *k = smartlist_get(elements, i); char *v = smartlist_get(elements, i+1); - char *tmp; if (v == NULL) { - tor_asprintf(&tmp, "650-%s", k); + smartlist_asprintf_add(lines, "650-%s", k); } else { - tor_asprintf(&tmp, "650-%s=%s", k, v); + smartlist_asprintf_add(lines, "650-%s=%s", k, v); } - smartlist_add(lines, tmp); } result = smartlist_join_strings(lines, "\r\n", 0, NULL); send_control_event(EVENT_CONF_CHANGED, 0,

1 0