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

jsonrpc: Report standard JSON-RPC 2.0 error codes.

Browse Source
This commit is contained in:
ZmnSCPxj
2018-01-27 02:31:37 +00:00
committed by Christian Decker
parent e1d17e92e0
commit d03ca59f80
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lightningd/jsonrpc.c
View File

@@ -436,7 +436,9 @@ void json_add_address(struct json_result *response, const char *fieldname,
json_object_end(response);
}
#define JSONRPC2_INVALID_REQUEST -32600
#define JSONRPC2_INVALID_REQUEST -32600
#define JSONRPC2_METHOD_NOT_FOUND -32601
#define JSONRPC2_INVALID_PARAMS -32602
void command_success(struct command *cmd, struct json_result *result)
{
@@ -556,34 +558,41 @@ static void parse_request(struct json_connection *jcon, const jsmntok_t tok[])
tal_add_destructor(jcon->current, destroy_cmd);
if (!method || !params) {
command_fail(jcon->current, method ? "No params" : "No method");
command_fail_detailed(jcon->current,
JSONRPC2_INVALID_REQUEST, NULL,
method ? "No params" : "No method");
return;
}
if (method->type != JSMN_STRING) {
command_fail(jcon->current, "Expected string for method");
command_fail_detailed(jcon->current,
JSONRPC2_INVALID_REQUEST, NULL,
"Expected string for method");
return;
}
cmd = find_cmd(jcon->buffer, method);
if (!cmd) {
command_fail(jcon->current,
"Unknown command '%.*s'",
(int)(method->end - method->start),
jcon->buffer + method->start);
command_fail_detailed(jcon->current,
JSONRPC2_METHOD_NOT_FOUND, NULL,
"Unknown command '%.*s'",
(int)(method->end - method->start),
jcon->buffer + method->start);
return;
}
if (cmd->deprecated && !deprecated_apis) {
command_fail(jcon->current,
"command '%.*s' is deprecated",
(int)(method->end - method->start),
jcon->buffer + method->start);
command_fail_detailed(jcon->current,
JSONRPC2_METHOD_NOT_FOUND, NULL,
"command '%.*s' is deprecated",
(int)(method->end - method->start),
jcon->buffer + method->start);
return;
}
if (params->type != JSMN_ARRAY && params->type != JSMN_OBJECT) {
command_fail(jcon->current,
"Expected array or object for params");
command_fail_detailed(jcon->current,
JSONRPC2_INVALID_PARAMS, NULL,
"Expected array or object for params");
return;
}