diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-06-21 11:11:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-07-24 15:21:56 -0400 |
| commit | f306d12b58a9447076b961da072061f65830692c (patch) | |
| tree | f441c46ca462be05e175e067da86d2e740afe3f0 /src/core/include.am | |
| parent | f3330d2be3de287d4b15bd4d9b0e86fab3ffb9fd (diff) | |
| download | tor-f306d12b58a9447076b961da072061f65830692c.tar.gz tor-f306d12b58a9447076b961da072061f65830692c.zip | |
Refactor handling of TestingTorNetwork
Previously, when TestingTorNetwork was set, we would manually adjust
the initvalue members of a bunch of other config_var_t, and then
re-run the early parts or parsing the options.
Now we treat the initvalue fields as immutable, but instead assign
to them in options_init(), as early as possible. Rather than
re-running the early parts of options, we just re-call the
options_init_from_string() function.
This patch de-kludges some of our code pretty handily. I think it
could later handle authorities and fallbacks, but for now I think we
should leave those alone.
Diffstat (limited to 'src/core/include.am')
| -rw-r--r-- | src/core/include.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/include.am b/src/core/include.am index 1a4b9fb8ab..0dc8d7cad8 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -435,9 +435,10 @@ noinst_HEADERS += \ src/feature/stats/rephist.h \ src/feature/stats/predict_ports.h -noinst_HEADERS += \ - src/app/config/auth_dirs.inc \ - src/app/config/fallback_dirs.inc +noinst_HEADERS += \ + src/app/config/auth_dirs.inc \ + src/app/config/fallback_dirs.inc \ + src/app/config/testnet.inc # This may someday want to be an installed file? noinst_HEADERS += src/feature/api/tor_api.h |