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

common: json_to_reply_path to helper to handle blindedpath/onion_message hook

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-09-22 06:47:31 +09:30
parent b8498b60f2
commit eaec226f99
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
common/json_helpers.c
View File

@@ -6,6 +6,7 @@
#include <common/type_to_string.h> #include <common/type_to_string.h>
#include <common/wireaddr.h> #include <common/wireaddr.h>
#include <errno.h> #include <errno.h>
#include <wire/onion_wire.h>
#include <wire/peer_wire.h> #include <wire/peer_wire.h>
bool json_to_bitcoin_amount(const char *buffer, const jsmntok_t *tok, bool json_to_bitcoin_amount(const char *buffer, const jsmntok_t *tok,
@@ -140,6 +141,42 @@ struct wally_psbt *json_to_psbt(const tal_t *ctx, const char *buffer,
return psbt_from_b64(ctx, buffer + tok->start, tok->end - tok->start); return psbt_from_b64(ctx, buffer + tok->start, tok->end - tok->start);
} }
struct tlv_onionmsg_payload_reply_path *
json_to_reply_path(const tal_t *ctx, const char *buffer, const jsmntok_t *tok)
{
struct tlv_onionmsg_payload_reply_path *rpath;
const jsmntok_t *hops, *t;
size_t i;
const char *err;
rpath = tal(ctx, struct tlv_onionmsg_payload_reply_path);
err = json_scan(tmpctx, buffer, tok, "{blinding:%,first_node_id:%}",
JSON_SCAN(json_to_pubkey, &rpath->blinding),
JSON_SCAN(json_to_pubkey, &rpath->first_node_id),
NULL);
if (err)
return tal_free(rpath);
hops = json_get_member(buffer, tok, "hops");
if (!hops || hops->size < 1)
return tal_free(rpath);
rpath->path = tal_arr(rpath, struct onionmsg_path *, hops->size);
json_for_each_arr(i, t, hops) {
rpath->path[i] = tal(rpath->path, struct onionmsg_path);
err = json_scan(tmpctx, buffer, t, "{id:%,enctlv:%}",
JSON_SCAN(json_to_pubkey,
&rpath->path[i]->node_id),
JSON_SCAN_TAL(rpath->path[i],
json_tok_bin_from_hex,
&rpath->path[i]->enctlv));
if (err)
return tal_free(rpath);
}
return rpath;
}
void json_add_node_id(struct json_stream *response, void json_add_node_id(struct json_stream *response,
const char *fieldname, const char *fieldname,
const struct node_id *id) const struct node_id *id)

4
common/json_helpers.h
View File

@@ -79,6 +79,10 @@ bool split_tok(const char *buffer, const jsmntok_t *tok,
jsmntok_t *a, jsmntok_t *a,
jsmntok_t *b); jsmntok_t *b);
/* Extract reply path from this JSON */
struct tlv_onionmsg_payload_reply_path *
json_to_reply_path(const tal_t *ctx, const char *buffer, const jsmntok_t *tok);
/* Helpers for outputting JSON results */ /* Helpers for outputting JSON results */
/* '"fieldname" : "0289abcdef..."' or "0289abcdef..." if fieldname is NULL */ /* '"fieldname" : "0289abcdef..."' or "0289abcdef..." if fieldname is NULL */