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

jsonrpc: Internal: Support changing the error code internally.

Browse Source
This commit is contained in:
ZmnSCPxj 2018-01-27 01:39:46 +00:00 committed by Christian Decker
parent b2133e969f
commit 551dfedc4a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lightningd/jsonrpc.c
View File

@ -319,8 +319,11 @@ static const struct json_command *find_cmd(const char *buffer,
return NULL;
}
static void json_result(struct json_connection *jcon,
const char *id, const char *res, const char *err)
static void connection_result(struct json_connection *jcon,
const char *id,
const char *res,
const char *err,
int code)
{
struct json_output *out = tal(jcon, struct json_output);
if (err == NULL)
@ -332,8 +335,11 @@ static void json_result(struct json_connection *jcon,
else
out->json = tal_fmt(out,
"{ \"jsonrpc\": \"2.0\", "
" \"error\" : { \"code\" : -1, \"message\" : %s},"
" \"error\" : "
"{ \"code\" : %d,"
" \"message\" : %s},"
" \"id\" : %s }\n",
code,
err, id);
/* Queue for writing, and wake writer (and maybe reader). */
@ -416,6 +422,8 @@ void json_add_address(struct json_result *response, const char *fieldname,
json_object_end(response);
}
#define JSONRPC2_INVALID_REQUEST -32600
void command_success(struct command *cmd, struct json_result *result)
{
struct json_connection *jcon = cmd->jcon;
@ -427,7 +435,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);
connection_result(jcon, cmd->id, json_result_string(result), NULL, 0);
log_debug(jcon->log, "Success");
jcon->current = tal_free(cmd);
}
@ -459,7 +467,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);
connection_result(jcon, cmd->id, NULL, quote, -1);
jcon->current = tal_free(cmd);
}
@ -474,7 +482,8 @@ static void json_command_malformed(struct json_connection *jcon,
const char *id,
const char *error)
{
return json_result(jcon, id, NULL, error);
return connection_result(jcon, id, NULL, error,
JSONRPC2_INVALID_REQUEST);
}
static void parse_request(struct json_connection *jcon, const jsmntok_t tok[])