diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2021-05-14 14:07:42 -0700 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2021-05-14 17:25:42 -0700 |
| commit | 5dba69086d33480047969146200f489f05ccf307 (patch) | |
| tree | 078c1ce7a5b82b139990dee2411990ddccddc82e /src/main.c | |
| parent | 31ce1e9a5bd92b15a811c8b7450f01a7b36075f7 (diff) | |
| download | bluez-5dba69086d33480047969146200f489f05ccf307.tar.gz | |
main.conf: Add option to enable experimental features
The adds options Experimental which is the equivalent to
-E/--experimental command line option.
Fixes https://github.com/bluez/bluez/issues/132
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c index 94141b1e4..37ed4568b 100644 --- a/src/main.c +++ b/src/main.c @@ -715,6 +715,13 @@ static void parse_config(GKeyFile *config) else btd_opts.refresh_discovery = boolean; + boolean = g_key_file_get_boolean(config, "General", + "Experimental", &err); + if (err) + g_clear_error(&err); + else + btd_opts.experimental = boolean; + str = g_key_file_get_string(config, "GATT", "Cache", &err); if (err) { DBG("%s", err->message); @@ -813,6 +820,7 @@ static void init_defaults(void) btd_opts.name_resolv = TRUE; btd_opts.debug_keys = FALSE; btd_opts.refresh_discovery = TRUE; + btd_opts.experimental = false; btd_opts.defaults.num_entries = 0; btd_opts.defaults.br.page_scan_type = 0xFFFF; @@ -892,7 +900,6 @@ static char *option_configfile = NULL; static gboolean option_compat = FALSE; static gboolean option_detach = TRUE; static gboolean option_version = FALSE; -static gboolean option_experimental = FALSE; static void free_options(void) { @@ -976,7 +983,7 @@ static GOptionEntry options[] = { "Specify an explicit path to the config file", "FILE"}, { "compat", 'C', 0, G_OPTION_ARG_NONE, &option_compat, "Provide deprecated command line interfaces" }, - { "experimental", 'E', 0, G_OPTION_ARG_NONE, &option_experimental, + { "experimental", 'E', 0, G_OPTION_ARG_NONE, &btd_opts.experimental, "Enable experimental interfaces" }, { "nodetach", 'n', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &option_detach, @@ -1043,7 +1050,7 @@ int main(int argc, char *argv[]) exit(1); } - if (option_experimental) + if (btd_opts.experimental) gdbus_flags = G_DBUS_FLAG_ENABLE_EXPERIMENTAL; g_dbus_set_flags(gdbus_flags); |