mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-15 20:09:18 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: Make sure plugins don't register the same option "name"

Browse source 
The extra entry in opt_table would never be called, leaving plugins
clueless why options keep defaulting.

Note that option registration outside startup does nothing.
Instead, dynamic plugins can use `plugin start [second_parameter]` to pass options.
This commit is contained in:
Simon Vrouwe 2022-06-20 10:52:37 +03:00 • committed by neil saitug
parent 7115611249
commit cdf12d06ba
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lightningd/plugin.c
View file

@ -886,10 +886,24 @@ char *plugin_opt_set(const char *arg, struct plugin_opt *popt)
return NULL;
}
/* Returns true if "name" was already registered and now overwritten. */
static bool plugin_opt_register(struct plugin_opt *popt)
{
bool was_registered = opt_unregister(popt->name);
if (streq(popt->type, "flag"))
opt_register_noarg(popt->name, plugin_opt_flag_set, popt,
popt->description);
else
opt_register_arg(popt->name, plugin_opt_set, NULL, popt,
popt->description);
return was_registered;
}
static void destroy_plugin_opt(struct plugin_opt *opt)
{
if (!opt_unregister(opt->name))
fatal("Could not unregister %s", opt->name);
/* does nothing when "name" registration replaced its double */
opt_unregister(opt->name);
list_del(&opt->list);
}
@ -978,13 +992,10 @@ static const char *plugin_opt_add(struct plugin *plugin, const char *buffer,
list_add_tail(&plugin->plugin_opts, &popt->list);
if (streq(popt->type, "flag"))
opt_register_noarg(popt->name, plugin_opt_flag_set, popt,
popt->description);
else
opt_register_arg(popt->name, plugin_opt_set, NULL, popt,
popt->description);
/* Command line options are parsed only during ld's startup and each "name"
* only once. Always registers to satisfy destructor */
if (plugin_opt_register(popt) && plugin->plugins->startup)
fatal("error starting plugin '%s': option name '%s' is already taken", plugin->cmd, popt->name);
tal_add_destructor(popt, destroy_plugin_opt);
return NULL;