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

lightningd: explicitly remember if JSON id was a string.

Browse Source 
This lets us use 'cmd->id' as an unquoted string (for building
new ids!).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-09-13 06:49:11 +09:30
parent ed3f700991
commit 8fcf880e0f
4 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lightningd/plugin.c
View File

@@ -1025,7 +1025,7 @@ static void json_stream_forward_change_id(struct json_stream *stream,
const jsmntok_t *toks,
const jsmntok_t *idtok,
const char *new_id,
bool add_quotes)
bool new_id_is_str)
{
/* We copy everything, but replace the id. Special care has to
* be taken when the id that is being replaced is a string. If
@@ -1033,12 +1033,16 @@ static void json_stream_forward_change_id(struct json_stream *stream,
* new_id into a string, or even worse, quote a string id
* twice. */
size_t offset = 0;
bool add_quotes = false;
if (idtok->type == JSMN_STRING) {
if (add_quotes)
if (new_id_is_str)
add_quotes = false;
else
offset = 1;
} else {
if (new_id_is_str)
add_quotes = true;
}
json_stream_append(stream, buffer + toks->start,
@@ -1063,7 +1067,7 @@ static void plugin_rpcmethod_cb(const char *buffer,
response = json_stream_raw_for_cmd(cmd);
json_stream_forward_change_id(response, buffer, toks, idtok, cmd->id,
false);
cmd->id_is_string);
json_stream_double_cr(response);
command_raw_complete(cmd, response);
@@ -1089,7 +1093,8 @@ static void plugin_notify_cb(const char *buffer,
json_add_tok(response, "method", methodtok, buffer);
json_stream_append(response, ",\"params\":", strlen(",\"params\":"));
json_stream_forward_change_id(response, buffer,
paramtoks, idtok, cmd->id, false);
paramtoks, idtok, cmd->id,
cmd->id_is_string);
json_object_end(response);
json_stream_double_cr(response);