diff options
| author | Suphanat Chunhapanya <haxx.pop@gmail.com> | 2019-01-15 12:16:23 +0700 |
|---|---|---|
| committer | Suphanat Chunhapanya <haxx.pop@gmail.com> | 2019-01-24 04:31:18 +0700 |
| commit | 238a9080c6e80856145210a374b35e613d4cb11e (patch) | |
| tree | 315e8008b755f02ba4150bd217db8caaa0b56264 /src/app/config/config.c | |
| parent | 8de735f0681970ff688cb5e775dae812ed27aa62 (diff) | |
| download | tor-238a9080c6e80856145210a374b35e613d4cb11e.tar.gz tor-238a9080c6e80856145210a374b35e613d4cb11e.zip | |
hs-v3: add an option param to safe log functions
We add an option param to safe_str and safe_str_client because in
some case we need to use those functions before global_options is set.
Diffstat (limited to 'src/app/config/config.c')
| -rw-r--r-- | src/app/config/config.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index c71ed01843..7bd850eddb 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -1086,10 +1086,14 @@ config_free_all(void) * (We return "[scrubbed]" if SafeLogging is "1", and address otherwise.) */ const char * -safe_str_client(const char *address) +safe_str_client_opts(const or_options_t *options, const char *address) { tor_assert(address); - if (get_options()->SafeLogging_ == SAFELOG_SCRUB_ALL) + if (!options) { + options = get_options(); + } + + if (options->SafeLogging_ == SAFELOG_SCRUB_ALL) return "[scrubbed]"; else return address; @@ -1103,10 +1107,14 @@ safe_str_client(const char *address) * otherwise.) */ const char * -safe_str(const char *address) +safe_str_opts(const or_options_t *options, const char *address) { tor_assert(address); - if (get_options()->SafeLogging_ != SAFELOG_SCRUB_NONE) + if (!options) { + options = get_options(); + } + + if (options->SafeLogging_ != SAFELOG_SCRUB_NONE) return "[scrubbed]"; else return address; |