April 2018 - tor-commits - lists.torproject.org

[webwml/master] Change isa profile picture
by hiro＠torproject.org 23 Apr '18

23 Apr '18

commit f52353349b2faedd19dbcdda7a761a0f0804d204 Author: hiro <hiro(a)torproject.org> Date: Mon Apr 23 18:17:02 2018 +0200 Change isa profile picture --- images/people/orig/isabela.jpg | Bin 16817 -> 896719 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/people/orig/isabela.jpg b/images/people/orig/isabela.jpg index 4d0b1fc2..65cf9af1 100644 Binary files a/images/people/orig/isabela.jpg and b/images/people/orig/isabela.jpg differ

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 23 Apr '18

23 Apr '18

commit 6d124491afc37ee4d66548fd762c08b07d487023 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 23 16:15:11 2018 +0000 Update translations for bridgedb_completed --- pt_BR/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 589710e9c..4aa4a8c87 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-04-23 15:38+0000\n" +"PO-Revision-Date: 2018-04-23 15:59+0000\n" "Last-Translator: Cláudio Carvalho <znnb(a)mail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -73,7 +73,7 @@ msgstr "Mostrar Código QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "Código QR para sua ponte de conexão" +msgstr "Código QR para suas pontes de conexão" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -92,7 +92,7 @@ msgstr "Parece que houve um erro ao obter seu Código QR." msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Este Código QR contém suas pontes de conexão. Escaneie-o com um leitor de Código QR para copiar as pontes de conexão para dispositivos móveis e outros." +msgstr "O Código QR contém suas pontes de conexão. Escaneie com um leitor de Código QR para copiar as pontes de conexão para dispositivos móveis e outros." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -142,7 +142,7 @@ msgstr "Agora, %s inserir as pontes no Navegador Tor %s" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sS%só me dê pontes!" +msgstr "%sA%spenas pontes" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 23 Apr '18

23 Apr '18

commit dea1ca76458ecffabbb24481b678ed8350a77793 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 23 16:15:04 2018 +0000 Update translations for bridgedb --- pt_BR/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 589710e9c..4aa4a8c87 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-04-23 15:38+0000\n" +"PO-Revision-Date: 2018-04-23 15:59+0000\n" "Last-Translator: Cláudio Carvalho <znnb(a)mail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -73,7 +73,7 @@ msgstr "Mostrar Código QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "Código QR para sua ponte de conexão" +msgstr "Código QR para suas pontes de conexão" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -92,7 +92,7 @@ msgstr "Parece que houve um erro ao obter seu Código QR." msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Este Código QR contém suas pontes de conexão. Escaneie-o com um leitor de Código QR para copiar as pontes de conexão para dispositivos móveis e outros." +msgstr "O Código QR contém suas pontes de conexão. Escaneie com um leitor de Código QR para copiar as pontes de conexão para dispositivos móveis e outros." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." @@ -142,7 +142,7 @@ msgstr "Agora, %s inserir as pontes no Navegador Tor %s" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sS%só me dê pontes!" +msgstr "%sA%spenas pontes" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 23 Apr '18

23 Apr '18

commit 046cd354077985cbb0a1ff3d31888d5614f89b52 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 23 15:45:11 2018 +0000 Update translations for bridgedb_completed --- pt_BR/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 53e4b9329..589710e9c 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2013-2017 # anominino anomino <anominino(a)riseup.net>, 2018 +# Cláudio Carvalho <znnb(a)mail.com>, 2018 # Danton Medrado, 2015 # Eduardo Bonsi, 2015 # Eduardo Loeffel Noce Gobi <eduardogobi(a)outlook.com>, 2016-2017 @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-04-12 18:54+0000\n" -"Last-Translator: Joeffison Silvério de Andrade <joeffison(a)gmail.com>\n" +"PO-Revision-Date: 2018-04-23 15:38+0000\n" +"Last-Translator: Cláudio Carvalho <znnb(a)mail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,7 +73,7 @@ msgstr "Mostrar Código QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "Código QR para suas pontes de conexão" +msgstr "Código QR para sua ponte de conexão" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example,

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 23 Apr '18

23 Apr '18

commit c6404bc75f68c95ea6329a335acbedb44bed0504 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 23 15:45:04 2018 +0000 Update translations for bridgedb --- pt_BR/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 53e4b9329..589710e9c 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -5,6 +5,7 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2013-2017 # anominino anomino <anominino(a)riseup.net>, 2018 +# Cláudio Carvalho <znnb(a)mail.com>, 2018 # Danton Medrado, 2015 # Eduardo Bonsi, 2015 # Eduardo Loeffel Noce Gobi <eduardogobi(a)outlook.com>, 2016-2017 @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-04-12 18:54+0000\n" -"Last-Translator: Joeffison Silvério de Andrade <joeffison(a)gmail.com>\n" +"PO-Revision-Date: 2018-04-23 15:38+0000\n" +"Last-Translator: Cláudio Carvalho <znnb(a)mail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,7 +73,7 @@ msgstr "Mostrar Código QR" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "Código QR para suas pontes de conexão" +msgstr "Código QR para sua ponte de conexão" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example,

1 0

[tor/master] main: Sort alphabetically periodic event callbacks
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 269cd5dba705e0a8ce30f473128779f34caf4da6 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Apr 16 15:26:49 2018 -0400 main: Sort alphabetically periodic event callbacks No behavior change, just to make it easier to find callbacks and for the sake of our human brain to parse the list properly. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/main.c | 80 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index a852d3273..5d64eb69b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1316,34 +1316,34 @@ static int periodic_events_initialized = 0; #undef CALLBACK #define CALLBACK(name) \ static int name ## _callback(time_t, const or_options_t *) -CALLBACK(rotate_onion_key); -CALLBACK(check_onion_keys_expiry_time); -CALLBACK(check_ed_keys); -CALLBACK(launch_descriptor_fetches); -CALLBACK(rotate_x509_certificate); CALLBACK(add_entropy); -CALLBACK(launch_reachability_tests); -CALLBACK(downrate_stability); -CALLBACK(save_stability); CALLBACK(check_authority_cert); +CALLBACK(check_canonical_channels); +CALLBACK(check_descriptor); +CALLBACK(check_dns_honesty); +CALLBACK(check_ed_keys); CALLBACK(check_expired_networkstatus); -CALLBACK(write_stats_file); -CALLBACK(record_bridge_stats); +CALLBACK(check_for_reachability_bw); +CALLBACK(check_onion_keys_expiry_time); CALLBACK(clean_caches); +CALLBACK(clean_consdiffmgr); +CALLBACK(downrate_stability); +CALLBACK(expire_old_ciruits_serverside); +CALLBACK(fetch_networkstatus); +CALLBACK(heartbeat); +CALLBACK(hs_service); +CALLBACK(launch_descriptor_fetches); +CALLBACK(launch_reachability_tests); +CALLBACK(record_bridge_stats); CALLBACK(rend_cache_failure_clean); +CALLBACK(reset_padding_counts); CALLBACK(retry_dns); -CALLBACK(check_descriptor); -CALLBACK(check_for_reachability_bw); -CALLBACK(fetch_networkstatus); CALLBACK(retry_listeners); -CALLBACK(expire_old_ciruits_serverside); -CALLBACK(check_dns_honesty); +CALLBACK(rotate_onion_key); +CALLBACK(rotate_x509_certificate); +CALLBACK(save_stability); CALLBACK(write_bridge_ns); -CALLBACK(heartbeat); -CALLBACK(clean_consdiffmgr); -CALLBACK(reset_padding_counts); -CALLBACK(check_canonical_channels); -CALLBACK(hs_service); +CALLBACK(write_stats_file); #undef CALLBACK @@ -1351,34 +1351,34 @@ CALLBACK(hs_service); #define CALLBACK(name) PERIODIC_EVENT(name) static periodic_event_item_t periodic_events[] = { - CALLBACK(rotate_onion_key), - CALLBACK(check_onion_keys_expiry_time), - CALLBACK(check_ed_keys), - CALLBACK(launch_descriptor_fetches), - CALLBACK(rotate_x509_certificate), CALLBACK(add_entropy), - CALLBACK(launch_reachability_tests), - CALLBACK(downrate_stability), - CALLBACK(save_stability), CALLBACK(check_authority_cert), + CALLBACK(check_canonical_channels), + CALLBACK(check_descriptor), + CALLBACK(check_dns_honesty), + CALLBACK(check_ed_keys), CALLBACK(check_expired_networkstatus), - CALLBACK(write_stats_file), - CALLBACK(record_bridge_stats), + CALLBACK(check_for_reachability_bw), + CALLBACK(check_onion_keys_expiry_time), CALLBACK(clean_caches), + CALLBACK(clean_consdiffmgr), + CALLBACK(downrate_stability), + CALLBACK(expire_old_ciruits_serverside), + CALLBACK(fetch_networkstatus), + CALLBACK(heartbeat), + CALLBACK(hs_service), + CALLBACK(launch_descriptor_fetches), + CALLBACK(launch_reachability_tests), + CALLBACK(record_bridge_stats), CALLBACK(rend_cache_failure_clean), + CALLBACK(reset_padding_counts), CALLBACK(retry_dns), - CALLBACK(check_descriptor), - CALLBACK(check_for_reachability_bw), - CALLBACK(fetch_networkstatus), CALLBACK(retry_listeners), - CALLBACK(expire_old_ciruits_serverside), - CALLBACK(check_dns_honesty), + CALLBACK(rotate_onion_key), + CALLBACK(rotate_x509_certificate), + CALLBACK(save_stability), CALLBACK(write_bridge_ns), - CALLBACK(heartbeat), - CALLBACK(clean_consdiffmgr), - CALLBACK(reset_padding_counts), - CALLBACK(check_canonical_channels), - CALLBACK(hs_service), + CALLBACK(write_stats_file), END_OF_PERIODIC_EVENTS }; #undef CALLBACK

1 0

[tor/master] main: Launch periodic events by roles
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit a4fcdc5decfe60bbd95aee2e5586e90c40b73225 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 17 09:31:50 2018 -0400 main: Launch periodic events by roles Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/main.c | 40 +++++++++++++++++++++++++++++++++++++--- src/or/networkstatus.c | 2 +- src/or/networkstatus.h | 2 ++ src/or/periodic.c | 12 +++++++++++- src/or/periodic.h | 14 ++++++++++++-- 5 files changed, 63 insertions(+), 7 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 5ca6277c1..52e83822e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1437,6 +1437,32 @@ find_periodic_event(const char *name) return NULL; } +/** Return a bitmask of the roles this tor instance is configured for using + * the given options. */ +static int +get_my_roles(const or_options_t *options) +{ + tor_assert(options); + + int roles = 0; + int is_bridge = options->BridgeRelay; + int is_client = any_client_port_set(options); + int is_relay = server_mode(options); + int is_dirauth = authdir_mode_v3(options); + int is_bridgeauth = authdir_mode_bridge(options); + int is_hidden_service = !!hs_service_get_num_services() || + !!rend_num_services(); + + if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE; + if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT; + if (is_relay) roles |= PERIODIC_EVENT_ROLE_RELAY; + if (is_dirauth) roles |= PERIODIC_EVENT_ROLE_DIRAUTH; + if (is_bridgeauth) roles |= PERIODIC_EVENT_ROLE_BRIDGEAUTH; + if (is_hidden_service) roles |= PERIODIC_EVENT_ROLE_HS_SERVICE; + + return roles; +} + /** Event to run initialize_periodic_events_cb */ static struct event *initialize_periodic_events_event = NULL; @@ -1451,10 +1477,17 @@ initialize_periodic_events_cb(evutil_socket_t fd, short events, void *data) (void) fd; (void) events; (void) data; + + int roles = get_my_roles(get_options()); + tor_event_free(initialize_periodic_events_event); - int i; - for (i = 0; periodic_events[i].name; ++i) { - periodic_event_launch(&periodic_events[i]); + + for (int i = 0; periodic_events[i].name; ++i) { + periodic_event_item_t *item = &periodic_events[i]; + if (item->roles & roles && !periodic_event_is_enabled(item)) { + periodic_event_launch(item); + log_debug(LD_GENERAL, "Launching periodic event %s", item->name); + } } } @@ -1466,6 +1499,7 @@ initialize_periodic_events(void) tor_assert(periodic_events_initialized == 0); periodic_events_initialized = 1; + /* Set up all periodic events. We'll launch them by roles. */ int i; for (i = 0; periodic_events[i].name; ++i) { periodic_event_setup(&periodic_events[i]); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 5f19792c7..b0db0cecb 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1680,7 +1680,7 @@ networkstatus_set_current_consensus_from_ns(networkstatus_t *c, * XXXX If we need this elsewhere at any point, we should make it nonstatic * XXXX and move it into another file. */ -static int +int any_client_port_set(const or_options_t *options) { return (options->SocksPort_set || diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 1851a55e8..04cf277d2 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -140,6 +140,8 @@ void vote_routerstatus_free_(vote_routerstatus_t *rs); #define vote_routerstatus_free(rs) \ FREE_AND_NULL(vote_routerstatus_t, vote_routerstatus_free_, (rs)) +int any_client_port_set(const or_options_t *options); + #ifdef NETWORKSTATUS_PRIVATE #ifdef TOR_UNIT_TESTS STATIC int networkstatus_set_current_consensus_from_ns(networkstatus_t *c, diff --git a/src/or/periodic.c b/src/or/periodic.c index fa40965de..42bea3ae6 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -78,7 +78,10 @@ periodic_event_dispatch(mainloop_event_t *ev, void *data) void periodic_event_reschedule(periodic_event_item_t *event) { - periodic_event_set_interval(event, 1); + /* Don't reschedule a disabled event. */ + if (periodic_event_is_enabled(event)) { + periodic_event_set_interval(event, 1); + } } /** Initializes the libevent backend for a periodic event. */ @@ -104,9 +107,15 @@ periodic_event_launch(periodic_event_item_t *event) log_err(LD_BUG, "periodic_event_launch without periodic_event_setup"); tor_assert(0); } + /* Event already enabled? This is a bug */ + if (periodic_event_is_enabled(event)) { + log_err(LD_BUG, "periodic_event_launch on an already enabled event"); + tor_assert(0); + } // Initial dispatch periodic_event_dispatch(event->ev, event); + event->enabled = 1; } /** Release all storage associated with event */ @@ -117,5 +126,6 @@ periodic_event_destroy(periodic_event_item_t *event) return; mainloop_event_free(event->ev); event->last_action_time = 0; + event->enabled = 0; } diff --git a/src/or/periodic.h b/src/or/periodic.h index 4544ae276..1b346a1cc 100644 --- a/src/or/periodic.h +++ b/src/or/periodic.h @@ -49,11 +49,21 @@ typedef struct periodic_event_item_t { /* Bitmask of roles define above for which this event applies. */ uint32_t roles; + /* Indicate that this event has been enabled that is scheduled. */ + unsigned int enabled : 1; } periodic_event_item_t; /** events will get their interval from first execution */ -#define PERIODIC_EVENT(fn, r) { fn##_callback, 0, NULL, #fn, r } -#define END_OF_PERIODIC_EVENTS { NULL, 0, NULL, NULL, 0 } +#define PERIODIC_EVENT(fn, r) { fn##_callback, 0, NULL, #fn, r, 0 } +#define END_OF_PERIODIC_EVENTS { NULL, 0, NULL, NULL, 0, 0 } + +/* Return true iff the given event was setup before thus is enabled to be + * scheduled. */ +static inline int +periodic_event_is_enabled(const periodic_event_item_t *item) +{ + return item->enabled; +} void periodic_event_launch(periodic_event_item_t *event); void periodic_event_setup(periodic_event_item_t *event);

1 0

[tor/master] main: Specialize the periodic events on a per-role basis
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit ed89bb32535fbf354b406a36f3176380a4e226bf Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Apr 16 15:50:50 2018 -0400 main: Specialize the periodic events on a per-role basis In tor, we have a series of possible "roles" that the tor daemon can be enabled for. They are: Client, Bridge, Relay, Authority (directory or bridge) and Onion service. They can be combined sometimes. For instance, a Directory Authority is also a Relay. This adds a "roles" field to a periodic event item object which is used to know for which roles the event is for. The next step is to enable the event only if the roles apply. No behavior change at this commit. Pars of #25762 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/main.c | 75 ++++++++++++++++++++++++++++++++++--------------------- src/or/periodic.h | 30 ++++++++++++++++++++-- 2 files changed, 74 insertions(+), 31 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 5d64eb69b..5ca6277c1 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1348,37 +1348,54 @@ CALLBACK(write_stats_file); #undef CALLBACK /* Now we declare an array of periodic_event_item_t for each periodic event */ -#define CALLBACK(name) PERIODIC_EVENT(name) +#define CALLBACK(name, r) PERIODIC_EVENT(name, r) static periodic_event_item_t periodic_events[] = { - CALLBACK(add_entropy), - CALLBACK(check_authority_cert), - CALLBACK(check_canonical_channels), - CALLBACK(check_descriptor), - CALLBACK(check_dns_honesty), - CALLBACK(check_ed_keys), - CALLBACK(check_expired_networkstatus), - CALLBACK(check_for_reachability_bw), - CALLBACK(check_onion_keys_expiry_time), - CALLBACK(clean_caches), - CALLBACK(clean_consdiffmgr), - CALLBACK(downrate_stability), - CALLBACK(expire_old_ciruits_serverside), - CALLBACK(fetch_networkstatus), - CALLBACK(heartbeat), - CALLBACK(hs_service), - CALLBACK(launch_descriptor_fetches), - CALLBACK(launch_reachability_tests), - CALLBACK(record_bridge_stats), - CALLBACK(rend_cache_failure_clean), - CALLBACK(reset_padding_counts), - CALLBACK(retry_dns), - CALLBACK(retry_listeners), - CALLBACK(rotate_onion_key), - CALLBACK(rotate_x509_certificate), - CALLBACK(save_stability), - CALLBACK(write_bridge_ns), - CALLBACK(write_stats_file), + /* Everyone needs to run those. */ + CALLBACK(add_entropy, PERIODIC_EVENT_ROLE_ALL), + CALLBACK(check_expired_networkstatus, PERIODIC_EVENT_ROLE_ALL), + CALLBACK(clean_caches, PERIODIC_EVENT_ROLE_ALL), + CALLBACK(fetch_networkstatus, PERIODIC_EVENT_ROLE_ALL), + CALLBACK(heartbeat, PERIODIC_EVENT_ROLE_ALL), + CALLBACK(launch_descriptor_fetches, PERIODIC_EVENT_ROLE_ALL), + CALLBACK(reset_padding_counts, PERIODIC_EVENT_ROLE_ALL), + CALLBACK(retry_listeners, PERIODIC_EVENT_ROLE_ALL), + CALLBACK(rotate_x509_certificate, PERIODIC_EVENT_ROLE_ALL), + CALLBACK(write_stats_file, PERIODIC_EVENT_ROLE_ALL), + + /* Routers (bridge and relay) only. */ + CALLBACK(check_descriptor, PERIODIC_EVENT_ROLE_ROUTER), + CALLBACK(check_ed_keys, PERIODIC_EVENT_ROLE_ROUTER), + CALLBACK(check_for_reachability_bw, PERIODIC_EVENT_ROLE_ROUTER), + CALLBACK(check_onion_keys_expiry_time, PERIODIC_EVENT_ROLE_ROUTER), + CALLBACK(clean_consdiffmgr, PERIODIC_EVENT_ROLE_ROUTER), + CALLBACK(expire_old_ciruits_serverside, PERIODIC_EVENT_ROLE_ROUTER), + CALLBACK(retry_dns, PERIODIC_EVENT_ROLE_ROUTER), + CALLBACK(rotate_onion_key, PERIODIC_EVENT_ROLE_ROUTER), + + /* Authorities (bridge and directory) only. */ + CALLBACK(downrate_stability, PERIODIC_EVENT_ROLE_AUTHORITIES), + CALLBACK(launch_reachability_tests, PERIODIC_EVENT_ROLE_AUTHORITIES), + CALLBACK(save_stability, PERIODIC_EVENT_ROLE_AUTHORITIES), + + /* Directory authority only. */ + CALLBACK(check_authority_cert, PERIODIC_EVENT_ROLE_DIRAUTH), + + /* Relay only. */ + CALLBACK(check_canonical_channels, PERIODIC_EVENT_ROLE_RELAY), + CALLBACK(check_dns_honesty, PERIODIC_EVENT_ROLE_RELAY), + + /* Hidden Service service only. */ + CALLBACK(hs_service, PERIODIC_EVENT_ROLE_HS_SERVICE), + + /* Bridge only. */ + CALLBACK(record_bridge_stats, PERIODIC_EVENT_ROLE_BRIDGE), + + /* Client only. */ + CALLBACK(rend_cache_failure_clean, PERIODIC_EVENT_ROLE_CLIENT), + + /* Bridge Authority only. */ + CALLBACK(write_bridge_ns, PERIODIC_EVENT_ROLE_BRIDGEAUTH), END_OF_PERIODIC_EVENTS }; #undef CALLBACK diff --git a/src/or/periodic.h b/src/or/periodic.h index 285400b8b..4544ae276 100644 --- a/src/or/periodic.h +++ b/src/or/periodic.h @@ -6,6 +6,29 @@ #define PERIODIC_EVENT_NO_UPDATE (-1) +/* Tor roles for which a periodic event item is for. An event can be for + * multiple roles, they can be combined. */ +#define PERIODIC_EVENT_ROLE_CLIENT (1U << 0) +#define PERIODIC_EVENT_ROLE_RELAY (1U << 1) +#define PERIODIC_EVENT_ROLE_BRIDGE (1U << 2) +#define PERIODIC_EVENT_ROLE_DIRAUTH (1U << 3) +#define PERIODIC_EVENT_ROLE_BRIDGEAUTH (1U << 4) +#define PERIODIC_EVENT_ROLE_HS_SERVICE (1U << 5) + +/* Helper macro to make it a bit less annoying to defined groups of roles that + * are often used. */ + +/* Router that is a Bridge or Relay. */ +#define PERIODIC_EVENT_ROLE_ROUTER \ + (PERIODIC_EVENT_ROLE_BRIDGE | PERIODIC_EVENT_ROLE_RELAY) +/* Authorities that is both bridge and directory. */ +#define PERIODIC_EVENT_ROLE_AUTHORITIES \ + (PERIODIC_EVENT_ROLE_BRIDGEAUTH | PERIODIC_EVENT_ROLE_DIRAUTH) +/* All roles. */ +#define PERIODIC_EVENT_ROLE_ALL \ + (PERIODIC_EVENT_ROLE_AUTHORITIES | PERIODIC_EVENT_ROLE_CLIENT | \ + PERIODIC_EVENT_ROLE_HS_SERVICE | PERIODIC_EVENT_ROLE_ROUTER) + /** Callback function for a periodic event to take action. The return value * influences the next time the function will get called. Return * PERIODIC_EVENT_NO_UPDATE to not update last_action_time and be polled @@ -23,11 +46,14 @@ typedef struct periodic_event_item_t { struct mainloop_event_t *ev; /**< Libevent callback we're using to implement * this */ const char *name; /**< Name of the function -- for debug */ + + /* Bitmask of roles define above for which this event applies. */ + uint32_t roles; } periodic_event_item_t; /** events will get their interval from first execution */ -#define PERIODIC_EVENT(fn) { fn##_callback, 0, NULL, #fn } -#define END_OF_PERIODIC_EVENTS { NULL, 0, NULL, NULL } +#define PERIODIC_EVENT(fn, r) { fn##_callback, 0, NULL, #fn, r } +#define END_OF_PERIODIC_EVENTS { NULL, 0, NULL, NULL, 0 } void periodic_event_launch(periodic_event_item_t *event); void periodic_event_setup(periodic_event_item_t *event);

1 0

[tor/master] config: Set up periodic events when options changes
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 1d864987cbdab4286eed8f3a86a488759dc322ae Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 17 09:44:01 2018 -0400 config: Set up periodic events when options changes In case we transitionned to a new role in Tor, we need to launch and/or destroy some periodic events. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/config.c | 7 ++++++- src/or/main.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/or/main.h | 2 ++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 9c0b321b5..1923afe7d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -903,8 +903,13 @@ set_options(or_options_t *new_val, char **msg) smartlist_free(elements); } - if (old_options != global_options) + if (old_options != global_options) { or_options_free(old_options); + /* If we are here it means we've successfully applied the new options and + * that the global options have been changed to the new values. We'll + * check if we need to remove or add periodic events. */ + periodic_events_on_new_options(global_options); + } return 0; } diff --git a/src/or/main.c b/src/or/main.c index 52e83822e..eb8835198 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1530,6 +1530,47 @@ teardown_periodic_events(void) periodic_events_initialized = 0; } +/** Do a pass at all our periodic events, destroy those we don't need anymore + * and enabled those we need now using the given options. */ +static void +rescan_periodic_events(const or_options_t *options) +{ + tor_assert(options); + + int roles = get_my_roles(options); + + for (int i = 0; periodic_events[i].name; ++i) { + periodic_event_item_t *item = &periodic_events[i]; + int is_enabled = periodic_event_is_enabled(item); + int need_item = (item->roles & roles); + + /* We need this event but it is *not* enabled. */ + if (need_item && !is_enabled) { + periodic_event_launch(item); + continue; + } + /* We do *not* need this event but it is enabled. */ + if (!need_item && is_enabled) { + periodic_event_destroy(item); + continue; + } + } +} + +/* We just got new options globally set, see if we need to destroy or setup + * periodic events. */ +void +periodic_events_on_new_options(const or_options_t *options) +{ + /* Only if we've already initialized once the events, teardown them all and + * reinitialize. It is just simpler that way instead of going through all + * currently enabled events and trying to destroy only the one that could be + * affected. */ + if (periodic_events_initialized) { + rescan_periodic_events(options); + } +} + /** * Update our schedule so that we'll check whether we need to update our * descriptor immediately, rather than after up to CHECK_DESCRIPTOR_INTERVAL diff --git a/src/or/main.h b/src/or/main.h index e50d14d4d..5220b1321 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -86,6 +86,8 @@ uint64_t get_main_loop_success_count(void); uint64_t get_main_loop_error_count(void); uint64_t get_main_loop_idle_count(void); +void periodic_events_on_new_options(const or_options_t *options); + extern time_t time_of_process_start; extern int quiet_level; extern token_bucket_rw_t global_bucket;

1 0

[tor/master] periodic: Add an enable and disable function
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 4e85f17eec06fc963c33cc3f637876e7f1627a57 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 17 09:57:09 2018 -0400 periodic: Add an enable and disable function Two helper functions to enable an event and disable an event which wraps the launch and destroy of an event but takes care of the enabled flag. They are also idempotent that is can be called multiple time on the same event without effect if the event was already enabled or disabled. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/main.c | 22 +++++++++------------- src/or/periodic.c | 41 ++++++++++++++++++++++++++++++++++++++++- src/or/periodic.h | 2 ++ 3 files changed, 51 insertions(+), 14 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index eb8835198..1c5ac198b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1484,8 +1484,9 @@ initialize_periodic_events_cb(evutil_socket_t fd, short events, void *data) for (int i = 0; periodic_events[i].name; ++i) { periodic_event_item_t *item = &periodic_events[i]; - if (item->roles & roles && !periodic_event_is_enabled(item)) { - periodic_event_launch(item); + if (item->roles & roles) { + /* This is safe to be called on an already enabled event. */ + periodic_event_enable(item); log_debug(LD_GENERAL, "Launching periodic event %s", item->name); } } @@ -1541,18 +1542,13 @@ rescan_periodic_events(const or_options_t *options) for (int i = 0; periodic_events[i].name; ++i) { periodic_event_item_t *item = &periodic_events[i]; - int is_enabled = periodic_event_is_enabled(item); - int need_item = (item->roles & roles); - /* We need this event but it is *not* enabled. */ - if (need_item && !is_enabled) { - periodic_event_launch(item); - continue; - } - /* We do *not* need this event but it is enabled. */ - if (!need_item && is_enabled) { - periodic_event_destroy(item); - continue; + /* Enable the event if needed. It is safe to enable an event that was + * already enabled. Same goes for disabling it. */ + if (item->roles & roles) { + periodic_event_enable(item); + } else { + periodic_event_disable(item); } } } diff --git a/src/or/periodic.c b/src/or/periodic.c index 42bea3ae6..76aa418b3 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -43,12 +43,22 @@ periodic_event_dispatch(mainloop_event_t *ev, void *data) periodic_event_item_t *event = data; tor_assert(ev == event->ev); + if (BUG(!periodic_event_is_enabled(event))) { + return; + } + time_t now = time(NULL); const or_options_t *options = get_options(); // log_debug(LD_GENERAL, "Dispatching %s", event->name); int r = event->fn(now, options); int next_interval = 0; + if (!periodic_event_is_enabled(event)) { + /* The event got disabled from inside its callback; no need to + * reschedule. */ + return; + } + /* update the last run time if action was taken */ if (r==0) { log_err(LD_BUG, "Invalid return value for periodic event from %s.", @@ -114,8 +124,8 @@ periodic_event_launch(periodic_event_item_t *event) } // Initial dispatch - periodic_event_dispatch(event->ev, event); event->enabled = 1; + periodic_event_dispatch(event->ev, event); } /** Release all storage associated with event */ @@ -126,6 +136,35 @@ periodic_event_destroy(periodic_event_item_t *event) return; mainloop_event_free(event->ev); event->last_action_time = 0; +} + +/** Enable the given event which means the event is launched and then the + * event's enabled flag is set. This can be called for an event that is + * already enabled. */ +void +periodic_event_enable(periodic_event_item_t *event) +{ + tor_assert(event); + /* Safely and silently ignore if this event is already enabled. */ + if (periodic_event_is_enabled(event)) { + return; + } + + periodic_event_launch(event); +} + +/** Disable the given event which means the event is destroyed and then the + * event's enabled flag is unset. This can be called for an event that is + * already disabled. */ +void +periodic_event_disable(periodic_event_item_t *event) +{ + tor_assert(event); + /* Safely and silently ignore if this event is already disabled. */ + if (!periodic_event_is_enabled(event)) { + return; + } + mainloop_event_cancel(event->ev); event->enabled = 0; } diff --git a/src/or/periodic.h b/src/or/periodic.h index 1b346a1cc..dde27db5a 100644 --- a/src/or/periodic.h +++ b/src/or/periodic.h @@ -69,6 +69,8 @@ void periodic_event_launch(periodic_event_item_t *event); void periodic_event_setup(periodic_event_item_t *event); void periodic_event_destroy(periodic_event_item_t *event); void periodic_event_reschedule(periodic_event_item_t *event); +void periodic_event_enable(periodic_event_item_t *event); +void periodic_event_disable(periodic_event_item_t *event); #endif /* !defined(TOR_PERIODIC_H) */

1 0