aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-06 15:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

common/json_escaped: new type which explicitly notes a string is already JSON.

Browse Source 
Trivial to use as a string, but it still means you should be careful
around it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-03-26 10:38:15 +10:30
parent a077c3defb
commit d92579f627
12 changed files with 207 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lightningd/jsonrpc.c
View File

@@ -10,6 +10,7 @@
#include <ccan/str/hex/hex.h>
#include <ccan/tal/str/str.h>
#include <common/bech32.h>
#include <common/json_escaped.h>
#include <common/memleak.h>
#include <common/version.h>
#include <common/wireaddr.h>
@@ -201,10 +202,15 @@ static void json_help(struct command *cmd,
"HELP! Please contribute"
" a description for this"
" command!");
else
json_add_string_escape(response,
"verbose",
cmdlist[i]->verbose);
else {
struct json_escaped *esc;
esc = json_escape(NULL,
cmdlist[i]->verbose);
json_add_escaped_string(response,
"verbose",
take(esc));
}
goto done;
}
}
@@ -281,11 +287,10 @@ static void connection_complete_error(struct json_connection *jcon,
int code,
const struct json_result *data)
{
/* Use this to escape errmsg. */
struct json_result *errorres = new_json_result(tmpctx);
struct json_escaped *esc;
const char *data_str;
json_add_string_escape(errorres, NULL, errmsg);
esc = json_escape(tmpctx, errmsg);
if (data)
data_str = tal_fmt(tmpctx, ", \"data\" : %s",
json_result_string(data));
@@ -298,10 +303,10 @@ static void connection_complete_error(struct json_connection *jcon,
"{ \"jsonrpc\": \"2.0\", "
" \"error\" : "
"{ \"code\" : %d,"
" \"message\" : %s%s },"
" \"message\" : \"%s\"%s },"
" \"id\" : %s }\n",
code,
json_result_string(errorres),
esc->s,
data_str,
id)));
}