aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-04 14:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

jsonrpc: Accomodate some pedantic JSON-RPC impls

Browse Source 
The JSON-RPC was non-standard compliant in that it omitted the required
`jsonrpc` entry and it was returning both `error` as well as
`result`. This fixes both of these issues.
This commit is contained in:
Christian Decker
2016-10-23 15:12:05 +02:00
parent 144c40afd0
commit de187ecaf7
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
daemon/jsonrpc.c
View File

@@ -353,12 +353,18 @@ static void json_result(struct json_connection *jcon,
const char *id, const char *res, const char *err)
{
struct json_output *out = tal(jcon, struct json_output);
out->json = tal_fmt(out,
"{ \"result\" : %s,"
" \"error\" : %s,"
" \"id\" : %s }\n",
res, err, id);
if (err == NULL)
out->json = tal_fmt(out,
"{ \"jsonrpc\": \"2.0\", "
"\"result\" : %s,"
" \"id\" : %s }\n",
res, id);
else
out->json = tal_fmt(out,
"{ \"jsonrpc\": \"2.0\", "
" \"error\" : %s,"
" \"id\" : %s }\n",
err, id);
/* Queue for writing, and wake writer (and maybe reader). */
list_add_tail(&jcon->output, &out->list);
@@ -386,7 +392,7 @@ void command_success(struct command *cmd, struct json_result *result)
return;
}
assert(jcon->current == cmd);
json_result(jcon, cmd->id, json_result_string(result), "null");
json_result(jcon, cmd->id, json_result_string(result), NULL);
log_debug(jcon->log, "Success");
jcon->current = tal_free(cmd);
}
@@ -418,7 +424,7 @@ void command_fail(struct command *cmd, const char *fmt, ...)
quote = tal_fmt(cmd, "\"%s\"", error);
assert(jcon->current == cmd);
json_result(jcon, cmd->id, "null", quote);
json_result(jcon, cmd->id, NULL, quote);
jcon->current = tal_free(cmd);
}
@@ -426,7 +432,7 @@ static void json_command_malformed(struct json_connection *jcon,
const char *id,
const char *error)
{
return json_result(jcon, id, "null", error);
return json_result(jcon, id, NULL, error);
}
static void parse_request(struct json_connection *jcon, const jsmntok_t tok[])