aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 23:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

plugins: libplugin don't insist on 'jsonrpc' field from lightningd.

Browse Source 
Spark does this, for example:

{"method":"pay","params":["lnbc..."],"id":22}

Which doesn't have a jsonrpc field.  The result is that the command
doesn't terminate, there is nothing in the logs, stderr contains
"pay: JSON-RPC message does not contain "jsonrpc" field", and
from then on "Unknown command 'pay'".

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-02-13 09:47:08 +10:30
parent ff968e7730
commit 7a178ebb7a
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/libplugin.c
View File

@@ -637,7 +637,8 @@ static bool rpc_read_response_one(struct plugin *plugin)
jrtok = json_get_member(plugin->rpc_buffer, toks, "jsonrpc"); jrtok = json_get_member(plugin->rpc_buffer, toks, "jsonrpc");
if (!jrtok) { if (!jrtok) {
plugin_err(plugin, "JSON-RPC message does not contain \"jsonrpc\" field"); plugin_err(plugin, "JSON-RPC message does not contain \"jsonrpc\" field: '%.*s'",
(int)plugin->rpc_used, plugin->rpc_buffer);
return false; return false;
} }
@@ -981,7 +982,7 @@ static void ld_command_handle(struct plugin *plugin,
static bool ld_read_json_one(struct plugin *plugin) static bool ld_read_json_one(struct plugin *plugin)
{ {
bool valid; bool valid;
const jsmntok_t *toks, *jrtok; const jsmntok_t *toks;
struct command *cmd = tal(plugin, struct command); struct command *cmd = tal(plugin, struct command);
/* FIXME: This could be done more efficiently by storing the /* FIXME: This could be done more efficiently by storing the
@@ -1005,12 +1006,8 @@ static bool ld_read_json_one(struct plugin *plugin)
return false; return false;
} }
jrtok = json_get_member(plugin->buffer, toks, "jsonrpc"); /* FIXME: Spark doesn't create proper jsonrpc 2.0! So we don't
if (!jrtok) { * check for "jsonrpc" here. */
plugin_err(plugin, "JSON-RPC message does not contain \"jsonrpc\" field");
return false;
}
ld_command_handle(plugin, cmd, toks); ld_command_handle(plugin, cmd, toks);
/* Move this object out of the buffer */ /* Move this object out of the buffer */