tor-commits January 2018

tor-commits@lists.torproject.org

18 participants
1738 discussions

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit db67c03a7c676f323f1f2c60e9e8c679b24c61f1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 19:45:22 2018 +0000 Update translations for torcheck_completed --- mk/torcheck.po | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/mk/torcheck.po b/mk/torcheck.po index 34257c19d..909d8e7bf 100644 --- a/mk/torcheck.po +++ b/mk/torcheck.po @@ -2,15 +2,17 @@ # Copyright (C) 2008-2013 The Tor Project, Inc # # Translators: +# Bojan Jankuloski <bojan.jankuloski(a)gmail.com>, 2016 # Nena <nena100janovska(a)gmail.com>, 2014 -# runasand <runa.sandvik(a)gmail.com>, 2011 +# runasand <inactive+runasand(a)transifex.com>, 2011 +# Zarko Gjurov <zarkogjurov(a)gmail.com>, 2018 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-03-19 11:40+0000\n" -"Last-Translator: Nena <nena100janovska(a)gmail.com>\n" -"Language-Team: Macedonian (http://www.transifex.com/projects/p/torproject/language/mk/)\n" +"PO-Revision-Date: 2018-01-11 19:34+0000\n" +"Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>\n" +"Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,31 +21,31 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "Честитаме. Прелистувачот е нагоден за употреба на Tor." +msgstr "Честититки. Прелистувачот е конфигуриран за употреба на Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr " Ве молиме посетете ја <a href=\"https://www.torproject.org/\">веб локацијата Tor</a> за повеќе информации за безбедна употреба на Tor. Сега слободно можете да го прелистувате интернетот анонимно" +msgstr "Посетете го <a href=\"https://www.torproject.org/\">мрежното месот на Tor</a> за повеќе информации за негова безбедна употреба. Сега слободно можете да прелистувате на Интернет анонимно." -msgid "There is a security update available for the Tor Browser Bundle." -msgstr "Достапна е безбедносна надградба за прелистувачкиот пакет Tor" +msgid "There is a security update available for Tor Browser." +msgstr "Достапна е надоградба за Tor прелистувачот." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Кликнете овде за да се префрлите на страницата за симнување</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Кликнете овде за да одите на страницата за преземање</a>" msgid "Sorry. You are not using Tor." -msgstr "Жал ни е, но Вие не користите Тор." +msgstr "За жал, не го користите Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Ако се обидувате да го употребите Tor клиентот, Ве молиме посетете ја <a href=\"https://www.torproject.org/\">веб-локацијата на Tor</a> а особено <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">упатствата за конфигурација на Вашиот instructions Tor клиент</a>." +msgstr "Ако се обидувате да го употребите Tor клиентот, Ве молиме посетете ја <a href=\"https://www.torproject.org/\">веб-локацијата на Tor</a> а особено <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">упатствата за конфигурација на Вашиот Tor клиент</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Жал ни е, но или Вашето барање не успеа или примивме неочекуван одговор." @@ -93,3 +95,12 @@ msgstr "Опцијата JavaScript е овозможена." msgid "JavaScript is disabled." msgstr "Опцијата JavaScript е оневозможена." + +msgid "However, it does not appear to be Tor Browser." +msgstr "Како и да е, не изгледа дека е Tor прелистувач." + +msgid "Run a Relay" +msgstr "Покрени јазол" + +msgid "Stay Anonymous" +msgstr "Останете анонимни"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 11 Jan '18

11 Jan '18

commit a49636bed1765aa3432c6f528470f77d85446d7d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 11 19:45:16 2018 +0000 Update translations for torcheck --- mk/torcheck.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/mk/torcheck.po b/mk/torcheck.po index 696b5f842..909d8e7bf 100644 --- a/mk/torcheck.po +++ b/mk/torcheck.po @@ -5,12 +5,13 @@ # Bojan Jankuloski <bojan.jankuloski(a)gmail.com>, 2016 # Nena <nena100janovska(a)gmail.com>, 2014 # runasand <inactive+runasand(a)transifex.com>, 2011 +# Zarko Gjurov <zarkogjurov(a)gmail.com>, 2018 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2017-12-20 19:01+0000\n" -"Last-Translator: Bojan Jankuloski <bojan.jankuloski(a)gmail.com>\n" +"PO-Revision-Date: 2018-01-11 19:34+0000\n" +"Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,21 +21,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "Честитаме. Прелистувачот е нагоден за употреба на Tor." +msgstr "Честититки. Прелистувачот е конфигуриран за употреба на Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Посетете го <a href=\"https://www.torproject.org/\">мрежното месот на Tor</a> за повеќе информации за негова безбедна употреба. Сега слободно можете да го прелистувате семрежјето анонимно." +msgstr "Посетете го <a href=\"https://www.torproject.org/\">мрежното месот на Tor</a> за повеќе информации за негова безбедна употреба. Сега слободно можете да прелистувате на Интернет анонимно." msgid "There is a security update available for Tor Browser." -msgstr "" +msgstr "Достапна е надоградба за Tor прелистувачот." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Стиснете овде за да се префрлите на страницата за преземање</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Кликнете овде за да одите на страницата за преземање</a>" msgid "Sorry. You are not using Tor." msgstr "За жал, не го користите Tor." @@ -44,7 +45,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "Ако се обидувате да го употребите Tor клиентот, Ве молиме посетете ја <a href=\"https://www.torproject.org/\">веб-локацијата на Tor</a> а особено <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">упатствата за конфигурација на Вашиот instructions Tor клиент</a>." +msgstr "Ако се обидувате да го употребите Tor клиентот, Ве молиме посетете ја <a href=\"https://www.torproject.org/\">веб-локацијата на Tor</a> а особено <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">упатствата за конфигурација на Вашиот Tor клиент</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Жал ни е, но или Вашето барање не успеа или примивме неочекуван одговор." @@ -96,10 +97,10 @@ msgid "JavaScript is disabled." msgstr "Опцијата JavaScript е оневозможена." msgid "However, it does not appear to be Tor Browser." -msgstr "" +msgstr "Како и да е, не изгледа дека е Tor прелистувач." msgid "Run a Relay" -msgstr "" +msgstr "Покрени јазол" msgid "Stay Anonymous" -msgstr "" +msgstr "Останете анонимни"

1 0

[tor/master] On exit, free the event_base and set its pointer to NULL.
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 322abc030e53c7e84ca9f22a47b2965f262f5ffa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 11:33:54 2017 -0500 On exit, free the event_base and set its pointer to NULL. When we didn't do this before, we'd have some still-reachable memory warnings, and we'd find ourselves crashing when we tried to reinitialize libevent. Part of 24581 (don't crash when restarting Tor in-process) --- src/common/compat_libevent.c | 10 ++++++++++ src/common/compat_libevent.h | 1 + src/or/main.c | 1 + 3 files changed, 12 insertions(+) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 10489bf29..b5e9cc933 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -237,6 +237,16 @@ tor_init_libevent_rng(void) return rv; } +/** + * Un-initialize libevent in preparation for an exit + */ +void +tor_libevent_free_all(void) +{ + event_base_free(the_event_base); + the_event_base = NULL; +} + #if defined(LIBEVENT_VERSION_NUMBER) && \ LIBEVENT_VERSION_NUMBER >= V(2,1,1) && \ !defined(TOR_UNIT_TESTS) diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 0cdb73fbb..1853e5091 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -52,6 +52,7 @@ const char *tor_libevent_get_method(void); void tor_check_libevent_header_compatibility(void); const char *tor_libevent_get_version_str(void); const char *tor_libevent_get_header_version_str(void); +void tor_libevent_free_all(void); int tor_init_libevent_rng(void); diff --git a/src/or/main.c b/src/or/main.c index aae98dd8a..bebe9fff4 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3388,6 +3388,7 @@ tor_free_all(int postfork) if (!postfork) { release_lockfile(); } + tor_libevent_free_all(); /* Stuff in util.c and address.c*/ if (!postfork) { escaped(NULL);

1 0

[tor/master] Mark libevent unitialized on shutdown.
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 474ca13d6a5e8aa2cf099e92e68eb932b15b2315 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 11:37:20 2017 -0500 Mark libevent unitialized on shutdown. This is necessary so that we will reinitialize it on startup. --- src/or/config.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 23184af31..e7d11df07 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -796,6 +796,8 @@ static smartlist_t *configured_ports = NULL; /** True iff we're currently validating options, and any calls to * get_options() are likely to be bugs. */ static int in_option_validation = 0; +/* True iff we've initialized libevent */ +static int libevent_initialized = 0; /** Return the contents of our frontpage string, or NULL if not configured. */ MOCK_IMPL(const char*, @@ -986,6 +988,7 @@ config_free_all(void) tor_free(the_tor_version); have_parsed_cmdline = 0; + libevent_initialized = 0; } /** Make address -- a piece of information related to our operation as @@ -1336,7 +1339,6 @@ options_act_reversible(const or_options_t *old_options, char **msg) { smartlist_t *new_listeners = smartlist_new(); smartlist_t *replaced_listeners = smartlist_new(); - static int libevent_initialized = 0; or_options_t *options = get_options_mutable(); int running_tor = options->command == CMD_RUN_TOR; int set_conn_limit = 0;

1 0

[tor/master] Set DH parameters to NULL on shutdown
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 06ffafcb9d4107297b6e72ee53d6e6db782cbdea Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 11:37:54 2017 -0500 Set DH parameters to NULL on shutdown If we don't do this, we will use freed memory on restart. Part of 24581. --- src/common/crypto.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common/crypto.c b/src/common/crypto.c index 575bfd0c0..45aa3a02c 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -3470,6 +3470,8 @@ crypto_global_cleanup(void) if (dh_param_g) BN_clear_free(dh_param_g); + dh_param_p = dh_param_p_tls = dh_param_g = NULL; + #ifndef DISABLE_ENGINES ENGINE_cleanup(); #endif

1 0

[tor/master] Changes file and tor_api.h tweaks for 24581.
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 3b465ebf2eedecfa0659f91a6ed7dc667e7acde7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 11:55:41 2017 -0500 Changes file and tor_api.h tweaks for 24581. --- changes/bug24581 | 7 +++++++ src/or/tor_api.h | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/bug24581 b/changes/bug24581 new file mode 100644 index 000000000..d8ddce3cc --- /dev/null +++ b/changes/bug24581 @@ -0,0 +1,7 @@ + o Major features (embedding): + - Tor now has support for restarting in the same process. + Controllers that run Tor using the "tor_api.h" interface can now + restart Tor after Tor has exited. This support is incomplete, however: + we have fixed the crash bugs that prevented it from working at all + before, but many bugs probably remain. Implements ticket 24581. + diff --git a/src/or/tor_api.h b/src/or/tor_api.h index b12ed718c..e7d70c2a6 100644 --- a/src/or/tor_api.h +++ b/src/or/tor_api.h @@ -71,8 +71,9 @@ void tor_main_configuration_free(tor_main_configuration_t *cfg); * fix it. * * BUG 23847: You can only call tor_main() once in a single process; if it - * returns and you call it again, you may crash. This is not intended - * long-term behavior; we are trying to fix it. + * returns and you call it again, you may crash, or you may encounter other + * unexpected behavior. This is not intended long-term behavior; we are + * trying to fix it. * * LIMITATION: You cannot run more than one instance of Tor in the same * process at the same time. Concurrent calls will cause undefined behavior.

1 0

[tor/master] Merge branch 'restart_nocrash'
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 05ac3d0458466bd8ffc69339a4bf8e34088d9d80 Merge: 751595551 3b465ebf2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 12:45:25 2018 -0500 Merge branch 'restart_nocrash' changes/bug24581 | 7 +++++++ src/common/compat_libevent.c | 10 ++++++++++ src/common/compat_libevent.h | 1 + src/common/crypto.c | 2 ++ src/or/config.c | 4 +++- src/or/main.c | 1 + src/or/tor_api.h | 5 +++-- 7 files changed, 27 insertions(+), 3 deletions(-)

1 0

[tor/master] Make the warnings about restarting tor in-process more scary.
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 18ea91ee6b3ad2a8088d6fb3361c9a598ceffe83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 12:46:50 2018 -0500 Make the warnings about restarting tor in-process more scary. --- changes/bug24581 | 3 ++- src/or/tor_api.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug24581 b/changes/bug24581 index d8ddce3cc..9a5daa01c 100644 --- a/changes/bug24581 +++ b/changes/bug24581 @@ -3,5 +3,6 @@ Controllers that run Tor using the "tor_api.h" interface can now restart Tor after Tor has exited. This support is incomplete, however: we have fixed the crash bugs that prevented it from working at all - before, but many bugs probably remain. Implements ticket 24581. + before, but many bugs probably remain, including the possibility of + security issues. Implements ticket 24581. diff --git a/src/or/tor_api.h b/src/or/tor_api.h index e7d70c2a6..7e86c7fec 100644 --- a/src/or/tor_api.h +++ b/src/or/tor_api.h @@ -72,8 +72,8 @@ void tor_main_configuration_free(tor_main_configuration_t *cfg); * * BUG 23847: You can only call tor_main() once in a single process; if it * returns and you call it again, you may crash, or you may encounter other - * unexpected behavior. This is not intended long-term behavior; we are - * trying to fix it. + * unexpected behavior, including possible security issues. This is not + * intended long-term behavior; we are trying to fix it. * * LIMITATION: You cannot run more than one instance of Tor in the same * process at the same time. Concurrent calls will cause undefined behavior.

1 0

[tor/master] On shutdown, mark openssl as uninitialized.
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 42751e2123f6dcc87f3992d38c1889f7da981a7b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 12:49:28 2018 -0500 On shutdown, mark openssl as uninitialized. This causes openssl to get completely reinitialized on startup, which is probably a good idea. --- src/common/crypto.c | 9 ++++++++- src/ext/csiphash.c | 6 ++++++ src/ext/siphash.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 85bed538e..b519caed0 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -283,11 +283,12 @@ crypto_force_rand_ssleay(void) return 0; } +static int have_seeded_siphash = 0; + /** Set up the siphash key if we haven't already done so. */ int crypto_init_siphash_key(void) { - static int have_seeded_siphash = 0; struct sipkey key; if (have_seeded_siphash) return 0; @@ -3495,6 +3496,12 @@ crypto_global_cleanup(void) tor_free(crypto_openssl_version_str); tor_free(crypto_openssl_header_version_str); + + crypto_early_initialized_ = 0; + crypto_global_initialized_ = 0; + have_seeded_siphash = 0; + siphash_unset_global_key(); + return 0; } diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c index 508e4f6ce..0427c8795 100644 --- a/src/ext/csiphash.c +++ b/src/ext/csiphash.c @@ -123,3 +123,9 @@ void siphash_set_global_key(const struct sipkey *key) the_siphash_key.k1 = key->k1; the_siphash_key_is_set = 1; } + +void siphash_unset_global_key(void) +{ + the_siphash_key_is_set = 0; + memset(&the_siphash_key, 0, sizeof(the_siphash_key)); +} diff --git a/src/ext/siphash.h b/src/ext/siphash.h index d9b34b898..730e49937 100644 --- a/src/ext/siphash.h +++ b/src/ext/siphash.h @@ -9,5 +9,6 @@ uint64_t siphash24(const void *src, unsigned long src_sz, const struct sipkey *k void siphash_set_global_key(const struct sipkey *key); uint64_t siphash24g(const void *src, unsigned long src_sz); +void siphash_unset_global_key(void); #endif

1 0

[tor/master] Use same macros to simplify options_transition_affects_*
by nickm＠torproject.org 11 Jan '18

11 Jan '18

commit 93e7b837c83f8188abb701749c04063998affa61 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 15 15:33:29 2017 -0500 Use same macros to simplify options_transition_affects_* --- src/or/config.c | 129 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 69 insertions(+), 60 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 0eaeffaac..183c73eae 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1677,32 +1677,46 @@ get_effective_bwburst(const or_options_t *options) return (uint32_t)bw; } +/* Used in the various options_transition_affects* functions. */ +#define YES_IF_CHANGED_BOOL(opt) \ + if (!CFG_EQ_BOOL(old_options, new_options, opt)) return 1; +#define YES_IF_CHANGED_INT(opt) \ + if (!CFG_EQ_INT(old_options, new_options, opt)) return 1; +#define YES_IF_CHANGED_STRING(opt) \ + if (!CFG_EQ_STRING(old_options, new_options, opt)) return 1; +#define YES_IF_CHANGED_LINELIST(opt) \ + if (!CFG_EQ_LINELIST(old_options, new_options, opt)) return 1; +#define YES_IF_CHANGED_SMARTLIST(opt) \ + if (!CFG_EQ_SMARTLIST(old_options, new_options, opt)) return 1; +#define YES_IF_CHANGED_ROUTERSET(opt) \ + if (!CFG_EQ_ROUTERSET(old_options, new_options, opt)) return 1; + /** * Return true if changing the configuration from old to new - * affects the guard susbsystem. + * affects the guard subsystem. */ static int -options_transition_affects_guards(const or_options_t *old, - const or_options_t *new) +options_transition_affects_guards(const or_options_t *old_options, + const or_options_t *new_options) { /* NOTE: Make sure this function stays in sync with * node_passes_guard_filter */ + tor_assert(old_options); + tor_assert(new_options); + + YES_IF_CHANGED_BOOL(UseEntryGuards); + YES_IF_CHANGED_BOOL(UseBridges); + YES_IF_CHANGED_BOOL(ClientUseIPv4); + YES_IF_CHANGED_BOOL(ClientUseIPv6); + YES_IF_CHANGED_BOOL(FascistFirewall); + YES_IF_CHANGED_ROUTERSET(ExcludeNodes); + YES_IF_CHANGED_ROUTERSET(EntryNodes); + YES_IF_CHANGED_SMARTLIST(FirewallPorts); + YES_IF_CHANGED_LINELIST(Bridges); + YES_IF_CHANGED_LINELIST(ReachableORAddresses); + YES_IF_CHANGED_LINELIST(ReachableDirAddresses); - tor_assert(old); - tor_assert(new); - - return - (old->UseEntryGuards != new->UseEntryGuards || - old->UseBridges != new->UseBridges || - old->ClientUseIPv4 != new->ClientUseIPv4 || - old->ClientUseIPv6 != new->ClientUseIPv6 || - old->FascistFirewall != new->FascistFirewall || - !routerset_equal(old->ExcludeNodes, new->ExcludeNodes) || - !routerset_equal(old->EntryNodes, new->EntryNodes) || - !smartlist_strings_eq(old->FirewallPorts, new->FirewallPorts) || - !config_lines_eq(old->Bridges, new->Bridges) || - !config_lines_eq(old->ReachableORAddresses, new->ReachableORAddresses) || - !config_lines_eq(old->ReachableDirAddresses, new->ReachableDirAddresses)); + return 0; } /** Fetch the active option list, and take actions based on it. All of the @@ -4712,21 +4726,19 @@ static int options_transition_affects_workers(const or_options_t *old_options, const or_options_t *new_options) { - if (!opt_streq(old_options->DataDirectory, new_options->DataDirectory) || - old_options->NumCPUs != new_options->NumCPUs || - !config_lines_eq(old_options->ORPort_lines, new_options->ORPort_lines) || - old_options->ServerDNSSearchDomains != - new_options->ServerDNSSearchDomains || - old_options->SafeLogging_ != new_options->SafeLogging_ || - old_options->ClientOnly != new_options->ClientOnly || - server_mode(old_options) != server_mode(new_options) || - public_server_mode(old_options) != public_server_mode(new_options) || - !config_lines_eq(old_options->Logs, new_options->Logs) || - old_options->LogMessageDomains != new_options->LogMessageDomains) + YES_IF_CHANGED_STRING(DataDirectory); + YES_IF_CHANGED_INT(NumCPUs); + YES_IF_CHANGED_LINELIST(ORPort_lines); + YES_IF_CHANGED_BOOL(ServerDNSSearchDomains); + YES_IF_CHANGED_BOOL(SafeLogging_); + YES_IF_CHANGED_BOOL(ClientOnly); + YES_IF_CHANGED_BOOL(LogMessageDomains); + YES_IF_CHANGED_LINELIST(Logs); + + if (server_mode(old_options) != server_mode(new_options) || + public_server_mode(old_options) != public_server_mode(new_options)) return 1; - /* Check whether log options match. */ - /* Nothing that changed matters. */ return 0; } @@ -4739,37 +4751,34 @@ options_transition_affects_descriptor(const or_options_t *old_options, { /* XXX We can be smarter here. If your DirPort isn't being * published and you just turned it off, no need to republish. Etc. */ - if (!opt_streq(old_options->DataDirectory, new_options->DataDirectory) || - !opt_streq(old_options->Nickname,new_options->Nickname) || - !opt_streq(old_options->Address,new_options->Address) || - !config_lines_eq(old_options->ExitPolicy,new_options->ExitPolicy) || - old_options->ExitRelay != new_options->ExitRelay || - old_options->ExitPolicyRejectPrivate != - new_options->ExitPolicyRejectPrivate || - old_options->ExitPolicyRejectLocalInterfaces != - new_options->ExitPolicyRejectLocalInterfaces || - old_options->IPv6Exit != new_options->IPv6Exit || - !config_lines_eq(old_options->ORPort_lines, - new_options->ORPort_lines) || - !config_lines_eq(old_options->DirPort_lines, - new_options->DirPort_lines) || - old_options->ClientOnly != new_options->ClientOnly || - old_options->DisableNetwork != new_options->DisableNetwork || - old_options->PublishServerDescriptor_ != - new_options->PublishServerDescriptor_ || - get_effective_bwrate(old_options) != get_effective_bwrate(new_options) || + + YES_IF_CHANGED_STRING(DataDirectory); + YES_IF_CHANGED_STRING(Nickname); + YES_IF_CHANGED_STRING(Address); + YES_IF_CHANGED_LINELIST(ExitPolicy); + YES_IF_CHANGED_BOOL(ExitRelay); + YES_IF_CHANGED_BOOL(ExitPolicyRejectPrivate); + YES_IF_CHANGED_BOOL(ExitPolicyRejectLocalInterfaces); + YES_IF_CHANGED_BOOL(IPv6Exit); + YES_IF_CHANGED_LINELIST(ORPort_lines); + YES_IF_CHANGED_LINELIST(DirPort_lines); + YES_IF_CHANGED_LINELIST(DirPort_lines); + YES_IF_CHANGED_BOOL(ClientOnly); + YES_IF_CHANGED_BOOL(DisableNetwork); + YES_IF_CHANGED_BOOL(PublishServerDescriptor_); + YES_IF_CHANGED_STRING(ContactInfo); + YES_IF_CHANGED_STRING(BridgeDistribution); + YES_IF_CHANGED_LINELIST(MyFamily); + YES_IF_CHANGED_STRING(AccountingStart); + YES_IF_CHANGED_INT(AccountingMax); + YES_IF_CHANGED_INT(AccountingRule); + YES_IF_CHANGED_BOOL(DirCache); + YES_IF_CHANGED_BOOL(AssumeReachable); + + if (get_effective_bwrate(old_options) != get_effective_bwrate(new_options) || get_effective_bwburst(old_options) != get_effective_bwburst(new_options) || - !opt_streq(old_options->ContactInfo, new_options->ContactInfo) || - !opt_streq(old_options->BridgeDistribution, - new_options->BridgeDistribution) || - !config_lines_eq(old_options->MyFamily, new_options->MyFamily) || - !opt_streq(old_options->AccountingStart, new_options->AccountingStart) || - old_options->AccountingMax != new_options->AccountingMax || - old_options->AccountingRule != new_options->AccountingRule || - public_server_mode(old_options) != public_server_mode(new_options) || - old_options->DirCache != new_options->DirCache || - old_options->AssumeReachable != new_options->AssumeReachable) + public_server_mode(old_options) != public_server_mode(new_options)) return 1; return 0;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2018