diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-07-08 13:32:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-07-08 13:32:45 -0400 |
| commit | 09c692e72b56e08668ae5f42416741ebd6edc404 (patch) | |
| tree | d46f7ed543b5e0de58d75f2d54fcad01b339bf8f /src/lib/err | |
| parent | d972f29d8df742d757eea9078fedaeed74cd0921 (diff) | |
| download | tor-09c692e72b56e08668ae5f42416741ebd6edc404.tar.gz tor-09c692e72b56e08668ae5f42416741ebd6edc404.zip | |
Use a 64-bit mask for log domains, and fix a conflict
When we added LD_MESG, we created a conflict with the LD_NO_MOCK
flag. We now need 64 bits for log domains in order to fix this
issue.
Fixes bug 31080; bugfix on 0.4.1.1-alpha.
Diffstat (limited to 'src/lib/err')
| -rw-r--r-- | src/lib/err/backtrace.c | 4 | ||||
| -rw-r--r-- | src/lib/err/backtrace.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/err/backtrace.c b/src/lib/err/backtrace.c index 1d1b3bcfa3..f5fa7ec299 100644 --- a/src/lib/err/backtrace.c +++ b/src/lib/err/backtrace.c @@ -115,7 +115,7 @@ clean_backtrace(void **stack, size_t depth, const ucontext_t *ctx) * that with a backtrace log. Send messages via the tor_log function at * logger". */ void -log_backtrace_impl(int severity, int domain, const char *msg, +log_backtrace_impl(int severity, uint64_t domain, const char *msg, tor_log_fn logger) { size_t depth; @@ -240,7 +240,7 @@ remove_bt_handler(void) #ifdef NO_BACKTRACE_IMPL void -log_backtrace_impl(int severity, int domain, const char *msg, +log_backtrace_impl(int severity, uint64_t domain, const char *msg, tor_log_fn logger) { logger(severity, domain, "%s. (Stack trace not available)", msg); diff --git a/src/lib/err/backtrace.h b/src/lib/err/backtrace.h index 9b313261e6..ba3049ed15 100644 --- a/src/lib/err/backtrace.h +++ b/src/lib/err/backtrace.h @@ -12,11 +12,12 @@ #include "orconfig.h" #include "lib/cc/compat_compiler.h" +#include "lib/cc/torint.h" -typedef void (*tor_log_fn)(int, unsigned, const char *fmt, ...) +typedef void (*tor_log_fn)(int, uint64_t, const char *fmt, ...) CHECK_PRINTF(3,4); -void log_backtrace_impl(int severity, int domain, const char *msg, +void log_backtrace_impl(int severity, uint64_t domain, const char *msg, tor_log_fn logger); int configure_backtrace_handler(const char *tor_version); void clean_up_backtrace_handler(void); |