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

[tor/master] Replace config_find_option with a variant that exposes less
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 7e91d4f57298fc08e4aad8ca90ecfad7cf9de206 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 22 15:01:57 2019 -0400 Replace config_find_option with a variant that exposes less --- src/app/config/config.c | 6 ++---- src/app/config/confparse.c | 14 +++++++------- src/app/config/confparse.h | 6 +++--- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 76feed000..444ce481c 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -2588,8 +2588,7 @@ config_parse_commandline(int argc, char **argv, int ignore_errors, int option_is_recognized(const char *key) { - const config_var_t *var = config_find_option(get_options_mgr(), key); - return (var != NULL); + return config_find_option_name(get_options_mgr(), key) != NULL; } /** Return the canonical name of a configuration option, or NULL @@ -2597,8 +2596,7 @@ option_is_recognized(const char *key) const char * option_get_canonical_name(const char *key) { - const config_var_t *var = config_find_option(get_options_mgr(), key); - return var ? var->member.name : NULL; + return config_find_option_name(get_options_mgr(), key); } /** Return a canonical list of the options assigned for key. diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 0964321ad..16fb6dbc5 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -288,17 +288,17 @@ config_mgr_find_var(const config_mgr_t *mgr, 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. +/** + * If key is a name or an abbreviation configuration option, return + * the corresponding canonical name for it. Warn if the abbreviation is + * non-standard. Return NULL if the option does not exist. */ -const config_var_t * -config_find_option(const config_mgr_t *mgr, const char *key) +const char * +config_find_option_name(const config_mgr_t *mgr, const char *key) { const managed_var_t *mv = config_mgr_find_var(mgr, key, true, NULL); if (mv) - return mv->cvar; + return mv->cvar->member.name; else return NULL; } diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index a6a2450ae..6e1e8cb3e 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -111,9 +111,9 @@ int config_assign(const config_mgr_t *mgr, void *options, struct config_line_t *list, unsigned flags, char **msg); const char *config_find_deprecation(const config_mgr_t *mgr, - const char *key); -const config_var_t *config_find_option(const config_mgr_t *mgr, - const char *key); + const char *key); +const char *config_find_option_name(const config_mgr_t *mgr, + const char *key); const char *config_expand_abbrev(const config_mgr_t *mgr, const char *option, int command_line, int warn_obsolete);

1 0

[tor/master] Sort variables in config_mgr_t.all_vars alphabetically
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit a1b2817abefc5c696e469fa4fd8a09cc5f286aa6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 09:17:51 2019 -0400 Sort variables in config_mgr_t.all_vars alphabetically --- src/app/config/confparse.c | 11 +++++++ src/test/test_confparse.c | 77 +++++++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 39 deletions(-) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index b086f8c94..c7ee8f301 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -169,6 +169,16 @@ config_mgr_get_obj(const config_mgr_t *mgr, const void *toplevel, int idx) return config_mgr_get_obj_mutable(mgr, (void*)toplevel, idx); } +/** Sorting helper for smartlist of managed_var_t */ +static int +managed_var_cmp(const void **a, const void **b) +{ + const managed_var_t *mv1 = *(const managed_var_t**)a; + const managed_var_t *mv2 = *(const managed_var_t**)b; + + return strcasecmp(mv1->cvar->member.name, mv2->cvar->member.name); +} + /** * Mark a configuration manager as "frozen", so that no more formats can be * added, and so that it can be used for manipulating configuration objects. @@ -176,6 +186,7 @@ config_mgr_get_obj(const config_mgr_t *mgr, const void *toplevel, int idx) void config_mgr_freeze(config_mgr_t *mgr) { + smartlist_sort(mgr->all_vars, managed_var_cmp); mgr->frozen = true; } diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index 716384e2f..1513c9323 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -527,78 +527,77 @@ test_confparse_dump(void *arg) /* Minimal version. */ dumped = config_dump(mgr, NULL, tst, 1, 0); tt_str_op(dumped, OP_EQ, - "s this is a\n" - "fn /simple/test of the\n" - "pos 77\n" - "i 3\n" - "u64 1000000000000\n" - "interval 300\n" - "msec_interval 300000\n" - "mem 10\n" - "dbl 6.060842\n" - "boolean 1\n" "autobool 0\n" - "time 2019-06-14 13:58:51\n" + "boolean 1\n" "csv configuration,parsing,system\n" "csv_interval 10\n" + "dbl 6.060842\n" + "fn /simple/test of the\n" + "i 3\n" + "interval 300\n" "lines hello\n" "lines world\n" + "mem 10\n" + "VisibleLineB ABC\n" "LineTypeA i d\n" "LineTypeB i c\n" + "msec_interval 300000\n" + "pos 77\n" "routerset $FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF\n" - "VisibleLineB ABC\n"); + "s this is a\n" + "time 2019-06-14 13:58:51\n" + "u64 1000000000000\n"); - /* Maximal */ tor_free(dumped); dumped = config_dump(mgr, NULL, tst, 0, 0); tt_str_op(dumped, OP_EQ, - "s this is a\n" - "fn /simple/test of the\n" - "pos 77\n" - "i 3\n" - "deprecated_int 3\n" - "u64 1000000000000\n" - "interval 300\n" - "msec_interval 300000\n" - "mem 10\n" - "dbl 6.060842\n" - "boolean 1\n" "autobool 0\n" - "time 2019-06-14 13:58:51\n" + "boolean 1\n" "csv configuration,parsing,system\n" "csv_interval 10\n" + "dbl 6.060842\n" + "deprecated_int 3\n" + "fn /simple/test of the\n" + "i 3\n" + "interval 300\n" "lines hello\n" "lines world\n" + "mem 10\n" + "VisibleLineB ABC\n" "LineTypeA i d\n" "LineTypeB i c\n" + "msec_interval 300000\n" + "pos 77\n" "routerset $FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF\n" - "VisibleLineB ABC\n"); + "s this is a\n" + "time 2019-06-14 13:58:51\n" + "u64 1000000000000\n"); /* commented */ tor_free(dumped); dumped = config_dump(mgr, NULL, tst, 0, 1); tt_str_op(dumped, OP_EQ, - "s this is a\n" - "fn /simple/test of the\n" - "pos 77\n" - "i 3\n" - "# deprecated_int 3\n" - "u64 1000000000000\n" - "interval 300\n" - "msec_interval 300000\n" - "mem 10\n" - "dbl 6.060842\n" - "boolean 1\n" "autobool 0\n" - "time 2019-06-14 13:58:51\n" + "boolean 1\n" "csv configuration,parsing,system\n" "csv_interval 10\n" + "dbl 6.060842\n" + "# deprecated_int 3\n" + "fn /simple/test of the\n" + "i 3\n" + "interval 300\n" "lines hello\n" "lines world\n" + "mem 10\n" + "VisibleLineB ABC\n" "LineTypeA i d\n" "LineTypeB i c\n" + "msec_interval 300000\n" + "pos 77\n" "routerset $FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF\n" - "VisibleLineB ABC\n"); + "s this is a\n" + "time 2019-06-14 13:58:51\n" + "u64 1000000000000\n"); done: config_free(mgr, tst);

1 0

[tor/master] Add a "freeze" function for config_mgr_t objects.
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit dde091ebc76d8ae5d93c1b3e1febfa2c9d1459fa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 09:08:31 2019 -0400 Add a "freeze" function for config_mgr_t objects. It's important to make sure that we don't change a config_mgr_t after we start using it to make objects, or we could get into inconsistent states. This feature is the start of a safety mechanism to prevent this problem. --- src/app/config/config.c | 1 + src/app/config/confparse.c | 20 ++++++++++++++++++++ src/app/config/confparse.h | 1 + src/app/config/statefile.c | 1 + src/feature/dirauth/shared_random_state.c | 1 + src/test/test_confparse.c | 15 +++++++++++++++ 6 files changed, 39 insertions(+) diff --git a/src/app/config/config.c b/src/app/config/config.c index 246f52a64..d8b33aee7 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -904,6 +904,7 @@ get_options_mgr(void) { if (PREDICT_UNLIKELY(options_mgr == NULL)) { options_mgr = config_mgr_new(&options_format); + config_mgr_freeze(options_mgr); } return options_mgr; } diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 9d4226307..b086f8c94 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -85,6 +85,10 @@ struct config_mgr_t { smartlist_t *all_abbrevs; /** A smartlist of config_deprecation_t for all configuration formats. */ smartlist_t *all_deprecations; + /** True if this manager has been frozen and cannot have any more formats + * added to it. A manager must be frozen before it can be used to construct + * or manipulate objects. */ + bool frozen; }; #define IDX_TOPLEVEL (-1) @@ -112,6 +116,10 @@ config_mgr_register_fmt(config_mgr_t *mgr, { int i; + tor_assertf(!mgr->frozen, + "Tried to add a format to a configuration manager after " + "it had been frozen."); + /* register variables */ for (i = 0; fmt->vars[i].member.name; ++i) { managed_var_t *mv = tor_malloc_zero(sizeof(managed_var_t)); @@ -161,6 +169,16 @@ config_mgr_get_obj(const config_mgr_t *mgr, const void *toplevel, int idx) return config_mgr_get_obj_mutable(mgr, (void*)toplevel, idx); } +/** + * Mark a configuration manager as "frozen", so that no more formats can be + * added, and so that it can be used for manipulating configuration objects. + **/ +void +config_mgr_freeze(config_mgr_t *mgr) +{ + mgr->frozen = true; +} + /** Release all storage held in mgr */ void config_mgr_free_(config_mgr_t *mgr) @@ -208,6 +226,7 @@ config_mgr_assert_magic_ok(const config_mgr_t *mgr, { tor_assert(mgr); tor_assert(options); + tor_assert(mgr->frozen); struct_check_magic(options, &mgr->toplevel->magic); } @@ -221,6 +240,7 @@ config_mgr_assert_magic_ok(const config_mgr_t *mgr, void * config_new(const config_mgr_t *mgr) { + tor_assert(mgr->frozen); const config_format_t *fmt = mgr->toplevel; void *opts = tor_malloc_zero(fmt->size); struct_set_magic(opts, &fmt->magic); diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index edc7fa377..83e886696 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -73,6 +73,7 @@ typedef struct config_mgr_t config_mgr_t; config_mgr_t *config_mgr_new(const config_format_t *toplevel_fmt); void config_mgr_free_(config_mgr_t *mgr); +void config_mgr_freeze(config_mgr_t *mgr); #define config_mgr_free(mgr) \ FREE_AND_NULL(config_mgr_t, config_mgr_free_, (mgr)) struct smartlist_t *config_mgr_list_vars(const config_mgr_t *mgr); diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index a44bcf6fb..93e35659d 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -183,6 +183,7 @@ get_state_mgr(void) { if (PREDICT_UNLIKELY(state_mgr == NULL)) { state_mgr = config_mgr_new(&state_format); + config_mgr_freeze(state_mgr); } return state_mgr; } diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index a552e621c..12ae79ce3 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -112,6 +112,7 @@ get_srs_mgr(void) { if (PREDICT_UNLIKELY(shared_random_state_mgr == NULL)) { shared_random_state_mgr = config_mgr_new(&state_format); + config_mgr_freeze(shared_random_state_mgr); } return shared_random_state_mgr; } diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index 8a921531f..716384e2f 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -153,6 +153,7 @@ test_confparse_init(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = config_new(mgr); config_init(mgr, tst); @@ -239,6 +240,7 @@ test_confparse_assign_simple(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); tt_str_op(tst->s, OP_EQ, "this is a"); @@ -300,6 +302,7 @@ test_confparse_assign_obsolete(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); config_line_t *lines = NULL; char *msg = NULL; @@ -330,6 +333,7 @@ test_confparse_assign_deprecated(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); config_line_t *lines = NULL; char *msg = NULL; @@ -364,6 +368,7 @@ test_confparse_assign_replaced(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); config_line_t *lines = NULL; char *msg = NULL; @@ -395,6 +400,7 @@ test_confparse_assign_emptystring(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); config_line_t *lines = NULL; char *msg = NULL; @@ -423,6 +429,7 @@ test_confparse_assign_twice(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); config_line_t *lines = NULL; char *msg = NULL; @@ -458,6 +465,7 @@ test_confparse_assign_badval(void *arg) { const badval_test_t *bt = arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); config_line_t *lines = NULL; char *msg = NULL; @@ -512,6 +520,7 @@ test_confparse_dump(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); char *dumped = NULL; @@ -603,6 +612,7 @@ test_confparse_reset(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); config_reset_line(mgr, tst, "interval", 0); @@ -623,6 +633,7 @@ test_confparse_reassign(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); config_line_t *lines = NULL; char *msg = NULL, *rs = NULL; @@ -679,6 +690,7 @@ test_confparse_reassign_extend(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); config_line_t *lines = NULL; char *msg = NULL; @@ -738,6 +750,7 @@ test_confparse_get_assigned(void *arg) (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = get_simple_config(mgr); config_line_t *lines = NULL; @@ -824,6 +837,7 @@ test_confparse_extra_lines(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&etest_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = config_new(mgr); config_line_t *lines = NULL; char *msg = NULL, *dump = NULL; @@ -919,6 +933,7 @@ test_confparse_check_ok_fail(void *arg) { (void)arg; config_mgr_t *mgr = config_mgr_new(&test_fmt); + config_mgr_freeze(mgr); test_struct_t *tst = config_new(mgr); tst->pos = -10; tt_assert(! config_check_ok(mgr, tst, LOG_INFO));

1 0

[tor/master] Change CONFIG_CHECK() macro to not need a config_format_t
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 7abd43ac5f1e18e6a1c6bb2de95f39f22392f0c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 22 16:28:34 2019 -0400 Change CONFIG_CHECK() macro to not need a config_format_t We'll want it to check all the subsidiary structures of the options object. --- src/app/config/confparse.c | 46 ++++++++++++++++++++++++++++------------------ src/app/config/confparse.h | 7 ------- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 0f0950dd8..9d4226307 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -200,6 +200,23 @@ config_mgr_list_deprecated_vars(const config_mgr_t *mgr) return result; } +/** Assert that the magic fields in options and its subsidiary + * objects are all okay. */ +static void +config_mgr_assert_magic_ok(const config_mgr_t *mgr, + const void *options) +{ + tor_assert(mgr); + tor_assert(options); + struct_check_magic(options, &mgr->toplevel->magic); +} + +/** Macro: assert that cfg has the right magic field for + * mgr. */ +#define CONFIG_CHECK(mgr, cfg) STMT_BEGIN \ + config_mgr_assert_magic_ok((mgr), (cfg)); \ + STMT_END + /** Allocate an empty configuration object of a given format type. */ void * config_new(const config_mgr_t *mgr) @@ -207,7 +224,7 @@ config_new(const config_mgr_t *mgr) const config_format_t *fmt = mgr->toplevel; void *opts = tor_malloc_zero(fmt->size); struct_set_magic(opts, &fmt->magic); - CONFIG_CHECK(fmt, opts); + CONFIG_CHECK(mgr, opts); return opts; } @@ -367,9 +384,8 @@ config_assign_value(const config_mgr_t *mgr, void *options, config_line_t *c, char **msg) { const managed_var_t *var; - const config_format_t *fmt = mgr->toplevel; - CONFIG_CHECK(fmt, options); + CONFIG_CHECK(mgr, options); var = config_mgr_find_var(mgr, c->key, true, NULL); tor_assert(var); @@ -417,17 +433,17 @@ config_assign_line(const config_mgr_t *mgr, void *options, config_line_t *c, unsigned flags, bitarray_t *options_seen, char **msg) { - const config_format_t *fmt = mgr->toplevel; const unsigned use_defaults = flags & CAL_USE_DEFAULTS; const unsigned clear_first = flags & CAL_CLEAR_FIRST; const unsigned warn_deprecations = flags & CAL_WARN_DEPRECATIONS; const managed_var_t *mvar; - CONFIG_CHECK(fmt, options); + CONFIG_CHECK(mgr, options); int var_index = -1; mvar = config_mgr_find_var(mgr, c->key, true, &var_index); if (!mvar) { + const config_format_t *fmt = mgr->toplevel; if (fmt->extra) { void *lvalue = STRUCT_VAR_P(options, fmt->extra->offset); log_info(LD_CONFIG, @@ -497,10 +513,9 @@ STATIC void config_reset_line(const config_mgr_t *mgr, void *options, const char *key, int use_defaults) { - const config_format_t *fmt = mgr->toplevel; const managed_var_t *var; - CONFIG_CHECK(fmt, options); + CONFIG_CHECK(mgr, options); var = config_mgr_find_var(mgr, key, true, NULL); if (!var) @@ -545,11 +560,10 @@ config_get_assigned_option(const config_mgr_t *mgr, const void *options, { const managed_var_t *var; config_line_t *result; - const config_format_t *fmt = mgr->toplevel; tor_assert(options && key); - CONFIG_CHECK(fmt, options); + CONFIG_CHECK(mgr, options); var = config_mgr_find_var(mgr, key, true, NULL); if (!var) { @@ -635,12 +649,11 @@ config_assign(const config_mgr_t *mgr, void *options, config_line_t *list, { config_line_t *p; bitarray_t *options_seen; - const config_format_t *fmt = mgr->toplevel; const int n_options = config_count_options(mgr); const unsigned clear_first = config_assign_flags & CAL_CLEAR_FIRST; const unsigned use_defaults = config_assign_flags & CAL_USE_DEFAULTS; - CONFIG_CHECK(fmt, options); + CONFIG_CHECK(mgr, options); /* pass 1: normalize keys */ for (p = list; p; p = p->next) { @@ -695,10 +708,9 @@ static void config_reset(const config_mgr_t *mgr, void *options, const managed_var_t *var, int use_defaults) { - const config_format_t *fmt = mgr->toplevel; config_line_t *c; char *msg = NULL; - CONFIG_CHECK(fmt, options); + CONFIG_CHECK(mgr, options); config_clear(mgr, options, var); /* clear it first */ if (!use_defaults) @@ -749,9 +761,8 @@ config_is_same(const config_mgr_t *mgr, const void *o1, const void *o2, const char *name) { - const config_format_t *fmt = mgr->toplevel; - CONFIG_CHECK(fmt, o1); - CONFIG_CHECK(fmt, o2); + CONFIG_CHECK(mgr, o1); + CONFIG_CHECK(mgr, o2); const managed_var_t *var = config_mgr_find_var(mgr, name, true, NULL); if (!var) { @@ -833,8 +844,7 @@ config_dup(const config_mgr_t *mgr, const void *old) void config_init(const config_mgr_t *mgr, void *options) { - const config_format_t *fmt = mgr->toplevel; - CONFIG_CHECK(fmt, options); + CONFIG_CHECK(mgr, options); SMARTLIST_FOREACH_BEGIN(mgr->all_vars, const managed_var_t *, mv) { if (!mv->cvar->initvalue) diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index 105103503..edc7fa377 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -78,13 +78,6 @@ void config_mgr_free_(config_mgr_t *mgr); struct smartlist_t *config_mgr_list_vars(const config_mgr_t *mgr); struct smartlist_t *config_mgr_list_deprecated_vars(const config_mgr_t *mgr); -/** Macro: assert that cfg has the right magic field for format - * fmt. */ -#define CONFIG_CHECK(fmt, cfg) STMT_BEGIN \ - tor_assert(fmt); \ - struct_check_magic((cfg), &fmt->magic); \ - STMT_END - #define CAL_USE_DEFAULTS (1u<<0) #define CAL_CLEAR_FIRST (1u<<1) #define CAL_WARN_DEPRECATIONS (1u<<2)

1 0

[tor/master] Use config_new() to construct configuration objects.
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 57e87cc86cce0b9fb351b1862f99c84bfa8100eb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 10:13:29 2019 -0400 Use config_new() to construct configuration objects. We'll need to do it this way once the objects become more complex. --- src/app/config/config.c | 3 +-- src/app/config/statefile.c | 3 +-- src/feature/dirauth/shared_random_state.c | 10 +++++----- src/test/fuzz/fuzzing_common.c | 2 +- src/test/test_config.c | 8 ++++---- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index d8b33aee7..7aa253a6b 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -5404,8 +5404,7 @@ options_init_from_string(const char *cf_defaults, const char *cf, oldoptions = global_options; /* get_options unfortunately asserts if this is the first time we run*/ - newoptions = tor_malloc_zero(sizeof(or_options_t)); - newoptions->magic_ = OR_OPTIONS_MAGIC; + newoptions = options_new(); options_init(newoptions); newoptions->command = command; newoptions->command_arg = command_arg ? tor_strdup(command_arg) : NULL; diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index 93e35659d..54ee398a7 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -376,8 +376,7 @@ or_state_save_broken(char *fname) STATIC or_state_t * or_state_new(void) { - or_state_t *new_state = tor_malloc_zero(sizeof(or_state_t)); - new_state->magic_ = OR_STATE_MAGIC; + or_state_t *new_state = config_new(get_state_mgr()); config_init(get_state_mgr(), new_state); return new_state; diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index 12ae79ce3..21bf3c122 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -285,9 +285,8 @@ disk_state_free_(sr_disk_state_t *state) static sr_disk_state_t * disk_state_new(time_t now) { - sr_disk_state_t *new_state = tor_malloc_zero(sizeof(*new_state)); + sr_disk_state_t *new_state = config_new(get_srs_mgr()); - new_state->magic_ = SR_DISK_STATE_MAGIC; new_state->Version = SR_PROTO_VERSION; new_state->TorVersion = tor_strdup(get_version()); new_state->ValidUntil = get_state_valid_until_time(now); @@ -599,11 +598,12 @@ disk_state_reset(void) config_free_lines(sr_disk_state->ExtraLines); tor_free(sr_disk_state->TorVersion); - /* Clean up the struct */ - memset(sr_disk_state, 0, sizeof(*sr_disk_state)); + /* Clear other fields. */ + sr_disk_state->ValidAfter = 0; + sr_disk_state->ValidUntil = 0; + sr_disk_state->Version = 0; /* Reset it with useful data */ - sr_disk_state->magic_ = SR_DISK_STATE_MAGIC; sr_disk_state->TorVersion = tor_strdup(get_version()); } diff --git a/src/test/fuzz/fuzzing_common.c b/src/test/fuzz/fuzzing_common.c index 6d0f9d7d6..1285d94ae 100644 --- a/src/test/fuzz/fuzzing_common.c +++ b/src/test/fuzz/fuzzing_common.c @@ -111,7 +111,7 @@ global_init(void) } /* set up the options. */ - mock_options = tor_malloc_zero(sizeof(or_options_t)); + mock_options = options_new(); MOCK(get_options, mock_get_options); /* Make BUG() and nonfatal asserts crash */ diff --git a/src/test/test_config.c b/src/test/test_config.c index a415ca448..cfca3149f 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1762,7 +1762,7 @@ test_config_adding_dir_servers(void *arg) (void)arg; /* allocate options */ - or_options_t *options = tor_malloc_zero(sizeof(or_options_t)); + or_options_t *options = options_new(); /* Allocate and populate configuration lines: * @@ -3533,7 +3533,7 @@ test_config_default_dir_servers(void *arg) int fallback_count = 0; /* new set of options should stop fallback parsing */ - opts = tor_malloc_zero(sizeof(or_options_t)); + opts = options_new(); opts->UseDefaultFallbackDirs = 0; /* set old_options to NULL to force dir update */ consider_adding_dir_servers(opts, NULL); @@ -3547,7 +3547,7 @@ test_config_default_dir_servers(void *arg) /* if we disable the default fallbacks, there must not be any extra */ tt_assert(fallback_count == trusted_count); - opts = tor_malloc_zero(sizeof(or_options_t)); + opts = options_new(); opts->UseDefaultFallbackDirs = 1; consider_adding_dir_servers(opts, opts); trusted_count = smartlist_len(router_get_trusted_dir_servers()); @@ -3607,7 +3607,7 @@ test_config_directory_fetch(void *arg) (void)arg; /* Test Setup */ - or_options_t *options = tor_malloc_zero(sizeof(or_options_t)); + or_options_t *options = options_new(); routerinfo_t routerinfo; memset(&routerinfo, 0, sizeof(routerinfo)); mock_router_pick_published_address_result = -1;

1 0

[tor/master] Use special magic to enforce manager/object connection.
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 3d1f9f583a45143c1259b8926f8c57fa57fc1efb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 10:41:57 2019 -0400 Use special magic to enforce manager/object connection. Every time we finalize a config manager, we now generate a new magic number for it, so that we'll get an assertion failure if we ever try to use an object with a different configuration manager than the one that generated it. --- src/app/config/confparse.c | 21 +++++++++++++++++++-- src/test/test_confparse.c | 1 - 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index c7ee8f301..998c0e6ef 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -37,6 +37,8 @@ #include "lib/string/printf.h" #include "lib/string/util_string.h" +#include "ext/siphash.h" + /** * A managed_var_t is an internal wrapper around a config_var_t in * a config_format_t structure. It is used by config_mgr_t to @@ -89,6 +91,12 @@ struct config_mgr_t { * added to it. A manager must be frozen before it can be used to construct * or manipulate objects. */ bool frozen; + /** A replacement for the magic number of the toplevel object. We override + * that number to make it unique for this particular config_mgr_t, so that + * an object constructed with one mgr can't be used with another, even if + * those managers' contents are equal. + */ + struct_magic_decl_t toplevel_magic; }; #define IDX_TOPLEVEL (-1) @@ -186,7 +194,16 @@ managed_var_cmp(const void **a, const void **b) void config_mgr_freeze(config_mgr_t *mgr) { + static uint64_t mgr_count = 0; + smartlist_sort(mgr->all_vars, managed_var_cmp); + memcpy(&mgr->toplevel_magic, &mgr->toplevel->magic, + sizeof(struct_magic_decl_t)); + uint64_t magic_input[3] = { mgr->toplevel_magic.magic_val, + (uint64_t) (uintptr_t) mgr, + ++mgr_count }; + mgr->toplevel_magic.magic_val = + (uint32_t)siphash24g(magic_input, sizeof(magic_input)); mgr->frozen = true; } @@ -238,7 +255,7 @@ config_mgr_assert_magic_ok(const config_mgr_t *mgr, tor_assert(mgr); tor_assert(options); tor_assert(mgr->frozen); - struct_check_magic(options, &mgr->toplevel->magic); + struct_check_magic(options, &mgr->toplevel_magic); } /** Macro: assert that cfg has the right magic field for @@ -254,7 +271,7 @@ config_new(const config_mgr_t *mgr) tor_assert(mgr->frozen); const config_format_t *fmt = mgr->toplevel; void *opts = tor_malloc_zero(fmt->size); - struct_set_magic(opts, &fmt->magic); + struct_set_magic(opts, &mgr->toplevel_magic); CONFIG_CHECK(mgr, opts); return opts; } diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index 1513c9323..78eb3d38b 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -158,7 +158,6 @@ test_confparse_init(void *arg) config_init(mgr, tst); // Make sure that options are initialized right. */ - tt_uint_op(tst->magic, OP_EQ, TEST_MAGIC); tt_str_op(tst->s, OP_EQ, "hello"); tt_ptr_op(tst->fn, OP_EQ, NULL); tt_int_op(tst->pos, OP_EQ, 0);

1 0

[tor/master] Make a config_suite_t type to hold multiple config sub-objects
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 38b770bbbb37aef6cd3cef5fd6f425cd951affe2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 11:32:52 2019 -0400 Make a config_suite_t type to hold multiple config sub-objects Right now, it doesn't do anything; this patch is meant to make sure that we're doing memory management correctly. --- src/app/config/config.c | 1 + src/app/config/confparse.c | 49 +++++++++++++++++++++++++++++++ src/app/config/confparse.h | 6 ++++ src/app/config/or_options_st.h | 4 +++ src/app/config/or_state_st.h | 4 +++ src/app/config/statefile.c | 1 + src/feature/dirauth/shared_random_state.c | 1 + src/test/test_confparse.c | 2 ++ 8 files changed, 68 insertions(+) diff --git a/src/app/config/config.c b/src/app/config/config.c index cdf5fa266..bff403a99 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -864,6 +864,7 @@ static const config_format_t options_format = { options_validate_cb, options_clear_cb, NULL, + offsetof(or_options_t, subconfigs_), }; /* diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 8e3ad7faf..d94a1d9ec 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -72,6 +72,36 @@ managed_var_free_(managed_var_t *mv) #define managed_var_free(mv) \ FREE_AND_NULL(managed_var_t, managed_var_free_, (mv)) +struct config_suite_t { + /* NOTE: This object isn't implemented yet; it's just a placeholder + * to make sure we have our memory menagement right. + */ + int foo; +}; + +/** + * Allocate a new empty config_suite_t. + **/ +static config_suite_t * +config_suite_new(void) +{ + config_suite_t *suite = tor_malloc_zero(sizeof(config_suite_t)); + return suite; +} + +/** Release all storage held by a config_suite_t. (Does not free + * any configuration objects it holds; the caller must do that first.) */ +static void +config_suite_free_(config_suite_t *suite) +{ + if (!suite) + return; + tor_free(suite); +} + +#define config_suite_free(suite) \ + FREE_AND_NULL(config_suite_t, config_suite_free_, (suite)) + struct config_mgr_t { /** The 'top-level' configuration format. This one is used for legacy * options that have not yet been assigned to different sub-modules. @@ -152,6 +182,16 @@ config_mgr_register_fmt(config_mgr_t *mgr, } } +/** Return a pointer to the config_suite_t * pointer inside a + * configuration object; returns NULL if there is no such member. */ +static inline config_suite_t ** +config_mgr_get_suite_ptr(const config_mgr_t *mgr, void *toplevel) +{ + if (mgr->toplevel->config_suite_offset < 0) + return NULL; + return STRUCT_VAR_P(toplevel, mgr->toplevel->config_suite_offset); +} + /** * Return a pointer to the configuration object within toplevel whose * index is idx. @@ -272,6 +312,10 @@ config_new(const config_mgr_t *mgr) const config_format_t *fmt = mgr->toplevel; void *opts = tor_malloc_zero(fmt->size); struct_set_magic(opts, &mgr->toplevel_magic); + config_suite_t **suitep = config_mgr_get_suite_ptr(mgr, opts); + if (suitep) { + *suitep = config_suite_new(); + } CONFIG_CHECK(mgr, opts); return opts; } @@ -802,6 +846,11 @@ config_free_(const config_mgr_t *mgr, void *options) config_free_lines(*linep); *linep = NULL; } + + config_suite_t **suitep = config_mgr_get_suite_ptr(mgr, options); + if (suitep) + config_suite_free(*suitep); + tor_free(options); } diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index 2e1a4b4f5..c18e85423 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -61,6 +61,9 @@ typedef struct config_format_t { /** If present, extra denotes a LINELIST variable for unrecognized * lines. Otherwise, unrecognized lines are an error. */ const struct_member_t *extra; + /** The position of a config_suite_t pointer within the toplevel object, + * or -1 if there is no such pointer. */ + int config_suite_offset; } config_format_t; /** @@ -79,6 +82,9 @@ void config_mgr_freeze(config_mgr_t *mgr); struct smartlist_t *config_mgr_list_vars(const config_mgr_t *mgr); struct smartlist_t *config_mgr_list_deprecated_vars(const config_mgr_t *mgr); +/** A collection of managed configuration objects. */ +typedef struct config_suite_t config_suite_t; + #define CAL_USE_DEFAULTS (1u<<0) #define CAL_CLEAR_FIRST (1u<<1) #define CAL_WARN_DEPRECATIONS (1u<<2) diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 8156d2ca1..2c1a8f0c0 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -18,6 +18,7 @@ struct smartlist_t; struct config_line_t; +struct config_suite_t; /** Enumeration of outbound address configuration types: * Exit-only, OR-only, or both */ @@ -1107,6 +1108,9 @@ struct or_options_t { * a possible previous dormant state. **/ int DormantCanceledByStartup; + + /**DOCDOC*/ + struct config_suite_t *subconfigs_; }; #endif /* !defined(TOR_OR_OPTIONS_ST_H) */ diff --git a/src/app/config/or_state_st.h b/src/app/config/or_state_st.h index f45c6196c..54390fa2d 100644 --- a/src/app/config/or_state_st.h +++ b/src/app/config/or_state_st.h @@ -15,6 +15,7 @@ #include "lib/cc/torint.h" struct smartlist_t; +struct config_suite_t; /** Persistent state for an onion router, as saved to disk. */ struct or_state_t { @@ -94,6 +95,9 @@ struct or_state_t { /** True if we were dormant when we last wrote the file; false if we * weren't. "auto" on initial startup. */ int Dormant; + + /**DOCDOC*/ + struct config_suite_t *substates_; }; #endif /* !defined(TOR_OR_STATE_ST_H) */ diff --git a/src/app/config/statefile.c b/src/app/config/statefile.c index ede35e6ce..bcc06809b 100644 --- a/src/app/config/statefile.c +++ b/src/app/config/statefile.c @@ -170,6 +170,7 @@ static const config_format_t state_format = { or_state_validate_cb, NULL, &state_extra_var, + offsetof(or_state_t, substates_), }; /* A global configuration manager for state-file objects */ diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c index fac1efc54..f2a626c73 100644 --- a/src/feature/dirauth/shared_random_state.c +++ b/src/feature/dirauth/shared_random_state.c @@ -100,6 +100,7 @@ static const config_format_t state_format = { disk_state_validate_cb, NULL, &state_extra_var, + -1, }; /* Global configuration manager for the shared-random state file */ diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index 273232fe5..eaa257aed 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -134,6 +134,7 @@ static const config_format_t test_fmt = { test_validate_cb, NULL, NULL, + -1, }; /* Make sure that config_init sets everything to the right defaults. */ @@ -815,6 +816,7 @@ static config_format_t etest_fmt = { test_validate_cb, NULL, &extra, + -1, }; /* Try out the feature where we can store unrecognized lines and dump them

1 0

[tor/master] finish a comment explaining all_abbrevs
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 760d0c056fafdcefd9ac58d48f8ccf473d0ea877 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 26 19:15:52 2019 -0400 finish a comment explaining all_abbrevs --- src/app/config/confparse.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 8018f6a6d..95e73eeab 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -119,8 +119,9 @@ struct config_mgr_t { smartlist_t *subconfigs; /** A smartlist of managed_var_t objects for all configuration formats. */ smartlist_t *all_vars; - /** A smartlist of config_abbrev_t objects for all abbreviations. These - * objects are */ + /** A smartlist of config_abbrev_t objects for all configuration + * formats. These objects are used to track synonyms and abbreviations for + * different configuration options. */ smartlist_t *all_abbrevs; /** A smartlist of config_deprecation_t for all configuration formats. */ smartlist_t *all_deprecations;

1 0

[tor/master] Document types for config_get_changes()
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 3a530ae5352cb64e176b889e5449913416c372c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 26 19:19:09 2019 -0400 Document types for config_get_changes() --- src/app/config/confparse.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 95e73eeab..324009b59 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -951,6 +951,9 @@ config_is_same(const config_mgr_t *mgr, * Return a list of the options which have changed between options1 and * options2. If an option has reverted to its default value, it has a * value entry of NULL. + * + * options1 and options2 must be top-level configuration objects + * of the type managed by mgr. **/ config_line_t * config_get_changes(const config_mgr_t *mgr,

1 0

[tor/master] Partial support for multiplicity in configuration objects
by dgoulet＠torproject.org 04 Sep '19

04 Sep '19

commit 638e58379a4c5347dd4952f12dd3b1054e7bb19f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 24 11:20:55 2019 -0400 Partial support for multiplicity in configuration objects A configuration manager, in addition to a top-level format object, may now also know about a suite of sub-formats. Top-level configuration objects, in turn, may now have a suite of sub-objects. --- src/app/config/confparse.c | 105 +++++++++++++++++++++++++++++++++++++-------- src/app/config/confparse.h | 2 + 2 files changed, 90 insertions(+), 17 deletions(-) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index d94a1d9ec..8018f6a6d 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -73,10 +73,10 @@ managed_var_free_(managed_var_t *mv) FREE_AND_NULL(managed_var_t, managed_var_free_, (mv)) struct config_suite_t { - /* NOTE: This object isn't implemented yet; it's just a placeholder - * to make sure we have our memory menagement right. - */ - int foo; + /** A list of configuration objects managed by a given configuration + * manager. They are stored in the same order as the config_format_t + * objects in the manager's list of subformats. */ + smartlist_t *configs; }; /** @@ -86,6 +86,7 @@ static config_suite_t * config_suite_new(void) { config_suite_t *suite = tor_malloc_zero(sizeof(config_suite_t)); + suite->configs = smartlist_new(); return suite; } @@ -96,6 +97,7 @@ config_suite_free_(config_suite_t *suite) { if (!suite) return; + smartlist_free(suite->configs); tor_free(suite); } @@ -110,6 +112,11 @@ struct config_mgr_t { * contains. A subsequent commit will add more. XXXX) */ const config_format_t *toplevel; + /** + * List of second-level configuration format objects that this manager + * also knows about. + */ + smartlist_t *subconfigs; /** A smartlist of managed_var_t objects for all configuration formats. */ smartlist_t *all_vars; /** A smartlist of config_abbrev_t objects for all abbreviations. These @@ -137,12 +144,14 @@ config_mgr_t * config_mgr_new(const config_format_t *toplevel_fmt) { config_mgr_t *mgr = tor_malloc_zero(sizeof(config_mgr_t)); - mgr->toplevel = toplevel_fmt; + mgr->subconfigs = smartlist_new(); mgr->all_vars = smartlist_new(); mgr->all_abbrevs = smartlist_new(); mgr->all_deprecations = smartlist_new(); config_mgr_register_fmt(mgr, toplevel_fmt, IDX_TOPLEVEL); + mgr->toplevel = toplevel_fmt; + return mgr; } @@ -158,6 +167,14 @@ config_mgr_register_fmt(config_mgr_t *mgr, "Tried to add a format to a configuration manager after " "it had been frozen."); + if (object_idx != IDX_TOPLEVEL) { + tor_assertf(fmt->config_suite_offset < 0, + "Tried to register a toplevel format in a non-toplevel position"); + } + tor_assertf(fmt != mgr->toplevel && + ! smartlist_contains(mgr->subconfigs, fmt), + "Tried to register an already-registered format."); + /* register variables */ for (i = 0; fmt->vars[i].member.name; ++i) { managed_var_t *mv = tor_malloc_zero(sizeof(managed_var_t)); @@ -182,6 +199,21 @@ config_mgr_register_fmt(config_mgr_t *mgr, } } +/** + * Add a new format to this configuration object. Asserts on failure. + * + **/ +int +config_mgr_add_format(config_mgr_t *mgr, + const config_format_t *fmt) +{ + tor_assert(mgr); + int idx = smartlist_len(mgr->subconfigs); + config_mgr_register_fmt(mgr, fmt, idx); + smartlist_add(mgr->subconfigs, (void *)fmt); + return idx; +} + /** Return a pointer to the config_suite_t * pointer inside a * configuration object; returns NULL if there is no such member. */ static inline config_suite_t ** @@ -204,10 +236,19 @@ config_mgr_get_suite_ptr(const config_mgr_t *mgr, void *toplevel) static void * config_mgr_get_obj_mutable(const config_mgr_t *mgr, void *toplevel, int idx) { - (void)mgr; - tor_assert(idx == IDX_TOPLEVEL); // nothing else is implemented yet XXXX + tor_assert(mgr); tor_assert(toplevel); - return toplevel; + if (idx == IDX_TOPLEVEL) + return toplevel; + + tor_assertf(idx >= 0 && idx < smartlist_len(mgr->subconfigs), + "Index %d is out of range.", idx); + config_suite_t **suite = config_mgr_get_suite_ptr(mgr, toplevel); + tor_assert(suite); + tor_assert(smartlist_len(mgr->subconfigs) == + smartlist_len((*suite)->configs)); + + return smartlist_get((*suite)->configs, idx); } /** As config_mgr_get_obj_mutable(), but return a const pointer. */ @@ -257,6 +298,7 @@ config_mgr_free_(config_mgr_t *mgr) smartlist_free(mgr->all_vars); smartlist_free(mgr->all_abbrevs); smartlist_free(mgr->all_deprecations); + smartlist_free(mgr->subconfigs); memset(mgr, 0, sizeof(*mgr)); tor_free(mgr); } @@ -296,6 +338,20 @@ config_mgr_assert_magic_ok(const config_mgr_t *mgr, tor_assert(options); tor_assert(mgr->frozen); struct_check_magic(options, &mgr->toplevel_magic); + + config_suite_t **suitep = config_mgr_get_suite_ptr(mgr, (void*)options); + if (suitep == NULL) { + tor_assert(smartlist_len(mgr->subconfigs) == 0); + return; + } + + tor_assert(smartlist_len((*suitep)->configs) == + smartlist_len(mgr->subconfigs)); + SMARTLIST_FOREACH_BEGIN(mgr->subconfigs, const config_format_t *, fmt) { + void *obj = smartlist_get((*suitep)->configs, fmt_sl_idx); + tor_assert(obj); + struct_check_magic(obj, &fmt->magic); + } SMARTLIST_FOREACH_END(fmt); } /** Macro: assert that cfg has the right magic field for @@ -309,12 +365,16 @@ void * config_new(const config_mgr_t *mgr) { tor_assert(mgr->frozen); - const config_format_t *fmt = mgr->toplevel; - void *opts = tor_malloc_zero(fmt->size); + void *opts = tor_malloc_zero(mgr->toplevel->size); struct_set_magic(opts, &mgr->toplevel_magic); config_suite_t **suitep = config_mgr_get_suite_ptr(mgr, opts); if (suitep) { *suitep = config_suite_new(); + SMARTLIST_FOREACH_BEGIN(mgr->subconfigs, const config_format_t *, fmt) { + void *obj = tor_malloc_zero(fmt->size); + struct_set_magic(obj, &fmt->magic); + smartlist_add((*suitep)->configs, obj); + } SMARTLIST_FOREACH_END(fmt); } CONFIG_CHECK(mgr, opts); return opts; @@ -826,30 +886,41 @@ config_reset(const config_mgr_t *mgr, void *options, void config_free_(const config_mgr_t *mgr, void *options) { - const config_format_t *fmt = mgr->toplevel; - if (!options) return; - tor_assert(fmt); + tor_assert(mgr); if (mgr->toplevel->clear_fn) { mgr->toplevel->clear_fn(mgr, options); } + config_suite_t **suitep = config_mgr_get_suite_ptr(mgr, options); + if (suitep) { + tor_assert(smartlist_len((*suitep)->configs) == + smartlist_len(mgr->subconfigs)); + SMARTLIST_FOREACH_BEGIN(mgr->subconfigs, const config_format_t *, fmt) { + void *obj = smartlist_get((*suitep)->configs, fmt_sl_idx); + if (fmt->clear_fn) { + fmt->clear_fn(mgr, obj); + } + } SMARTLIST_FOREACH_END(fmt); + } SMARTLIST_FOREACH_BEGIN(mgr->all_vars, const managed_var_t *, mv) { config_clear(mgr, options, mv); } SMARTLIST_FOREACH_END(mv); - if (fmt->extra) { - config_line_t **linep = STRUCT_VAR_P(options, fmt->extra->offset); + if (mgr->toplevel->extra) { + config_line_t **linep = STRUCT_VAR_P(options, + mgr->toplevel->extra->offset); config_free_lines(*linep); *linep = NULL; } - config_suite_t **suitep = config_mgr_get_suite_ptr(mgr, options); - if (suitep) + if (suitep) { + SMARTLIST_FOREACH((*suitep)->configs, void *, obj, tor_free(obj)); config_suite_free(*suitep); + } tor_free(options); } diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index c18e85423..9125c0be3 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -76,6 +76,8 @@ typedef struct config_mgr_t config_mgr_t; config_mgr_t *config_mgr_new(const config_format_t *toplevel_fmt); void config_mgr_free_(config_mgr_t *mgr); +int config_mgr_add_format(config_mgr_t *mgr, + const config_format_t *fmt); void config_mgr_freeze(config_mgr_t *mgr); #define config_mgr_free(mgr) \ FREE_AND_NULL(config_mgr_t, config_mgr_free_, (mgr))

1 0