diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-05-15 15:35:22 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-05-15 15:35:22 -0400 |
| commit | 39a14421b1f50b4bea8c42e4f76a67b648bfa8e0 (patch) | |
| tree | 35f098e731fa7d65f89748026484797cd5832ceb /src | |
| parent | d71fa707dd01bdaa2ed301e82ace6fd23f63e638 (diff) | |
| parent | b9f50a2d77caa119d02ce42356cd0b417ef22c65 (diff) | |
| download | tor-39a14421b1f50b4bea8c42e4f76a67b648bfa8e0.tar.gz tor-39a14421b1f50b4bea8c42e4f76a67b648bfa8e0.zip | |
Merge branch 'tor-github/pr/1021'
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/config/config.c | 13 | ||||
| -rw-r--r-- | src/app/main/main.c | 1 | ||||
| -rw-r--r-- | src/feature/dirauth/authmode.h | 4 |
3 files changed, 18 insertions, 0 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index e601bb2ecd..d03305627b 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2449,6 +2449,7 @@ static const struct { { "--quiet", TAKES_NO_ARGUMENT }, { "--hush", TAKES_NO_ARGUMENT }, { "--version", TAKES_NO_ARGUMENT }, + { "--list-modules", TAKES_NO_ARGUMENT }, { "--library-versions", TAKES_NO_ARGUMENT }, { "-h", TAKES_NO_ARGUMENT }, { "--help", TAKES_NO_ARGUMENT }, @@ -2670,6 +2671,13 @@ list_deprecated_options(void) } } +/** Print all compile-time modules and their enabled/disabled status. */ +static void +list_enabled_modules(void) +{ + printf("%s: %s\n", "dirauth", have_module_dirauth() ? "yes" : "no"); +} + /** Last value actually set by resolve_my_address. */ static uint32_t last_resolved_addr = 0; @@ -5195,6 +5203,11 @@ options_init_from_torrc(int argc, char **argv) return 1; } + if (config_line_find(cmdline_only_options, "--list-modules")) { + list_enabled_modules(); + return 1; + } + if (config_line_find(cmdline_only_options, "--library-versions")) { printf("Tor version %s. \n", get_version()); printf("Library versions\tCompiled\t\tRuntime\n"); diff --git a/src/app/main/main.c b/src/app/main/main.c index 184b9e91da..6e325f0b10 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -561,6 +561,7 @@ tor_init(int argc, char *argv[]) if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") || !strcmp(cl->key, "--list-torrc-options") || !strcmp(cl->key, "--library-versions") || + !strcmp(cl->key, "--list-modules") || !strcmp(cl->key, "--hash-password") || !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) { if (quiet < 1) diff --git a/src/feature/dirauth/authmode.h b/src/feature/dirauth/authmode.h index 40a89c7397..876a1f947b 100644 --- a/src/feature/dirauth/authmode.h +++ b/src/feature/dirauth/authmode.h @@ -27,6 +27,8 @@ authdir_mode_v3(const or_options_t *options) return authdir_mode(options) && options->V3AuthoritativeDir != 0; } +#define have_module_dirauth() (1) + #else /* HAVE_MODULE_DIRAUTH */ #define authdir_mode(options) (((void)(options)),0) @@ -37,6 +39,8 @@ authdir_mode_v3(const or_options_t *options) #define authdir_mode_bridge(options) (((void)(options)),0) #define authdir_mode_v3(options) (((void)(options)),0) +#define have_module_dirauth() (0) + #endif /* HAVE_MODULE_DIRAUTH */ #endif /* TOR_MODE_H */ |