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

[tor/master] Move monotonic time setup into a subsystem
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit 207253df8d7c040840c7f4305534e6979bfc7bf7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 18:09:44 2018 -0400 Move monotonic time setup into a subsystem --- src/app/main/main.c | 2 -- src/app/main/subsystem_list.c | 2 ++ src/lib/time/.may_include | 1 + src/lib/time/include.am | 2 ++ src/lib/time/time_sys.c | 26 ++++++++++++++++++++++++++ src/lib/time/time_sys.h | 14 ++++++++++++++ src/test/testing_common.c | 2 -- 7 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/app/main/main.c b/src/app/main/main.c index 74c3c41e5..bb2e9f5cd 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1248,7 +1248,6 @@ static int run_tor_main_loop(void) { handle_signals(); - monotime_init(); timers_initialize(); initialize_mainloop_events(); @@ -1369,7 +1368,6 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) init_protocol_warning_severity_level(); tor_compress_init(); - monotime_init(); int argc = tor_cfg->argc + tor_cfg->argc_owned; char **argv = tor_calloc(argc, sizeof(char*)); diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index dd6456822..a9189b994 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -14,6 +14,7 @@ #include "lib/net/network_sys.h" #include "lib/process/winprocess_sys.h" #include "lib/thread/thread_sys.h" +#include "lib/time/time_sys.h" #include "lib/wallclock/wallclock_sys.h" #include <stddef.h> @@ -27,6 +28,7 @@ const subsys_fns_t *tor_subsystems[] = { &sys_wallclock, &sys_threads, &sys_logging, + &sys_time, &sys_network, &sys_crypto, }; diff --git a/src/lib/time/.may_include b/src/lib/time/.may_include index 2c7e37a83..40a18805a 100644 --- a/src/lib/time/.may_include +++ b/src/lib/time/.may_include @@ -4,6 +4,7 @@ lib/cc/*.h lib/err/*.h lib/intmath/*.h lib/log/*.h +lib/subsys/*.h lib/time/*.h lib/wallclock/*.h diff --git a/src/lib/time/include.am b/src/lib/time/include.am index a3f93a374..dae16f49a 100644 --- a/src/lib/time/include.am +++ b/src/lib/time/include.am @@ -7,6 +7,7 @@ endif src_lib_libtor_time_a_SOURCES = \ src/lib/time/compat_time.c \ + src/lib/time/time_sys.c \ src/lib/time/tvdiff.c src_lib_libtor_time_testing_a_SOURCES = \ @@ -16,4 +17,5 @@ src_lib_libtor_time_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) noinst_HEADERS += \ src/lib/time/compat_time.h \ + src/lib/time/time_sys.h \ src/lib/time/tvdiff.h diff --git a/src/lib/time/time_sys.c b/src/lib/time/time_sys.c new file mode 100644 index 000000000..2303874f2 --- /dev/null +++ b/src/lib/time/time_sys.c @@ -0,0 +1,26 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file time_sys.c + * \brief Subsystem object for monotime setup. + **/ + +#include "orconfig.h" +#include "lib/subsys/subsys.h" +#include "lib/time/time_sys.h" +#include "lib/time/compat_time.h" + +static int +init_time_sys(void) +{ + monotime_init(); + return 0; +} + +const subsys_fns_t sys_time = { + .name = "time", + .level = -90, + .supported = true, + .initialize = init_time_sys, +}; diff --git a/src/lib/time/time_sys.h b/src/lib/time/time_sys.h new file mode 100644 index 000000000..0f1aebc26 --- /dev/null +++ b/src/lib/time/time_sys.h @@ -0,0 +1,14 @@ +/* Copyright (c) 2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file log_time.h + * \brief Declare subsystem object for the time module. + **/ + +#ifndef TOR_TIME_SYS_H +#define TOR_TIME_SYS_H + +extern const struct subsys_fns_t sys_time; + +#endif /* !defined(TOR_TIME_SYS_H) */ diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 1362f2971..333dbc436 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -257,8 +257,6 @@ main(int c, const char **v) options = options_new(); tor_compress_init(); - monotime_init(); - struct tor_libevent_cfg cfg; memset(&cfg, 0, sizeof(cfg)); tor_libevent_initialize(&cfg);

1 0

[tor/master] Merge branch 'subsystems'
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit bf4f55a13da783083b0c76decd6ebf475a63ebd0 Merge: 5d73f87ce 60d108123 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 9 15:01:49 2018 -0500 Merge branch 'subsystems' .gitignore | 2 + Makefile.am | 2 + changes/subsystems | 6 + src/app/config/config.c | 46 +------ src/app/config/config.h | 2 - src/app/config/statefile.c | 1 + src/app/main/main.c | 82 ++---------- src/app/main/subsysmgr.c | 202 ++++++++++++++++++++++++++++++ src/app/main/subsysmgr.h | 24 ++++ src/app/main/subsystem_list.c | 40 ++++++ src/core/include.am | 3 + src/feature/control/control.c | 1 + src/feature/dirauth/shared_random_state.c | 1 + src/feature/relay/router.c | 1 + src/include.am | 2 + src/lib/compress/.may_include | 1 + src/lib/compress/compress.c | 21 +++- src/lib/compress/compress.h | 2 +- src/lib/compress/compress_sys.h | 14 +++ src/lib/compress/include.am | 1 + src/lib/crypt_ops/.may_include | 1 + src/lib/crypt_ops/crypto_init.c | 47 +++++++ src/lib/crypt_ops/crypto_sys.h | 14 +++ src/lib/crypt_ops/include.am | 1 + src/lib/err/.may_include | 2 + src/lib/err/include.am | 8 +- src/lib/err/torerr.c | 10 ++ src/lib/err/torerr.h | 1 + src/lib/err/torerr_sys.c | 40 ++++++ src/lib/err/torerr_sys.h | 14 +++ src/lib/log/.may_include | 4 +- src/lib/log/include.am | 10 +- src/lib/log/log.c | 3 +- src/lib/log/log_sys.c | 35 ++++++ src/lib/log/log_sys.h | 14 +++ src/lib/net/.may_include | 1 + src/lib/net/include.am | 2 + src/lib/net/network_sys.c | 44 +++++++ src/lib/net/network_sys.h | 14 +++ src/lib/process/.may_include | 1 + src/lib/process/include.am | 6 +- src/lib/process/winprocess_sys.c | 64 ++++++++++ src/lib/process/winprocess_sys.h | 14 +++ src/lib/subsys/.may_include | 1 + src/lib/subsys/include.am | 3 + src/lib/subsys/subsys.h | 95 ++++++++++++++ src/lib/thread/.may_include | 1 + src/lib/thread/compat_threads.c | 16 +++ src/lib/thread/include.am | 5 +- src/lib/thread/thread_sys.h | 14 +++ src/lib/time/.may_include | 1 + src/lib/time/include.am | 2 + src/lib/time/time_sys.c | 26 ++++ src/lib/time/time_sys.h | 14 +++ src/lib/tls/.may_include | 1 + src/lib/tls/include.am | 1 + src/lib/tls/tortls.c | 14 +++ src/lib/tls/tortls_sys.h | 14 +++ src/lib/version/.may_include | 3 + src/lib/{log => version}/git_revision.c | 2 +- src/lib/{log => version}/git_revision.h | 0 src/lib/version/include.am | 25 ++++ src/lib/version/torversion.h | 12 ++ src/lib/version/version.c | 50 ++++++++ src/lib/wallclock/.may_include | 1 + src/lib/wallclock/approx_time.c | 16 +++ src/lib/wallclock/include.am | 3 +- src/lib/wallclock/wallclock_sys.h | 14 +++ src/rust/build.rs | 1 + src/test/bench.c | 7 +- src/test/fuzz/fuzzing_common.c | 10 +- src/test/testing_common.c | 20 +-- 72 files changed, 1013 insertions(+), 163 deletions(-) diff --cc src/lib/thread/.may_include index fc56f4683,c26a42692..02711348c --- a/src/lib/thread/.may_include +++ b/src/lib/thread/.may_include @@@ -2,6 -2,6 +2,7 @@@ orconfig. lib/cc/*.h lib/lock/*.h lib/log/*.h + lib/subsys/*.h lib/testsupport/*.h lib/thread/*.h +lib/wallclock/*.h

1 0

[tor/master] Explain that configuration should happen elsewhere, but not init.
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit 4fe4bcf8a10967a668895e962099f50635ba9e4b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 9 10:55:18 2018 -0500 Explain that configuration should happen elsewhere, but not init. --- src/lib/subsys/subsys.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/subsys/subsys.h b/src/lib/subsys/subsys.h index b06d67e62..462314567 100644 --- a/src/lib/subsys/subsys.h +++ b/src/lib/subsys/subsys.h @@ -44,6 +44,9 @@ typedef struct subsys_fns_t { * This function MUST NOT rely on any runtime configuration information; * it is only for global state or pre-configuration state. * + * (If you need to do any setup that depends on configuration, you'll need + * to declare a configuration callback. (Not yet designed)) + * * This function MUST NOT have any parts that can fail. **/ int (*initialize)(void);

1 0

[tor/master] changes file for subsystems api (28330)
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit adecda753996611e9a5b82c5fa87ea78ec683806 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 5 09:42:16 2018 -0500 changes file for subsystems api (28330) --- changes/subsystems | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/subsystems b/changes/subsystems new file mode 100644 index 000000000..a51fb8e2b --- /dev/null +++ b/changes/subsystems @@ -0,0 +1,6 @@ + o Major features (refactoring): + - Tor now uses an explicit list of its own subsystems when initializing + and shutting down. Previously, these systems were managed implicitly + though various places throughout the codebase. (There still some + subsystems using the old system.) + Closes ticket 28330.

1 0

[tor/master] Add list of levels in subsystem_list.c
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit ba722e47995e106b46d848263638fa3009687cd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 9 11:15:27 2018 -0500 Add list of levels in subsystem_list.c --- src/app/main/subsystem_list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 62c87005c..190e6579d 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -25,7 +25,7 @@ * Global list of the subsystems in Tor, in the order of their initialization. **/ const subsys_fns_t *tor_subsystems[] = { - &sys_winprocess, + &sys_winprocess, /* -100 */ &sys_torerr, &sys_wallclock, &sys_threads,

1 0

[tor/master] Document that subsystem callbacks are optional.
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit 61695e3d622dfcc196b8b829842f2b12fecebeab Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 9 10:58:20 2018 -0500 Document that subsystem callbacks are optional. --- src/lib/subsys/subsys.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/subsys/subsys.h b/src/lib/subsys/subsys.h index 462314567..2452ec6e2 100644 --- a/src/lib/subsys/subsys.h +++ b/src/lib/subsys/subsys.h @@ -14,7 +14,11 @@ struct dispatch_connector_t; * A subsystem is a part of Tor that is initialized, shut down, configured, * and connected to other parts of Tor. * - * Subsystems + * All callbacks are optional -- if a callback is set to NULL, the subsystem + * manager will treat it as a no-op. + * + * You should use c99 named-field initializers with this structure: we + * will be adding more fields, often in the middle of the structure. **/ typedef struct subsys_fns_t { /**

1 0

[tor/master] Log before performing a subsystem operation
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit 60d10812368458cb88aa9f9d628c49766d4bb490 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 9 11:56:26 2018 -0500 Log before performing a subsystem operation --- src/app/main/subsysmgr.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/app/main/subsysmgr.c b/src/app/main/subsysmgr.c index 05803ee94..abd2edd10 100644 --- a/src/app/main/subsysmgr.c +++ b/src/app/main/subsysmgr.c @@ -7,6 +7,8 @@ #include "app/main/subsysmgr.h" #include "lib/err/torerr.h" +#include "lib/log/log.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -85,8 +87,13 @@ subsystems_init_upto(int target_level) if (sys_initialized[i]) continue; int r = 0; - if (sys->initialize) + if (sys->initialize) { + // Note that the logging subsystem is designed so that it does no harm + // to log a message in an uninitialized state. These messages will be + // discarded for now, however. + log_debug(LD_GENERAL, "Initializing %s", sys->name); r = sys->initialize(); + } if (r < 0) { fprintf(stderr, "BUG: subsystem %s (at %u) initialization failed.\n", sys->name, i); @@ -123,8 +130,10 @@ subsystems_shutdown_downto(int target_level) break; if (! sys_initialized[i]) continue; - if (sys->shutdown) + if (sys->shutdown) { + log_debug(LD_GENERAL, "Shutting down %s", sys->name); sys->shutdown(); + } sys_initialized[i] = false; } } @@ -143,8 +152,10 @@ subsystems_prefork(void) continue; if (! sys_initialized[i]) continue; - if (sys->prefork) + if (sys->prefork) { + log_debug(LD_GENERAL, "Pre-fork: %s", sys->name); sys->prefork(); + } } } @@ -162,13 +173,15 @@ subsystems_postfork(void) continue; if (! sys_initialized[i]) continue; - if (sys->postfork) + if (sys->postfork) { + log_debug(LD_GENERAL, "Post-fork: %s", sys->name); sys->postfork(); + } } } /** - * Run thread-clanup code on all subsystems that declare any + * Run thread-cleanup code on all subsystems that declare any **/ void subsystems_thread_cleanup(void) @@ -181,7 +194,9 @@ subsystems_thread_cleanup(void) continue; if (! sys_initialized[i]) continue; - if (sys->thread_cleanup) + if (sys->thread_cleanup) { + log_debug(LD_GENERAL, "Thread cleanup: %s", sys->name); sys->thread_cleanup(); + } } }

1 0

[tor/master] fixup! Make initialization for the "err" library into a subsystem.
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit e80595f562e199049a41fdf1f3e12baced7e74d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 9 11:00:31 2018 -0500 fixup! Make initialization for the "err" library into a subsystem. Check for failure to install backtrace handler. --- src/lib/err/torerr_sys.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/err/torerr_sys.c b/src/lib/err/torerr_sys.c index 54666f410..2f9e33e23 100644 --- a/src/lib/err/torerr_sys.c +++ b/src/lib/err/torerr_sys.c @@ -18,7 +18,8 @@ static int torerr_subsys_init(void) { - configure_backtrace_handler(get_version()); + if (configure_backtrace_handler(get_version()) < 0) + return -1; tor_log_reset_sigsafe_err_fds(); return 0;

1 0

[tor/master] Rename subsystem callback functions to make them consistent
by nickm＠torproject.org 09 Nov '18

09 Nov '18

commit c6336727cac937b4b5ca38c9b49ed3a66ce0b579 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 9 11:12:12 2018 -0500 Rename subsystem callback functions to make them consistent --- src/lib/compress/compress.c | 8 +++++++- src/lib/crypt_ops/crypto_init.c | 32 +++++++++++++++++++++++++------- src/lib/err/torerr_sys.c | 8 ++++---- src/lib/log/log_sys.c | 8 ++++---- src/lib/net/network_sys.c | 8 ++++---- src/lib/process/winprocess_sys.c | 6 +++--- src/lib/thread/compat_threads.c | 4 ++-- src/lib/time/time_sys.c | 4 ++-- src/lib/tls/tortls.c | 8 +++++++- src/lib/wallclock/approx_time.c | 4 ++-- 10 files changed, 60 insertions(+), 30 deletions(-) diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c index 0d134fd1b..6cb9bd492 100644 --- a/src/lib/compress/compress.c +++ b/src/lib/compress/compress.c @@ -686,9 +686,15 @@ tor_compress_log_init_warnings(void) tor_zstd_warn_if_version_mismatched(); } +static int +subsys_compress_initialize(void) +{ + return tor_compress_init(); +} + const subsys_fns_t sys_compress = { .name = "compress", .supported = true, .level = -70, - .initialize = tor_compress_init, + .initialize = subsys_compress_initialize, }; diff --git a/src/lib/crypt_ops/crypto_init.c b/src/lib/crypt_ops/crypto_init.c index a03f5eff7..4c4cc3e43 100644 --- a/src/lib/crypt_ops/crypto_init.c +++ b/src/lib/crypt_ops/crypto_init.c @@ -207,7 +207,7 @@ tor_is_using_nss(void) } static int -init_crypto_sys(void) +subsys_crypto_initialize(void) { if (crypto_early_init() < 0) return -1; @@ -216,18 +216,36 @@ init_crypto_sys(void) } static void -shutdown_crypto_sys(void) +subsys_crypto_shutdown(void) { crypto_global_cleanup(); } +static void +subsys_crypto_prefork(void) +{ + crypto_prefork(); +} + +static void +subsys_crypto_postfork(void) +{ + crypto_postfork(); +} + +static void +subsys_crypto_thread_cleanup(void) +{ + crypto_thread_cleanup(); +} + const struct subsys_fns_t sys_crypto = { .name = "crypto", .supported = true, .level = -60, - .initialize = init_crypto_sys, - .shutdown = shutdown_crypto_sys, - .prefork = crypto_prefork, - .postfork = crypto_postfork, - .thread_cleanup = crypto_thread_cleanup, + .initialize = subsys_crypto_initialize, + .shutdown = subsys_crypto_shutdown, + .prefork = subsys_crypto_prefork, + .postfork = subsys_crypto_postfork, + .thread_cleanup = subsys_crypto_thread_cleanup, }; diff --git a/src/lib/err/torerr_sys.c b/src/lib/err/torerr_sys.c index 2f9e33e23..96bb1308a 100644 --- a/src/lib/err/torerr_sys.c +++ b/src/lib/err/torerr_sys.c @@ -16,7 +16,7 @@ #include <stddef.h> static int -torerr_subsys_init(void) +subsys_torerr_initialize(void) { if (configure_backtrace_handler(get_version()) < 0) return -1; @@ -25,7 +25,7 @@ torerr_subsys_init(void) return 0; } static void -torerr_subsys_shutdown(void) +subsys_torerr_shutdown(void) { tor_log_reset_sigsafe_err_fds(); clean_up_backtrace_handler(); @@ -35,6 +35,6 @@ const subsys_fns_t sys_torerr = { .name = "err", .level = -100, .supported = true, - .initialize = torerr_subsys_init, - .shutdown = torerr_subsys_shutdown + .initialize = subsys_torerr_initialize, + .shutdown = subsys_torerr_shutdown }; diff --git a/src/lib/log/log_sys.c b/src/lib/log/log_sys.c index 94ec97fdc..e20f3156c 100644 --- a/src/lib/log/log_sys.c +++ b/src/lib/log/log_sys.c @@ -13,14 +13,14 @@ #include "lib/log/log_sys.h" static int -init_logging_subsys(void) +subsys_logging_initialize(void) { init_logging(0); return 0; } static void -shutdown_logging_subsys(void) +subsys_logging_shutdown(void) { logs_free_all(); escaped(NULL); @@ -30,6 +30,6 @@ const subsys_fns_t sys_logging = { .name = "log", .supported = true, .level = -90, - .initialize = init_logging_subsys, - .shutdown = shutdown_logging_subsys, + .initialize = subsys_logging_initialize, + .shutdown = subsys_logging_shutdown, }; diff --git a/src/lib/net/network_sys.c b/src/lib/net/network_sys.c index c9d33a94d..ac49288ee 100644 --- a/src/lib/net/network_sys.c +++ b/src/lib/net/network_sys.c @@ -18,7 +18,7 @@ #endif static int -init_network_sys(void) +subsys_network_initialize(void) { if (network_init() < 0) return -1; @@ -27,7 +27,7 @@ init_network_sys(void) } static void -shutdown_network_sys(void) +subsys_network_shutdown(void) { #ifdef _WIN32 WSACleanup(); @@ -39,6 +39,6 @@ const subsys_fns_t sys_network = { .name = "network", .level = -90, .supported = true, - .initialize = init_network_sys, - .shutdown = shutdown_network_sys, + .initialize = subsys_network_initialize, + .shutdown = subsys_network_shutdown, }; diff --git a/src/lib/process/winprocess_sys.c b/src/lib/process/winprocess_sys.c index e00f94c91..ef66f8bfb 100644 --- a/src/lib/process/winprocess_sys.c +++ b/src/lib/process/winprocess_sys.c @@ -19,7 +19,7 @@ #define WINPROCESS_SYS_ENABLED true static int -init_windows_process_params(void) +subsys_winprocess_initialize(void) { #ifndef HeapEnableTerminationOnCorruption #define HeapEnableTerminationOnCorruption 1 @@ -53,12 +53,12 @@ init_windows_process_params(void) } #else /* !defined(_WIN32) */ #define WINPROCESS_SYS_ENABLED false -#define init_windows_process_params NULL +#define subsys_winprocess_initialize NULL #endif /* defined(_WIN32) */ const subsys_fns_t sys_winprocess = { .name = "winprocess", .level = -100, .supported = WINPROCESS_SYS_ENABLED, - .initialize = init_windows_process_params, + .initialize = subsys_winprocess_initialize, }; diff --git a/src/lib/thread/compat_threads.c b/src/lib/thread/compat_threads.c index 3d41faa8c..0b466da21 100644 --- a/src/lib/thread/compat_threads.c +++ b/src/lib/thread/compat_threads.c @@ -113,7 +113,7 @@ atomic_counter_exchange(atomic_counter_t *counter, size_t newval) #endif /* !defined(HAVE_WORKING_STDATOMIC) */ static int -sys_threads_initialize(void) +subsys_threads_initialize(void) { tor_threads_init(); return 0; @@ -123,5 +123,5 @@ const subsys_fns_t sys_threads = { .name = "threads", .supported = true, .level = -95, - .initialize = sys_threads_initialize, + .initialize = subsys_threads_initialize, }; diff --git a/src/lib/time/time_sys.c b/src/lib/time/time_sys.c index 2303874f2..b29ca35e6 100644 --- a/src/lib/time/time_sys.c +++ b/src/lib/time/time_sys.c @@ -12,7 +12,7 @@ #include "lib/time/compat_time.h" static int -init_time_sys(void) +subsys_time_initialize(void) { monotime_init(); return 0; @@ -22,5 +22,5 @@ const subsys_fns_t sys_time = { .name = "time", .level = -90, .supported = true, - .initialize = init_time_sys, + .initialize = subsys_time_initialize, }; diff --git a/src/lib/tls/tortls.c b/src/lib/tls/tortls.c index fdeea9e0d..654cacacf 100644 --- a/src/lib/tls/tortls.c +++ b/src/lib/tls/tortls.c @@ -443,8 +443,14 @@ tor_tls_verify(int severity, tor_tls_t *tls, crypto_pk_t **identity) return rv; } +static void +subsys_tortls_shutdown(void) +{ + tor_tls_free_all(); +} + const subsys_fns_t sys_tortls = { .name = "tortls", .level = -50, - .shutdown = tor_tls_free_all + .shutdown = subsys_tortls_shutdown }; diff --git a/src/lib/wallclock/approx_time.c b/src/lib/wallclock/approx_time.c index c7a7ae9bd..0b0ef382c 100644 --- a/src/lib/wallclock/approx_time.c +++ b/src/lib/wallclock/approx_time.c @@ -45,7 +45,7 @@ update_approx_time(time_t now) #endif /* !defined(TIME_IS_FAST) */ static int -init_wallclock_subsys(void) +subsys_wallclock_initialize(void) { update_approx_time(time(NULL)); return 0; @@ -55,5 +55,5 @@ const subsys_fns_t sys_wallclock = { .name = "wallclock", .supported = true, .level = -99, - .initialize = init_wallclock_subsys, + .initialize = subsys_wallclock_initialize, };

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 09 Nov '18

09 Nov '18

commit 272dbbc9e3e525cd18198cf83959b1c378eceb80 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 9 19:49:06 2018 +0000 Update translations for support-portal --- contents+fr.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 5b62b9383..67e041f50 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1410,7 +1410,7 @@ msgid "" "Tor Browser has two ways to change your relay circuit — \"New Identity\" and" " \"New Tor Circuit for this Site\"." msgstr "" -"Le Navigateur Tor propose deux façons de changer votre circuit de relais — «" +"Le Navigateur Tor propose deux façons de changer votre circuit de relais : «" " Nouvelle identité » et « Nouveau circuit Tor pour ce site »." #: http//localhost/tbb/tbb-11/ @@ -1419,14 +1419,14 @@ msgid "" "If you can't find it in either of those folders, download it again and look " "for the prompt that asks you to choose a directory to download it in." msgstr "" -"Si vous ne le trouvez pas dans l’un de ces dossiers, téléchargez-le à " -"nouveau et cherchez la section vous demandant de choisir un répertoire dans " -"lequel effectuer le téléchargement." +"Si vous ne le trouvez pas dans l’un de ces dossiers, retéléchargez-le et " +"cherchez le message qui vous demande de choisir un répertoire dans lequel le" +" télécharger." #: http//localhost/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.seo_slug) msgid "run-exit-from-home" -msgstr "faire-fonctionner-sortie-chez-vous" +msgstr "exécuter-sortie-de-mon-domicile" #: http//localhost/operators/operators-7/ #: (content/operators/operators-7/contents+en.lrquestion.title) @@ -1463,12 +1463,12 @@ msgid "" "protections of Tor Browser." msgstr "" "Utiliser Tor avec un autre navigateur pourrait vous rendre vulnérable, sans " -"la protection de la confidentialité du Navigateur Tor." +"la protection des données personnelles offerte par le Navigateur Tor." #: http//localhost/tbb/tbb-17/ #: (content/tbb/tbb-17/contents+en.lrquestion.seo_slug) msgid "run-tor-browser-and-different-browser" -msgstr "exécuter-navigateur-tor-et-diférrent-navigateur" +msgstr "exécuter-navigateur-tor-et-différent-navigateur" #: http//localhost/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.seo_slug) @@ -1497,7 +1497,7 @@ msgstr "" #: http//localhost/operators/operators-6/ #: (content/operators/operators-6/contents+en.lrquestion.seo_slug) msgid "how-do-i-run-a-obfs4-bridge-debian" -msgstr "comment-puis-je-faire-fonctionner-un-pont-obfs4-debian" +msgstr "comment-puis-je-utiliser-un-pont-obfs4-debian" #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) @@ -1520,7 +1520,7 @@ msgstr "" #: http//localhost/misc/misc-1/ #: (content/misc/misc-1/contents+en.lrquestion.seo_slug) msgid "tracing-tor-user" -msgstr "suivre-utilisateur-de-tor-a-la-trace" +msgstr "suivre-utilisateur-de-tor-à-la-trace" #: http//localhost/tbb/tbb-20/ #: (content/tbb/tbb-20/contents+en.lrquestion.seo_slug) @@ -1545,7 +1545,7 @@ msgid "" "inform them that their CAPTCHAs are preventing users such as yourself from " "using their services." msgstr "" -"La meilleure chose à faire dans cette situation est de contacter les " +"La meilleure chose à faire dans ces situations est de contacter les " "propriétaires des sites Web et de les informer que leurs CAPTCHAS empêchent " "les utilisateurs comme vous d’utiliser leurs services." @@ -1559,7 +1559,7 @@ msgstr "" #: http//localhost/tbb/tbb-24/ #: (content/tbb/tbb-24/contents+en.lrquestion.title) msgid "I'm having a problem with DuckDuckGo." -msgstr "J’ai un problème avec DuckDuckGo." +msgstr "Je rencontre un problème avec DuckDuckGo." #: http//localhost/tbb/tbb-9/ (content/tbb/tbb-9/contents+en.lrquestion.title) msgid "Can I use Tor with a browser besides Tor Browser?" @@ -3744,7 +3744,7 @@ msgid "" msgstr "" "Les ponts <mark><a " "href=\"https://github.com/Yawning/obfs4/blob/master/doc/obfs4-spec.txt\">Obfsproxy</a></mark>" -" y remédient en ajoutant une autre couche de brouillage." +" y remédient en ajoutant une couche supplémentaire de brouillage." #: http//localhost/tbb/tbb-11/ #: (content/tbb/tbb-11/contents+en.lrquestion.description)

1 0