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

[metrics-lib/release] Fix leaking resource in TorperfResultImpl.java
by karsten＠torproject.org 11 Sep '19

11 Sep '19

commit 114f548674d8586453577f2a16ad6b39b1714118 Author: fava <fava(a)libertymail.net> Date: Thu Aug 29 06:52:16 2019 +0000 Fix leaking resource in TorperfResultImpl.java Fix leaking resource in TorperfResultImpl.java using try-with-resource statement. This fix is related to analysis on metrics-lib using sonarqube Implements part of #30544 Signed-off-by: fava <fava(a)libertymail.net> --- .../descriptor/impl/TorperfResultImpl.java | 45 ++++++++++++---------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java index 4eb00ac..83e9491 100644 --- a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -30,28 +30,31 @@ public class TorperfResultImpl extends DescriptorImpl List<Descriptor> parsedDescriptors = new ArrayList<>(); String descriptorString = new String(rawDescriptorBytes, StandardCharsets.UTF_8); - Scanner scanner = new Scanner(descriptorString).useDelimiter("\r?\n"); - String typeAnnotation = ""; - while (scanner.hasNext()) { - String line = scanner.next(); - if (line.startsWith("@type torperf ")) { - String[] parts = line.split(" "); - if (parts.length != 3) { - throw new DescriptorParseException("Illegal line '" + line - + "'."); - } - String version = parts[2]; - if (!version.startsWith("1.")) { - throw new DescriptorParseException("Unsupported version in " - + " line '" + line + "'."); + try (Scanner scanner = + new Scanner(descriptorString).useDelimiter("\r?\n")) { + String typeAnnotation = ""; + while (scanner.hasNext()) { + String line = scanner.next(); + if (line.startsWith("@type torperf ")) { + String[] parts = line.split(" "); + if (parts.length != 3) { + throw new DescriptorParseException("Illegal line '" + line + + "'."); + } + String version = parts[2]; + if (!version.startsWith("1.")) { + throw new DescriptorParseException("Unsupported version in " + + " line '" + line + "'."); + } + typeAnnotation = line + "\n"; + } else { + /* XXX21932 */ + parsedDescriptors.add(new TorperfResultImpl( + (typeAnnotation + line + "\n") + .getBytes(StandardCharsets.UTF_8), + descriptorFile)); + typeAnnotation = ""; } - typeAnnotation = line + "\n"; - } else { - /* XXX21932 */ - parsedDescriptors.add(new TorperfResultImpl( - (typeAnnotation + line + "\n").getBytes(StandardCharsets.UTF_8), - descriptorFile)); - typeAnnotation = ""; } } return parsedDescriptors;

1 0

[metrics-lib/master] Prepare for 2.7.0 release.
by karsten＠torproject.org 11 Sep '19

11 Sep '19

commit 0520779255dc44d30a69a25f24f5a638ae870a6e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 6 08:53:14 2019 +0200 Prepare for 2.7.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fdc45b..457533e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 2.7.0 - 2019-0?-?? +# Changes in version 2.7.0 - 2019-09-06 * Medium changes - Use Ivy for resolving external dependencies rather than relying diff --git a/build.xml b/build.xml index f319cf0..04f79fd 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.6.2-dev" /> + <property name="release.version" value="2.7.0" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[tor/master] config: Invert sense of _is_invisible, and rename to is_listable()
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 16cf9424c1480aea2443f6995d1056e8f04ba5e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 11:48:25 2019 -0400 config: Invert sense of _is_invisible, and rename to is_listable() --- src/app/config/config.c | 2 +- src/app/config/confparse.c | 10 ++++++++-- src/app/config/confparse.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 0cbc223d0..9c93198a4 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -8128,7 +8128,7 @@ getinfo_helper_config(control_connection_t *conn, smartlist_t *vars = config_mgr_list_vars(get_options_mgr()); SMARTLIST_FOREACH_BEGIN(vars, const config_var_t *, var) { /* don't tell controller about invisible options */ - if (config_var_is_invisible(var)) + if (! config_var_is_listable(var)) continue; const char *type = struct_var_get_typename(&var->member); if (!type) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 633fc4f8b..3d3f4e1bb 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -534,11 +534,17 @@ config_var_is_contained(const config_var_t *var) { return struct_var_is_contained(&var->member); } + +/** + * Return true iff variable var should appear on list of variables + * given to the controller or the CLI. + **/ bool -config_var_is_invisible(const config_var_t *var) +config_var_is_listable(const config_var_t *var) { - return (var->flags & CVFLAG_INVISIBLE) != 0; + return (var->flags & CVFLAG_INVISIBLE) == 0; } + bool config_var_is_dumpable(const config_var_t *var) { diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index 7edbbe3c0..b4c32bf1b 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -191,7 +191,7 @@ void warn_deprecated_option(const char *what, const char *why); bool config_var_is_settable(const config_var_t *var); bool config_var_is_contained(const config_var_t *var); -bool config_var_is_invisible(const config_var_t *var); +bool config_var_is_listable(const config_var_t *var); bool config_var_is_dumpable(const config_var_t *var); /* Helper macros to compare an option across two configuration objects */

1 0

[tor/master] config: rename "contained" to "derived", and explain it better.
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 8d685aee7c89bc0118a4550c1bb5a3c82dfb4c4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 11:48:32 2019 -0400 config: rename "contained" to "derived", and explain it better. Don't use "derived" directly, but check its implications for listing and copying. --- src/app/config/confparse.c | 54 +++++++++++++++++++++++++++++++++++++++------- src/app/config/confparse.h | 1 - 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 1923a0c1e..361500466 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -551,13 +551,52 @@ config_var_is_gettable(const config_var_t *var) return true; } -bool -config_var_is_contained(const config_var_t *var) +/** + * Return true iff this is variable is "derived" from another -- that is, + * inspecting this variable inspects part of another, and changing this + * variable changes part of another. + * + * Derived variables require special handling in several ways: they do not + * need to be copied independently when we are copying a config object, since + * copying the variable they are derived from copies them too. Similarly, + * they do not need to be compared independently when listing changes, since + * comparing the variable that they are derived from compares them too. + **/ +static bool +config_var_is_derived(const config_var_t *var) { return struct_var_is_contained(&var->member); } /** + * Return true iff we need to check var for changes when we are + * comparing config options for changes. + * + * A false result might mean that the variable is a derived variable, and that + * comparing the variable it derives from compares this one too-- or it might + * mean that there is no data to compare. + **/ +static bool +config_var_should_list_changes(const config_var_t *var) +{ + return ! config_var_is_derived(var); +} + +/** + * Return true iff we need to copy the data for var when we are + * copying a config option. + * + * A false option might mean that the variable is a derived variable, and that + * copying the variable it derives from copies it-- or it might mean that + * there is no data to copy. + **/ +static bool +config_var_needs_copy(const config_var_t *var) +{ + return ! config_var_is_derived(var); +} + +/**h * Return true iff variable var should appear on list of variables * given to the controller or the CLI. **/ @@ -578,6 +617,9 @@ config_var_is_listable(const config_var_t *var) bool config_var_is_dumpable(const config_var_t *var) { + if (config_var_is_derived(var)) { + return false; + } return (var->flags & CVFLAG_NODUMP) == 0; } @@ -1037,7 +1079,7 @@ config_get_changes(const config_mgr_t *mgr, config_line_t *result = NULL; config_line_t **next = &result; SMARTLIST_FOREACH_BEGIN(mgr->all_vars, managed_var_t *, mv) { - if (config_var_is_contained(mv->cvar)) { + if (! config_var_should_list_changes(mv->cvar)) { /* something else will check this var, or it doesn't need checking */ continue; } @@ -1073,7 +1115,7 @@ config_dup(const config_mgr_t *mgr, const void *old) newopts = config_new(mgr); SMARTLIST_FOREACH_BEGIN(mgr->all_vars, managed_var_t *, mv) { - if (config_var_is_contained(mv->cvar)) { + if (! config_var_needs_copy(mv->cvar)) { // Something else will copy this option, or it doesn't need copying. continue; } @@ -1140,10 +1182,6 @@ config_dump(const config_mgr_t *mgr, const void *default_options, elements = smartlist_new(); SMARTLIST_FOREACH_BEGIN(mgr->all_vars, managed_var_t *, mv) { int comment_option = 0; - if (config_var_is_contained(mv->cvar)) { - // Something else will dump this option, or it doesn't need dumping. - continue; - } /* Don't save 'hidden' control variables. */ if (! config_var_is_dumpable(mv->cvar)) continue; diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index b4c32bf1b..b5d0eb3ba 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -190,7 +190,6 @@ const char *config_expand_abbrev(const config_mgr_t *mgr, void warn_deprecated_option(const char *what, const char *why); bool config_var_is_settable(const config_var_t *var); -bool config_var_is_contained(const config_var_t *var); bool config_var_is_listable(const config_var_t *var); bool config_var_is_dumpable(const config_var_t *var);

1 0

[tor/master] config: replace config_var_is_cumulative with is_replaced_on_set()
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 22e7d33735805799a31949a58f64ce634e47477f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 11:48:23 2019 -0400 config: replace config_var_is_cumulative with is_replaced_on_set() This change replaces the higher-level property check to match our intended flag factoring. --- src/app/config/confparse.c | 17 ++++++++++++----- src/app/config/confparse.h | 1 - 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 0e941bab6..633fc4f8b 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -511,11 +511,17 @@ config_count_options(const config_mgr_t *mgr) return smartlist_len(mgr->all_vars); } -bool -config_var_is_cumulative(const config_var_t *var) +/** + * Return true if assigning a value to var replaces the previous + * value. Return false if assigning a value to var appends + * to the previous value. + **/ +static bool +config_var_is_replaced_on_set(const config_var_t *var) { - return struct_var_is_cumulative(&var->member); + return ! struct_var_is_cumulative(&var->member); } + bool config_var_is_settable(const config_var_t *var) { @@ -650,7 +656,8 @@ config_assign_line(const config_mgr_t *mgr, void *options, if (!strlen(c->value)) { /* reset or clear it, then return */ if (!clear_first) { - if (config_var_is_cumulative(cvar) && c->command != CONFIG_LINE_CLEAR) { + if (! config_var_is_replaced_on_set(cvar) && + c->command != CONFIG_LINE_CLEAR) { /* We got an empty linelist from the torrc or command line. As a special case, call this an error. Warn and ignore. */ log_warn(LD_CONFIG, @@ -671,7 +678,7 @@ config_assign_line(const config_mgr_t *mgr, void *options, // LCOV_EXCL_STOP } - if (options_seen && ! config_var_is_cumulative(cvar)) { + if (options_seen && config_var_is_replaced_on_set(cvar)) { /* We're tracking which options we've seen, and this option is not * supposed to occur more than once. */ tor_assert(var_index >= 0); diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index 6a7a56727..7edbbe3c0 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -189,7 +189,6 @@ const char *config_expand_abbrev(const config_mgr_t *mgr, int command_line, int warn_obsolete); void warn_deprecated_option(const char *what, const char *why); -bool config_var_is_cumulative(const config_var_t *var); bool config_var_is_settable(const config_var_t *var); bool config_var_is_contained(const config_var_t *var); bool config_var_is_invisible(const config_var_t *var);

1 0

[tor/master] Document config_var_is_dumpable and config_var_is_settable.
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 3bf38ffff5fc4a6af34d576962ca74080bbd5d87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 11:48:27 2019 -0400 Document config_var_is_dumpable and config_var_is_settable. --- src/app/config/confparse.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 3d3f4e1bb..3341ee784 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -522,6 +522,10 @@ config_var_is_replaced_on_set(const config_var_t *var) return ! struct_var_is_cumulative(&var->member); } +/** + * Return true iff var may be assigned by name (e.g., via the + * CLI, the configuration files, or the controller API). + **/ bool config_var_is_settable(const config_var_t *var) { @@ -529,6 +533,7 @@ config_var_is_settable(const config_var_t *var) return false; return struct_var_is_settable(&var->member); } + bool config_var_is_contained(const config_var_t *var) { @@ -545,6 +550,14 @@ config_var_is_listable(const config_var_t *var) return (var->flags & CVFLAG_INVISIBLE) == 0; } +/** + * Return true iff variable var should be written out when we + * are writing our configuration to disk, to a controller, or via the + * --dump-config command. + * + * This option may be set because a variable is hidden, or because it is + * derived from another variable which will already be written out. + **/ bool config_var_is_dumpable(const config_var_t *var) {

1 0

[tor/master] config: Introduce the concept of an "ungettable" variable.
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 668e3a77090b031bec8254dfc6d816f5f4add54d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 11:48:29 2019 -0400 config: Introduce the concept of an "ungettable" variable. We had though to make all obsolete and invisible variables ungettable, so that GETCONF would reject them. But it turns out that this isn't the current behavior of GETCONF with those variables. So for now, I'm leaving the current behavior unchanged. (See ticket 31647 for a proposal to change the behavior.) --- src/app/config/confparse.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/app/config/confparse.c b/src/app/config/confparse.c index 3341ee784..1923a0c1e 100644 --- a/src/app/config/confparse.c +++ b/src/app/config/confparse.c @@ -534,6 +534,23 @@ config_var_is_settable(const config_var_t *var) return struct_var_is_settable(&var->member); } +/** + * Return true iff the controller is allowed to fetch the value of + * var. + **/ +static bool +config_var_is_gettable(const config_var_t *var) +{ + /* Arguably, invisible or obsolete options should not be gettable. However, + * they have been gettable for a long time, and making them ungettable could + * have compatibility effects. For now, let's leave them alone. + */ + + // return (var->flags & (CVFLAG_OBSOLETE|CFGLAGS_INVISIBLE)) == 0; + (void)var; + return true; +} + bool config_var_is_contained(const config_var_t *var) { @@ -776,6 +793,11 @@ config_get_assigned_option(const config_mgr_t *mgr, const void *options, log_warn(LD_CONFIG, "Unknown option '%s'. Failing.", key); return NULL; } + if (! config_var_is_gettable(var->cvar)) { + log_warn(LD_CONFIG, "Option '%s' is obsolete or unfetchable. Failing.", + key); + return NULL; + } const void *object = config_mgr_get_obj(mgr, options, var->object_idx); result = struct_var_kvencode(object, &var->cvar->member);

1 0

[tor/master] struct_var: refactor struct_var_is*() functions to delegate
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 4f6b592691b0057dca55ce92beefc6b7e671a4ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 11:48:36 2019 -0400 struct_var: refactor struct_var_is*() functions to delegate Previously they checked the individual flags inside var_type_def_t; now they call the appropriate var_type_is_*() functions. (These functions will be removed entirely by the end of this branch.) --- src/lib/confmgt/structvar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c index 32f616c21..6b725f613 100644 --- a/src/lib/confmgt/structvar.c +++ b/src/lib/confmgt/structvar.c @@ -243,7 +243,7 @@ struct_var_is_cumulative(const struct_member_t *member) { const var_type_def_t *def = get_type_def(member); - return def ? def->is_cumulative : false; + return def ? var_type_is_cumulative(def) : false; } bool @@ -251,7 +251,7 @@ struct_var_is_settable(const struct_member_t *member) { const var_type_def_t *def = get_type_def(member); - return def ? !def->is_unsettable : true; + return def ? var_type_is_settable(def) : true; } bool @@ -259,5 +259,5 @@ struct_var_is_contained(const struct_member_t *member) { const var_type_def_t *def = get_type_def(member); - return def ? def->is_contained : false; + return def ? var_type_is_contained(def) : false; }

1 0

[tor/master] Move VTFLAG_* declarations to conftypes.h
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit c650ab8061202cdccb5361b4bf9c53836c46d03a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 11:48:40 2019 -0400 Move VTFLAG_* declarations to conftypes.h --- src/lib/conf/conftypes.h | 19 +++++++++++++++++++ src/lib/confmgt/var_type_def_st.h | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index 4609564b3..6d1ce967a 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -149,6 +149,25 @@ typedef struct struct_magic_decl_t { **/ #define CVFLAG_INVISIBLE (1u<<2) +/** + * Flag for var_type_def_t. + * Set iff a variable of this type can never be set directly by name. + **/ +#define VTFLAG_UNSETTABLE (1u<<0) +/** + * Flag for var_type_def_t. + * Set iff a variable of this type is always contained in another + * variable, and as such doesn't need to be dumped or copied + * independently. + **/ +#define VTFLAG_CONTAINED (1u<<1) +/** + * Flag for var_type_def_t. + * Set iff a variable of this type can be set more than once without + * destroying older values. Such variables should implement "mark_fragile". + */ +#define VTFLAG_CUMULATIVE (1u<<2) + /** A variable allowed in the configuration file or on the command line. */ typedef struct config_var_t { struct_member_t member; /** A struct member corresponding to this diff --git a/src/lib/confmgt/var_type_def_st.h b/src/lib/confmgt/var_type_def_st.h index 5eb97cff1..f1131ff11 100644 --- a/src/lib/confmgt/var_type_def_st.h +++ b/src/lib/confmgt/var_type_def_st.h @@ -134,25 +134,6 @@ struct var_type_fns_t { }; /** - * Flag for var_type_def_t. - * Set iff a variable of this type can never be set directly by name. - **/ -#define VTFLAG_UNSETTABLE (1u<<0) -/** - * Flag for var_type_def_t. - * Set iff a variable of this type is always contained in another - * variable, and as such doesn't need to be dumped or copied - * independently. - **/ -#define VTFLAG_CONTAINED (1u<<1) -/** - * Flag for var_type_def_t. - * Set iff a variable of this type can be set more than once without - * destroying older values. Such variables should implement "mark_fragile". - */ -#define VTFLAG_CUMULATIVE (1u<<2) - -/** * A structure describing a type that can be manipulated with the typedvar_* * functions. **/

1 0

[tor/master] typed_var: Make flags into an unsigned OR of bits.
by dgoulet＠torproject.org 11 Sep '19

11 Sep '19

commit 03e41830433268650bd9ba7184a5c2a0f80df8e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 5 11:48:38 2019 -0400 typed_var: Make flags into an unsigned OR of bits. Using a bitfield here will enable us to unify the var_type_def_t flags with the config_var_t flags. (This commit does not yet do that unification, and does not yet rename or refactor any flags. It only changes booleans into bits.) --- src/lib/confmgt/type_defs.c | 11 ++++------- src/lib/confmgt/typedvar.c | 6 +++--- src/lib/confmgt/var_type_def_st.h | 35 ++++++++++++++++++++++++----------- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/src/lib/confmgt/type_defs.c b/src/lib/confmgt/type_defs.c index f8b2681aa..e311319c0 100644 --- a/src/lib/confmgt/type_defs.c +++ b/src/lib/confmgt/type_defs.c @@ -725,16 +725,13 @@ static const var_type_def_t type_definitions_table[] = { [CONFIG_TYPE_CSV_INTERVAL] = { .name="TimeInterval", .fns=&legacy_csv_interval_fns, }, [CONFIG_TYPE_LINELIST] = { .name="LineList", .fns=&linelist_fns, - .is_cumulative=true}, + .flags=VTFLAG_CUMULATIVE }, [CONFIG_TYPE_LINELIST_S] = { .name="Dependent", .fns=&linelist_s_fns, - .is_cumulative=true, - .is_contained=true, }, + .flags=VTFLAG_CUMULATIVE|VTFLAG_CONTAINED }, [CONFIG_TYPE_LINELIST_V] = { .name="Virtual", .fns=&linelist_v_fns, - .is_cumulative=true, - .is_unsettable=true }, + .flags=VTFLAG_CUMULATIVE|VTFLAG_UNSETTABLE }, [CONFIG_TYPE_OBSOLETE] = { .name="Obsolete", .fns=&ignore_fns, - .is_unsettable=true, - .is_contained=true, } + .flags=VTFLAG_CONTAINED|VTFLAG_UNSETTABLE } }; /** diff --git a/src/lib/confmgt/typedvar.c b/src/lib/confmgt/typedvar.c index 43040e1e0..751d15827 100644 --- a/src/lib/confmgt/typedvar.c +++ b/src/lib/confmgt/typedvar.c @@ -233,7 +233,7 @@ typed_var_mark_fragile(void *value, const var_type_def_t *def) bool var_type_is_cumulative(const var_type_def_t *def) { - return def->is_cumulative; + return (def->flags & VTFLAG_CUMULATIVE) != 0; } /** @@ -243,7 +243,7 @@ var_type_is_cumulative(const var_type_def_t *def) bool var_type_is_contained(const var_type_def_t *def) { - return def->is_contained; + return (def->flags & VTFLAG_CONTAINED) != 0; } /** @@ -252,5 +252,5 @@ var_type_is_contained(const var_type_def_t *def) bool var_type_is_settable(const var_type_def_t *def) { - return ! def->is_unsettable; + return (def->flags & VTFLAG_UNSETTABLE) == 0; } diff --git a/src/lib/confmgt/var_type_def_st.h b/src/lib/confmgt/var_type_def_st.h index 4157cb8ff..5eb97cff1 100644 --- a/src/lib/confmgt/var_type_def_st.h +++ b/src/lib/confmgt/var_type_def_st.h @@ -134,6 +134,25 @@ struct var_type_fns_t { }; /** + * Flag for var_type_def_t. + * Set iff a variable of this type can never be set directly by name. + **/ +#define VTFLAG_UNSETTABLE (1u<<0) +/** + * Flag for var_type_def_t. + * Set iff a variable of this type is always contained in another + * variable, and as such doesn't need to be dumped or copied + * independently. + **/ +#define VTFLAG_CONTAINED (1u<<1) +/** + * Flag for var_type_def_t. + * Set iff a variable of this type can be set more than once without + * destroying older values. Such variables should implement "mark_fragile". + */ +#define VTFLAG_CUMULATIVE (1u<<2) + +/** * A structure describing a type that can be manipulated with the typedvar_* * functions. **/ @@ -151,17 +170,11 @@ struct var_type_def_t { * calling the functions in this type's function table. */ const void *params; - - /** True iff a variable of this type can never be set directly by name. */ - bool is_unsettable; - /** True iff a variable of this type is always contained in another - * variable, and as such doesn't need to be dumped or copied - * independently. */ - bool is_contained; - /** True iff a variable of this type can be set more than once without - * destroying older values. Such variables should implement "mark_fragile". - */ - bool is_cumulative; + /** + * A bitwise OR of one or more VTFLAG_* values, describing properties + * for all values of this type. + **/ + uint32_t flags; }; #endif /* !defined(TOR_LIB_CONFMGT_VAR_TYPE_DEF_ST_H) */

1 0