August 2019 - tor-commits - lists.torproject.org

[tor/master] Remove src/core/ and src/feature dependencies from confparse.c
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit c32d485942e766eeea70cab468cc7c727a5be270 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 26 11:02:23 2019 -0400 Remove src/core/ and src/feature dependencies from confparse.c This C file will eventually belong in lib/confmgt, so it needs to have only low-level dependencies. Now that it no longers needs routerset.c, we can adjust its includes accordingly. I'm not moving the file yet, since it would make fixup commits on earlier … [View More]

1 0

[tor/master] Make config_var and config_fmt const.
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit f8b193a74a3967d23bf55c8dcfb5bb2a16692c97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 21 11:20:21 2019 -0400 Make config_var and config_fmt const. Now that we have a reasonable implementation for overriding the default options for TestingTorNetwork, we don't need to modify config_var_t structs any more. And therefore, we can have constant format options, like reasonable people. --- src/app/config/config.c | 6 +++--- … [View More]src/app/config/config.h | 2 +- src/app/config/confparse.c | 21 +++++++-------------- src/app/config/confparse.h | 13 ++++++------- src/app/config/statefile.c | 2 +- src/feature/dirauth/shared_random_state.c | 4 ++-- src/test/test_confparse.c | 4 ++-- 7 files changed, 22 insertions(+), 30 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 5ea6c2d40..4bc807a6f 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -191,7 +191,7 @@ static const char unix_q_socket_prefix[] = "unix:\""; /** A list of abbreviations and aliases to map command-line options, obsolete * option names, or alternative option names, to their current values. */ -static config_abbrev_t option_abbrevs_[] = { +static const config_abbrev_t option_abbrevs_[] = { PLURAL(AuthDirBadDirCC), PLURAL(AuthDirBadExitCC), PLURAL(AuthDirInvalidCC), @@ -301,7 +301,7 @@ DUMMY_TYPECHECK_INSTANCE(or_options_t); * abbreviations, order is significant, since the first matching option will * be chosen first. */ -static config_var_t option_vars_[] = { +static const config_var_t option_vars_[] = { V(AccountingMax, MEMUNIT, "0 bytes"), VAR("AccountingRule", STRING, AccountingRule_option, "max"), V(AccountingStart, STRING, NULL), @@ -851,7 +851,7 @@ static void set_protocol_warning_severity_level(int warning_severity); #define OR_OPTIONS_MAGIC 9090909 /** Configuration format for or_options_t. */ -STATIC config_format_t options_format = { +STATIC const config_format_t options_format = { sizeof(or_options_t), { "or_options_t", diff --git a/src/app/config/config.h b/src/app/config/config.h index 46db02f94..c6feb89fe 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -248,7 +248,7 @@ int options_any_client_port_set(const or_options_t *options); STATIC int options_act(const or_options_t *old_options); #ifdef TOR_UNIT_TESTS -extern struct config_format_t options_format; +extern const struct config_format_t options_format; #endif STATIC port_cfg_t *port_cfg_new(size_t namelen); diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 450ff5e08..9bc0b1dc7 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -100,9 +100,13 @@ config_find_deprecation(const config_format_t *fmt, const char *key) return NULL; } -/** As config_find_option, but return a non-const pointer. */ -config_var_t * -config_find_option_mutable(config_format_t *fmt, const char *key) +/** If key is a configuration option, return the corresponding const + * config_var_t. Otherwise, if key is a non-standard abbreviation, + * warn, and return the corresponding const config_var_t. Otherwise return + * NULL. + */ +const config_var_t * +config_find_option(const config_format_t *fmt, const char *key) { int i; size_t keylen = strlen(key); @@ -127,17 +131,6 @@ config_find_option_mutable(config_format_t *fmt, const char *key) return NULL; } -/** If key is a configuration option, return the corresponding const - * config_var_t. Otherwise, if key is a non-standard abbreviation, - * warn, and return the corresponding const config_var_t. Otherwise return - * NULL. - */ -const config_var_t * -config_find_option(const config_format_t *fmt, const char *key) -{ - return config_find_option_mutable((config_format_t*)fmt, key); -} - /** Return the number of option entries in fmt. */ static int config_count_options(const config_format_t *fmt) diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index c53e3224d..65972d6fc 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -47,16 +47,17 @@ typedef void (*free_cfg_fn_t)(void*); typedef struct config_format_t { size_t size; /**< Size of the struct that everything gets parsed into. */ struct_magic_decl_t magic; /**< Magic number info for this struct. */ - config_abbrev_t *abbrevs; /**< List of abbreviations that we expand when - * parsing this format. */ + const config_abbrev_t *abbrevs; /**< List of abbreviations that we expand + * when parsing this format. */ const config_deprecation_t *deprecations; /** List of deprecated options */ - config_var_t *vars; /**< List of variables we recognize, their default - * values, and where we stick them in the structure. */ + const config_var_t *vars; /**< List of variables we recognize, their default + * values, and where we stick them in the + * structure. */ validate_fn_t validate_fn; /**< Function to validate config. */ free_cfg_fn_t free_fn; /**< Function to free the configuration. */ /** If present, extra denotes a LINELIST variable for unrecognized * lines. Otherwise, unrecognized lines are an error. */ - struct_member_t *extra; + const struct_member_t *extra; } config_format_t; /** Macro: assert that cfg has the right magic field for format @@ -93,8 +94,6 @@ bool config_check_ok(const config_format_t *fmt, const void *options, int config_assign(const config_format_t *fmt, void *options, struct config_line_t *list, unsigned flags, char **msg); -config_var_t *config_find_option_mutable(config_format_t *fmt, - const char *key); const char *config_find_deprecation(const config_format_t *fmt, const char *key); const config_var_t *config_find_option(const config_format_t *fmt, diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index 4fe415b8c..d997d3932 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -76,7 +76,7 @@ DUMMY_TYPECHECK_INSTANCE(or_state_t); VAR(#member, conftype, member, initvalue) /** Array of "state" variables saved to the ~/.tor/state file. */ -static config_var_t state_vars_[] = { +static const config_var_t state_vars_[] = { /* Remember to document these in state-contents.txt ! */ V(AccountingBytesReadInInterval, MEMUNIT, NULL), diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index d89f249a7..c2ad3e7cc 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -65,7 +65,7 @@ disk_state_validate_cb(void *old_state, void *state, void *default_state, static void disk_state_free_cb(void *); /* Array of variables that are saved to disk as a persistent state. */ -static config_var_t state_vars[] = { +static const config_var_t state_vars[] = { V(Version, POSINT, "0"), V(TorVersion, STRING, NULL), V(ValidAfter, ISOTIME, NULL), @@ -81,7 +81,7 @@ static config_var_t state_vars[] = { /* "Extra" variable in the state that receives lines we can't parse. This * lets us preserve options from versions of Tor newer than us. */ -static struct_member_t state_extra_var = { +static const struct_member_t state_extra_var = { .name = "__extra", .type = CONFIG_TYPE_LINELIST, .offset = offsetof(sr_disk_state_t, ExtraLines), diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index 4612419df..ec018f0c5 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -55,7 +55,7 @@ static test_struct_t test_struct_t_dummy; #define OBSOLETE(varname) \ CONFIG_VAR_OBSOLETE(varname) -static config_var_t test_vars[] = { +static const config_var_t test_vars[] = { V(s, STRING, "hello"), V(fn, FILENAME, NULL), V(pos, POSINT, NULL), @@ -123,7 +123,7 @@ static void test_free_cb(void *options); #define TEST_MAGIC 0x1337 -static config_format_t test_fmt = { +static const config_format_t test_fmt = { sizeof(test_struct_t), { "test_struct_t", [View Less]

1 0

[tor/master] Refactor handling of TestingTorNetwork
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit f306d12b58a9447076b961da072061f65830692c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 21 11:11:48 2019 -0400 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 … [View More]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. --- scripts/maint/practracker/exceptions.txt | 2 +- src/app/config/config.c | 186 +++++++++++-------------------- src/app/config/testnet.inc | 33 ++++++ src/core/include.am | 7 +- 4 files changed, 104 insertions(+), 124 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 2190fb1ca..1e1ccda78 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -30,7 +30,7 @@ # Remember: It is better to fix the problem than to add a new exception! problem file-size /src/app/config/config.c 8518 -problem include-count /src/app/config/config.c 88 +problem include-count /src/app/config/config.c 89 problem function-size /src/app/config/config.c:options_act_reversible() 296 problem function-size /src/app/config/config.c:options_act() 589 problem function-size /src/app/config/config.c:resolve_my_address() 192 diff --git a/src/app/config/config.c b/src/app/config/config.c index 5667702a6..5ea6c2d40 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -758,46 +758,28 @@ static config_var_t option_vars_[] = { END_OF_CONFIG_VARS }; +/** List of default directory authorities */ +static const char *default_authorities[] = { +#include "auth_dirs.inc" + NULL +}; + +/** List of fallback directory authorities. The list is generated by opt-in of + * relays that meet certain stability criteria. + */ +static const char *default_fallbacks[] = { +#include "fallback_dirs.inc" + NULL +}; + /** Override default values with these if the user sets the TestingTorNetwork * option. */ -static const config_var_t testing_tor_network_defaults[] = { - V(DirAllowPrivateAddresses, BOOL, "1"), - V(EnforceDistinctSubnets, BOOL, "0"), - V(AssumeReachable, BOOL, "1"), - V(AuthDirMaxServersPerAddr, POSINT, "0"), - V(ClientBootstrapConsensusAuthorityDownloadInitialDelay, CSV_INTERVAL, "0"), - V(ClientBootstrapConsensusFallbackDownloadInitialDelay, CSV_INTERVAL, "0"), - V(ClientBootstrapConsensusAuthorityOnlyDownloadInitialDelay, CSV_INTERVAL, - "0"), - V(ClientDNSRejectInternalAddresses, BOOL,"0"), - V(ClientRejectInternalAddresses, BOOL, "0"), - V(CountPrivateBandwidth, BOOL, "1"), - V(ExitPolicyRejectPrivate, BOOL, "0"), - V(ExtendAllowPrivateAddresses, BOOL, "1"), - V(V3AuthVotingInterval, INTERVAL, "5 minutes"), - V(V3AuthVoteDelay, INTERVAL, "20 seconds"), - V(V3AuthDistDelay, INTERVAL, "20 seconds"), - V(TestingV3AuthInitialVotingInterval, INTERVAL, "150 seconds"), - V(TestingV3AuthInitialVoteDelay, INTERVAL, "20 seconds"), - V(TestingV3AuthInitialDistDelay, INTERVAL, "20 seconds"), - V(TestingAuthDirTimeToLearnReachability, INTERVAL, "0 minutes"), - V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"), - V(MinUptimeHidServDirectoryV2, INTERVAL, "0 minutes"), - V(TestingServerDownloadInitialDelay, CSV_INTERVAL, "0"), - V(TestingClientDownloadInitialDelay, CSV_INTERVAL, "0"), - V(TestingServerConsensusDownloadInitialDelay, CSV_INTERVAL, "0"), - V(TestingClientConsensusDownloadInitialDelay, CSV_INTERVAL, "0"), - V(TestingBridgeDownloadInitialDelay, CSV_INTERVAL, "10"), - V(TestingBridgeBootstrapDownloadInitialDelay, CSV_INTERVAL, "0"), - V(TestingClientMaxIntervalWithoutRequest, INTERVAL, "5 seconds"), - V(TestingDirConnectionMaxStall, INTERVAL, "30 seconds"), - V(TestingEnableConnBwEvent, BOOL, "1"), - V(TestingEnableCellStatsEvent, BOOL, "1"), - VAR_INVIS("___UsingTestNetworkDefaults", BOOL, UsingTestNetworkDefaults_, - "1"), - V(RendPostPeriod, INTERVAL, "2 minutes"), - - END_OF_CONFIG_VARS +static const struct { + const char *k; + const char *v; +} testing_tor_network_defaults[] = { +#include "testnet.inc" + { NULL, NULL } }; #undef VAR @@ -936,6 +918,32 @@ get_options,(void)) return get_options_mutable(); } +/** + * True iff we have noticed that this is a testing tor network, and we + * should use the corresponding defaults. + **/ +static bool testing_network_configured = false; + +/** Return a set of lines for any default options that we want to override + * from those set in our config_var_t values. */ +static config_line_t * +get_options_defaults(void) +{ + int i; + config_line_t *result = NULL, **next = &result; + + if (testing_network_configured) { + for (i = 0; testing_tor_network_defaults[i].k; ++i) { + config_line_append(next, + testing_tor_network_defaults[i].k, + testing_tor_network_defaults[i].v); + next = &(*next)->next; + } + } + + return result; +} + /** Change the current global options to contain new_val instead of * their current value; take action based on the new value; free the old value * as necessary. Returns 0 on success, -1 on failure. @@ -1185,21 +1193,6 @@ cleanup_protocol_warning_severity_level(void) atomic_counter_destroy(&protocol_warning_severity_level); } -/** List of default directory authorities */ - -static const char *default_authorities[] = { -#include "auth_dirs.inc" - NULL -}; - -/** List of fallback directory authorities. The list is generated by opt-in of - * relays that meet certain stability criteria. - */ -static const char *default_fallbacks[] = { -#include "fallback_dirs.inc" - NULL -}; - /** Add the default directory authorities directly into the trusted dir list, * but only add them insofar as they share bits with type. * Each authority's bits are restricted to the bits shared with type. @@ -3008,6 +3001,16 @@ void options_init(or_options_t *options) { config_init(&options_format, options); + config_line_t *dflts = get_options_defaults(); + char *msg=NULL; + if (config_assign(&options_format, options, dflts, + CAL_WARN_DEPRECATIONS, &msg)<0) { + log_err(LD_BUG, "Unable to set default options: %s", msg); + tor_free(msg); + tor_assert_unreached(); + } + config_free_lines(dflts); + tor_free(msg); } /** Return a string containing a possible configuration file that would give @@ -5397,6 +5400,7 @@ options_init_from_string(const char *cf_defaults, const char *cf, int command, const char *command_arg, char **msg) { + bool retry = false; or_options_t *oldoptions, *newoptions, *newdefaultoptions=NULL; config_line_t *cl; int retval; @@ -5454,73 +5458,12 @@ options_init_from_string(const char *cf_defaults, const char *cf, newoptions->FilesOpenedByIncludes = opened_files; /* If this is a testing network configuration, change defaults - * for a list of dependent config options, re-initialize newoptions - * with the new defaults, and assign all options to it second time. */ - if (newoptions->TestingTorNetwork) { - /* XXXX this is a bit of a kludge. perhaps there's a better way to do - * this? We could, for example, make the parsing algorithm do two passes - * over the configuration. If it finds any "suite" options like - * TestingTorNetwork, it could change the defaults before its second pass. - * Not urgent so long as this seems to work, but at any sign of trouble, - * let's clean it up. -NM */ - - /* Change defaults. */ - for (int i = 0; testing_tor_network_defaults[i].member.name; ++i) { - const config_var_t *new_var = &testing_tor_network_defaults[i]; - config_var_t *old_var = - config_find_option_mutable(&options_format, new_var->member.name); - tor_assert(new_var); - tor_assert(old_var); - old_var->initvalue = new_var->initvalue; - - if ((config_find_deprecation(&options_format, new_var->member.name))) { - log_warn(LD_GENERAL, "Testing options override the deprecated " - "option %s. Is that intentional?", - new_var->member.name); - } - } - - /* Clear newoptions and re-initialize them with new defaults. */ - or_options_free(newoptions); - or_options_free(newdefaultoptions); - newdefaultoptions = NULL; - newoptions = tor_malloc_zero(sizeof(or_options_t)); - newoptions->magic_ = OR_OPTIONS_MAGIC; - options_init(newoptions); - newoptions->command = command; - newoptions->command_arg = command_arg ? tor_strdup(command_arg) : NULL; - - /* Assign all options a second time. */ - opened_files = smartlist_new(); - for (int i = 0; i < 2; ++i) { - const char *body = i==0 ? cf_defaults : cf; - if (!body) - continue; - - /* get config lines, assign them */ - retval = config_get_lines_include(body, &cl, 1, - body == cf ? &cf_has_include : NULL, - opened_files); - if (retval < 0) { - err = SETOPT_ERR_PARSE; - goto err; - } - retval = config_assign(&options_format, newoptions, cl, 0, msg); - config_free_lines(cl); - if (retval < 0) { - err = SETOPT_ERR_PARSE; - goto err; - } - if (i==0) - newdefaultoptions = config_dup(&options_format, newoptions); - } - /* Assign command-line variables a second time too */ - retval = config_assign(&options_format, newoptions, - global_cmdline_options, 0, msg); - if (retval < 0) { - err = SETOPT_ERR_PARSE; - goto err; - } + * for a list of dependent config options, and try this function again. */ + if (newoptions->TestingTorNetwork && ! testing_network_configured) { + // retry with the testing defaults. + testing_network_configured = true; + retry = true; + goto err; } newoptions->IncludeUsed = cf_has_include; @@ -5565,6 +5508,9 @@ options_init_from_string(const char *cf_defaults, const char *cf, tor_asprintf(msg, "Failed to parse/validate config: %s", old_msg); tor_free(old_msg); } + if (retry) + return options_init_from_string(cf_defaults, cf, command, command_arg, + msg); return err; } diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc new file mode 100644 index 000000000..0ed3c3862 --- /dev/null +++ b/src/app/config/testnet.inc @@ -0,0 +1,33 @@ +{ "DirAllowPrivateAddresses", "1" }, +{ "EnforceDistinctSubnets", "0" }, +{ "AssumeReachable", "1" }, +{ "AuthDirMaxServersPerAddr", "0" }, +{ "ClientBootstrapConsensusAuthorityDownloadInitialDelay", "0" }, +{ "ClientBootstrapConsensusFallbackDownloadInitialDelay", "0" }, +{ "ClientBootstrapConsensusAuthorityOnlyDownloadInitialDelay", "0" }, +{ "ClientDNSRejectInternalAddresses", "0" }, +{ "ClientRejectInternalAddresses", "0" }, +{ "CountPrivateBandwidth", "1" }, +{ "ExitPolicyRejectPrivate", "0" }, +{ "ExtendAllowPrivateAddresses", "1" }, +{ "V3AuthVotingInterval", "5 minutes" }, +{ "V3AuthVoteDelay", "20 seconds" }, +{ "V3AuthDistDelay", "20 seconds" }, +{ "TestingV3AuthInitialVotingInterval", "150 seconds" }, +{ "TestingV3AuthInitialVoteDelay", "20 seconds" }, +{ "TestingV3AuthInitialDistDelay", "20 seconds" }, +{ "TestingAuthDirTimeToLearnReachability", "0 minutes" }, +{ "TestingEstimatedDescriptorPropagationTime", "0 minutes" }, +{ "MinUptimeHidServDirectoryV2", "0 minutes" }, +{ "TestingServerDownloadInitialDelay", "0" }, +{ "TestingClientDownloadInitialDelay", "0" }, +{ "TestingServerConsensusDownloadInitialDelay", "0" }, +{ "TestingClientConsensusDownloadInitialDelay", "0" }, +{ "TestingBridgeDownloadInitialDelay", "10" }, +{ "TestingBridgeBootstrapDownloadInitialDelay", "0" }, +{ "TestingClientMaxIntervalWithoutRequest", "5 seconds" }, +{ "TestingDirConnectionMaxStall", "30 seconds" }, +{ "TestingEnableConnBwEvent", "1" }, +{ "TestingEnableCellStatsEvent", "1" }, +{ "RendPostPeriod", "2 minutes" }, +{ "___UsingTestNetworkDefaults", "1" }, diff --git a/src/core/include.am b/src/core/include.am index 1a4b9fb8a..0dc8d7cad 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 [View Less]

1 0

[tor/master] whitespace fix
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit 03247c8eaa305fc527ecda075a7b0a7145014c98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 24 17:11:41 2019 -0400 whitespace fix --- src/lib/conf/confmacros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/conf/confmacros.h b/src/lib/conf/confmacros.h index aa89965e6..2a15f09aa 100644 --- a/src/lib/conf/confmacros.h +++ b/src/lib/conf/confmacros.h @@ -49,7 +49,7 @@ #define CONFIG_VAR_DEFN(structtype, varname, vartype, membername, … [View More]

1 0

[tor/master] Fix comment: ___ options are now that way because of the INVISIBLE flag.
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit 65511a45adfeff258e71329b3ff98d5159f09f88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 24 17:26:02 2019 -0400 Fix comment: ___ options are now that way because of the INVISIBLE flag. --- src/app/config/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 4bc807a6f..f2e8ec820 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -8136,7 +8136,7 @@ … [View More]

1 0

[tor/master] Merge branch 'ticket30935' into ticket30935_merged
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit 2780cbb9cb9905a7194364d791da4d94ac419998 Merge: d475d7c2f c32d48594 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 22 17:25:35 2019 -0400 Merge branch 'ticket30935' into ticket30935_merged scripts/maint/practracker/exceptions.txt | 2 +- src/app/config/config.c | 258 ++++++++++++------------------ src/app/config/config.h | 2 +- src/app/config/confparse.c | 80 ++++----- src/app/config/confparse.h … [View More] | 70 ++------ src/app/config/statefile.c | 11 +- src/app/config/testnet.inc | 33 ++++ src/core/include.am | 7 +- src/feature/dirauth/shared_random_state.c | 16 +- src/lib/conf/.may_include | 1 + src/lib/conf/confmacros.h | 67 ++++++++ src/lib/conf/conftesting.h | 86 ++++++++++ src/lib/conf/conftypes.h | 63 ++++---- src/lib/conf/include.am | 4 +- src/lib/confmgt/structvar.c | 37 +++++ src/lib/confmgt/structvar.h | 5 + src/lib/confmgt/type_defs.c | 65 +++++--- src/lib/confmgt/typedvar.c | 45 ++++++ src/lib/confmgt/typedvar.h | 6 + src/lib/confmgt/var_type_def_st.h | 20 +++ src/test/test_confparse.c | 30 ++-- 21 files changed, 561 insertions(+), 347 deletions(-) diff --cc scripts/maint/practracker/exceptions.txt index 6bc023665,1e1ccda78..0acb6fb7f --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@@ -30,23 -30,24 +30,23 @@@ # Remember: It is better to fix the problem than to add a new exception! problem file-size /src/app/config/config.c 8518 - problem include-count /src/app/config/config.c 88 + problem include-count /src/app/config/config.c 89 problem function-size /src/app/config/config.c:options_act_reversible() 296 problem function-size /src/app/config/config.c:options_act() 589 -problem function-size /src/app/config/config.c:resolve_my_address() 192 -problem function-size /src/app/config/config.c:options_validate() 1217 +problem function-size /src/app/config/config.c:resolve_my_address() 190 +problem function-size /src/app/config/config.c:options_validate() 1209 problem function-size /src/app/config/config.c:options_init_from_torrc() 207 -problem function-size /src/app/config/config.c:options_init_from_string() 173 -problem function-size /src/app/config/config.c:options_init_logs() 146 +problem function-size /src/app/config/config.c:options_init_from_string() 171 +problem function-size /src/app/config/config.c:options_init_logs() 145 problem function-size /src/app/config/config.c:parse_bridge_line() 104 -problem function-size /src/app/config/config.c:parse_transport_line() 191 -problem function-size /src/app/config/config.c:parse_dir_authority_line() 151 -problem function-size /src/app/config/config.c:parse_dir_fallback_line() 102 -problem function-size /src/app/config/config.c:parse_port_config() 452 -problem function-size /src/app/config/config.c:parse_ports() 170 -problem function-size /src/app/config/config.c:getinfo_helper_config() 116 -problem function-size /src/app/config/confparse.c:config_assign_value() 205 -problem function-size /src/app/config/confparse.c:config_get_assigned_option() 129 -problem include-count /src/app/main/main.c 67 +problem function-size /src/app/config/config.c:parse_transport_line() 189 +problem function-size /src/app/config/config.c:parse_dir_authority_line() 150 +problem function-size /src/app/config/config.c:parse_dir_fallback_line() 101 +problem function-size /src/app/config/config.c:parse_port_config() 446 +problem function-size /src/app/config/config.c:parse_ports() 168 +problem function-size /src/app/config/config.c:getinfo_helper_config() 113 +problem file-size /src/app/config/or_options_st.h 1112 +problem include-count /src/app/main/main.c 68 problem function-size /src/app/main/main.c:dumpstats() 102 problem function-size /src/app/main/main.c:tor_init() 137 problem function-size /src/app/main/main.c:sandbox_init_filter() 291 [View Less]

1 0

[tor/master] clarify usage of __ and ___ prefixes on config options
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit cde662e259005887b897b5108e8a4b63f99abb59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 24 17:46:08 2019 -0400 clarify usage of __ and ___ prefixes on config options --- src/lib/conf/conftypes.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index 3b754e07b..fabad97d0 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -112,12 +112,14 @@ typedef struct … [View More]

1 0

[tor/master] Make config_var_is_invisible a function.
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit eb54fe8f97701a11e30009a94f11b7e3e5d69b4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 24 17:32:46 2019 -0400 Make config_var_is_invisible a function. --- src/app/config/config.c | 2 +- src/app/config/confparse.c | 5 +++++ src/app/config/confparse.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index f2e8ec820..740315f3e 100644 --- a/src/app/config/config.c +++ b/src/app/config/… [View More]

1 0

[tor/master] Make a function for NODUMP.
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit 078ba326a1255dbfbb442219c599e7961f4f85e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Aug 24 17:40:38 2019 -0400 Make a function for NODUMP. --- src/app/config/confparse.c | 7 ++++++- src/app/config/confparse.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 7127e62cd..6e2624466 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -169,6 +169,11 @@ … [View More]

1 0

[tor/master] Merge branch 'tor-github/pr/1254'
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit 24bc2cd7b5ab32d6a34dee3a27d5d383a383b270 Merge: 6ba05eea8 38c4e1426 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Aug 26 09:38:24 2019 -0400 Merge branch 'tor-github/pr/1254' changes/ticket30935 | 6 + scripts/maint/practracker/exceptions.txt | 2 +- src/app/config/config.c | 260 ++++++++++++------------------ src/app/config/config.h | 2 +- src/app/config/confparse.c | 90 ++++++--… [View More]

1 0