mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 18:11:28 +01:00
Code Issues Projects Releases Wiki Activity

Plugins: accept options of different types

Browse Source 
A new struct containing the plugin options value as different types is created and appended to the plugin_option structure
This commit is contained in:
darosior 2019-05-25 18:12:28 +02:00 committed by Rusty Russell
parent fba050e891
commit a6753fd812
1 changed files with 56 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
lightningd/plugin.c
View File

@ -81,11 +81,22 @@ struct plugins {
struct lightningd *ld; struct lightningd *ld;
}; };
/* The value of a plugin option, which can have different types.
* The presence of the integer and boolean values will depend of
* the option type, but the string value will always be filled.
*/
struct plugin_opt_value {
char *as_str;
int *as_int;
bool *as_bool;
};
struct plugin_opt { struct plugin_opt {
struct list_node list; struct list_node list;
const char *name; const char *name;
const char *type;
const char *description; const char *description;
char *value; struct plugin_opt_value *value;
}; };
struct plugins *plugins_new(const tal_t *ctx, struct log_book *log_book, struct plugins *plugins_new(const tal_t *ctx, struct log_book *log_book,
@ -467,8 +478,13 @@ static struct io_plan *plugin_stdout_conn_init(struct io_conn *conn,
char *plugin_opt_set(const char *arg, struct plugin_opt *popt) char *plugin_opt_set(const char *arg, struct plugin_opt *popt)
{ {
tal_free(popt->value); tal_free(popt->value->as_str);
popt->value = tal_strdup(popt, arg); popt->value->as_str = tal_strdup(popt, arg);
if (streq(popt->type, "int"))
*popt->value->as_int = atoi(arg);
else if (streq(popt->type, "bool"))
*popt->value->as_bool = streq(arg, "true") || streq(arg, "True")
|| streq(arg, "1");
return NULL; return NULL;
} }
@ -490,29 +506,46 @@ static bool plugin_opt_add(struct plugin *plugin, const char *buffer,
return false; return false;
} }
/* FIXME(cdecker) Support numeric and boolean options as well */
if (!json_tok_streq(buffer, typetok, "string")) {
plugin_kill(plugin,
"Only \"string\" options currently supported");
return false;
}
popt = tal(plugin, struct plugin_opt); popt = tal(plugin, struct plugin_opt);
popt->value = talz(popt, struct plugin_opt_value);
popt->name = tal_fmt(plugin, "--%.*s", nametok->end - nametok->start, popt->name = tal_fmt(plugin, "--%.*s", nametok->end - nametok->start,
buffer + nametok->start); buffer + nametok->start);
popt->value = NULL; if (json_tok_streq(buffer, typetok, "string")) {
popt->type = "string";
if (defaulttok) { if (defaulttok) {
popt->value = json_strdup(popt, buffer, defaulttok); popt->value->as_str = json_strdup(popt, buffer, defaulttok);
popt->description = tal_fmt( popt->description = tal_fmt(
popt, "%.*s (default: %s)", desctok->end - desctok->start, popt, "%.*s (default: %s)", desctok->end - desctok->start,
buffer + desctok->start, popt->value); buffer + desctok->start, popt->value->as_str);
} else {
popt->description = json_strdup(popt, buffer, desctok);
} }
} else if (json_tok_streq(buffer, typetok, "int")) {
popt->type = "int";
popt->value->as_int = talz(popt->value, int);
if (defaulttok) {
json_to_int(buffer, defaulttok, popt->value->as_int);
popt->value->as_str = tal_fmt(popt->value, "%d", *popt->value->as_int);
popt->description = tal_fmt(
popt, "%.*s (default: %i)", desctok->end - desctok->start,
buffer + desctok->start, *popt->value->as_int);
}
} else if (json_tok_streq(buffer, typetok, "bool")) {
popt->type = "bool";
popt->value->as_bool = talz(popt->value, bool);
if (defaulttok) {
json_to_bool(buffer, defaulttok, popt->value->as_bool);
popt->value->as_str = tal_fmt(popt->value, *popt->value->as_bool ? "true" : "false");
popt->description = tal_fmt(
popt, "%.*s (default: %s)", desctok->end - desctok->start,
buffer + desctok->start, *popt->value->as_bool ? "true" : "false");
}
} else {
plugin_kill(plugin, "Only \"string\", \"int\", and \"bool\" options are supported");
return false;
}
if (!defaulttok)
popt->description = json_strdup(popt, buffer, desctok);
list_add_tail(&plugin->plugin_opts, &popt->list); list_add_tail(&plugin->plugin_opts, &popt->list);
opt_register_arg(popt->name, plugin_opt_set, NULL, popt, opt_register_arg(popt->name, plugin_opt_set, NULL, popt,
popt->description); popt->description);
return true; return true;
@ -974,7 +1007,6 @@ void plugins_init(struct plugins *plugins, const char *dev_plugin_debug)
} }
tal_free(cmd); tal_free(cmd);
} }
while (plugins->pending_manifests > 0) { while (plugins->pending_manifests > 0) {
void *v = io_loop(&plugins->timers, &expired); void *v = io_loop(&plugins->timers, &expired);
if (v == plugins) if (v == plugins)
@ -1009,8 +1041,9 @@ static void plugin_config(struct plugin *plugin)
list_for_each(&plugin->plugin_opts, opt, list) { list_for_each(&plugin->plugin_opts, opt, list) {
/* Trim the `--` that we added before */ /* Trim the `--` that we added before */
name = opt->name + 2; name = opt->name + 2;
if (opt->value) if (opt->value->as_str) {
json_add_string(req->stream, name, opt->value); json_add_string(req->stream, name, opt->value->as_str);
}
} }
json_object_end(req->stream); /* end of .params.options */ json_object_end(req->stream); /* end of .params.options */