diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-02-11 10:30:29 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-02-11 10:30:29 -0500 |
| commit | f0964628e6e6b4f5dda6df30fbb19f74c59eccfd (patch) | |
| tree | bef864683086a26c0acd46c210a9532f2ee26ad4 /src/feature/dirauth/dirauth_config.h | |
| parent | de31c4757b6a58a3b5255298918c6d28e100b506 (diff) | |
| parent | 7b4d9fabefa97e1121482ace6bc712cd2b00ff0f (diff) | |
| download | tor-f0964628e6e6b4f5dda6df30fbb19f74c59eccfd.tar.gz tor-f0964628e6e6b4f5dda6df30fbb19f74c59eccfd.zip | |
Merge branch 'ticket33029_042_01' into ticket33029_043_03
Conflicts:
doc/tor.1.txt
src/app/config/config.c
src/app/config/or_options_st.h
src/core/mainloop/connection.h
Between 042 and 043, the dirauth options were modularized so this merge commit
address this by moving the AuthDirRejectUncompressedRequests to the module
along with a series of accessors.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/feature/dirauth/dirauth_config.h')
| -rw-r--r-- | src/feature/dirauth/dirauth_config.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/feature/dirauth/dirauth_config.h b/src/feature/dirauth/dirauth_config.h index 2ebafd917e..1ec599717c 100644 --- a/src/feature/dirauth/dirauth_config.h +++ b/src/feature/dirauth/dirauth_config.h @@ -35,6 +35,8 @@ int options_act_dirauth_mtbf(const struct or_options_t *old_options); int options_act_dirauth_stats(const struct or_options_t *old_options, bool *print_notice_out); +bool dirauth_should_reject_requests_under_load(void); + extern const struct config_format_t dirauth_options_fmt; #else /* !defined(HAVE_MODULE_DIRAUTH) */ @@ -78,6 +80,8 @@ options_validate_dirauth_mode(const struct or_options_t *old_options, #define options_act_dirauth_stats(old_options, print_notice_out) \ (((void)(old_options)),((void)(print_notice_out)),0) +#define dirauth_should_reject_requests_under_load() (false) + #endif /* defined(HAVE_MODULE_DIRAUTH) */ #endif /* !defined(TOR_FEATURE_DIRAUTH_DIRAUTH_CONFIG_H) */ |