diff options
author | Sebastian Hahn <sebastian@torproject.org> | 2009-09-28 15:08:32 +0200 |
---|---|---|
committer | Sebastian Hahn <sebastian@torproject.org> | 2009-12-12 02:26:11 +0100 |
commit | f25864743368e7962bfffc0e57763b13157429e3 (patch) | |
tree | e59141569cd791c18593a94e5a7a7f74eda786ba /src/or/or.h | |
parent | 4afdb79051f7b1caba49877fb57be60bda9d4514 (diff) | |
download | tor-f25864743368e7962bfffc0e57763b13157429e3.tar tor-f25864743368e7962bfffc0e57763b13157429e3.tar.gz |
Allow SafeLogging to exclude client related information
Diffstat (limited to 'src/or/or.h')
-rw-r--r-- | src/or/or.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index 2e575f5ef..67919d99a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2561,8 +2561,7 @@ typedef struct { * or not (1)? */ int ShutdownWaitLength; /**< When we get a SIGINT and we're a server, how * long do we wait before exiting? */ - int SafeLogging; /**< Boolean: are we allowed to log sensitive strings - * such as addresses (0), or do we scrub them first (1)? */ + char *SafeLogging; /**< Contains "relay", "1", "0" (meaning no scrubbing). */ int SafeSocks; /**< Boolean: should we outright refuse application * connections that use socks4 or socks5-with-local-dns? */ #define LOG_PROTOCOL_WARN (get_options()->ProtocolWarnings ? \ @@ -3208,7 +3207,9 @@ or_options_t *get_options(void); int set_options(or_options_t *new_val, char **msg); void config_free_all(void); const char *safe_str(const char *address); +const char *safe_str_relay(const char *address); const char *escaped_safe_str(const char *address); +const char *escaped_safe_str_relay(const char *address); const char *get_version(void); int config_get_lines(const char *string, config_line_t **result); |