mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 09:54:16 +01:00
Code Issues Projects Releases Wiki Activity

sphinx: Switching to new onion packet format

Browse Source
This commit is contained in:
Christian Decker 2017-04-29 19:35:56 +02:00
parent f700662a56
commit c32c17701a
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lightningd/channel/channel_wire.csv
View File

@ -81,7 +81,7 @@ channel_accepted_htlc,0,id,8
channel_accepted_htlc,0,amount_msat,4 channel_accepted_htlc,0,amount_msat,4
channel_accepted_htlc,0,cltv_expiry,4 channel_accepted_htlc,0,cltv_expiry,4
channel_accepted_htlc,0,payment_hash,32 channel_accepted_htlc,0,payment_hash,32
channel_accepted_htlc,0,next_onion,1254*u8 channel_accepted_htlc,0,next_onion,1366*u8
channel_accepted_htlc,0,forward,bool channel_accepted_htlc,0,forward,bool
channel_accepted_htlc,0,amt_to_forward,u64 channel_accepted_htlc,0,amt_to_forward,u64
channel_accepted_htlc,0,outgoing_cltv_value,u32 channel_accepted_htlc,0,outgoing_cltv_value,u32

1 # Shouldn't happen
81 channel_fulfilled_htlc,0,id,8
82 channel_fulfilled_htlc,0,payment_preimage,struct preimage
83 # This HTLC failed
84 channel_failed_htlc,9
85 channel_failed_htlc,0,id,8
86 channel_failed_htlc,0,len,2
87 channel_failed_htlc,0,reason,len*u8

39
lightningd/pay.c
View File

@ -5,11 +5,11 @@
#include <daemon/chaintopology.h> #include <daemon/chaintopology.h>
#include <daemon/jsonrpc.h> #include <daemon/jsonrpc.h>
#include <daemon/log.h> #include <daemon/log.h>
#include <daemon/sphinx.h>
#include <inttypes.h> #include <inttypes.h>
#include <lightningd/channel/gen_channel_wire.h> #include <lightningd/channel/gen_channel_wire.h>
#include <lightningd/lightningd.h> #include <lightningd/lightningd.h>
#include <lightningd/peer_control.h> #include <lightningd/peer_control.h>
#include <lightningd/sphinx.h>
#include <lightningd/subd.h> #include <lightningd/subd.h>
#include <sodium/randombytes.h> #include <sodium/randombytes.h>
@ -158,7 +158,7 @@ static void json_sendpay(struct command *cmd,
struct pay_command *pc; struct pay_command *pc;
const u8 *onion; const u8 *onion;
u8 sessionkey[32]; u8 sessionkey[32];
struct hoppayload *hoppayloads; struct hop_data *hop_data;
u64 amount, lastamount; u64 amount, lastamount;
struct onionpacket *packet; struct onionpacket *packet;
u8 *msg; u8 *msg;
@ -196,10 +196,9 @@ static void json_sendpay(struct command *cmd,
/* Switching to hop_data in the next commit, and it causes a /* Switching to hop_data in the next commit, and it causes a
* double free in peer_control otherwise */ * double free in peer_control otherwise */
hoppayloads = tal_arr(NULL, struct hoppayload, 0); hop_data = tal_arr(NULL, struct hop_data, 0);
for (t = routetok + 1; t < end; t = json_next(t)) { for (t = routetok + 1; t < end; t = json_next(t)) {
const jsmntok_t *amttok, *idtok, *delaytok, *chantok; const jsmntok_t *amttok, *idtok, *delaytok, *chantok;
/* Will populate into hop_data in the next commit */
struct short_channel_id scid; struct short_channel_id scid;
if (t->type != JSMN_OBJECT) { if (t->type != JSMN_OBJECT) {
@ -222,23 +221,23 @@ static void json_sendpay(struct command *cmd,
if (n_hops == 0) { if (n_hops == 0) {
/* What we will send */ /* What we will send */
if (!json_tok_u64(buffer, amttok, &amount)) { if (!json_tok_u64(buffer, amttok, &amount)) {
command_fail(cmd, "route %zu invalid msatoshi", n_hops); command_fail(cmd, "route %zu invalid msatoshi",
n_hops);
return; return;
} }
lastamount = amount; lastamount = amount;
} else{ } else {
/* What that hop will forward */ /* What that hop will forward */
tal_resize(&hoppayloads, n_hops); tal_resize(&hop_data, n_hops);
memset(&hoppayloads[n_hops-1], 0, sizeof(struct hoppayload)); if (!json_tok_u64(buffer, amttok, &lastamount)) {
if (!json_tok_u64(buffer, amttok, &hoppayloads[n_hops-1].amt_to_forward)) { command_fail(cmd, "route %zu invalid msatoshi",
command_fail(cmd, "route %zu invalid msatoshi", n_hops); n_hops);
return; return;
} }
lastamount = hoppayloads[n_hops-1].amt_to_forward; hop_data[n_hops - 1].amt_forward = lastamount;
} }
tal_resize(&ids, n_hops+1); tal_resize(&ids, n_hops+1);
memset(&ids[n_hops], 0, sizeof(ids[n_hops]));
if (!short_channel_id_from_str(buffer + chantok->start, if (!short_channel_id_from_str(buffer + chantok->start,
chantok->end - chantok->start, chantok->end - chantok->start,
&scid)) { &scid)) {
@ -257,9 +256,11 @@ static void json_sendpay(struct command *cmd,
} }
if (n_hops == 0) if (n_hops == 0)
first_delay = delay; first_delay = delay;
else else {
hoppayloads[n_hops-1].outgoing_cltv_value hop_data[n_hops-1].outgoing_cltv
= base_expiry + delay; = base_expiry + delay;
hop_data[n_hops-1].channel_id = scid;
}
n_hops++; n_hops++;
} }
@ -269,9 +270,11 @@ static void json_sendpay(struct command *cmd,
} }
/* Add payload for final hop */ /* Add payload for final hop */
tal_resize(&hoppayloads, n_hops); tal_resize(&hop_data, n_hops);
memset(&hoppayloads[n_hops-1], 0, sizeof(struct hoppayload)); /* Memset here since we need it in the onion creation but will
hoppayloads[n_hops-1].outgoing_cltv_value = base_expiry + delay; * shave it off immediately again */
memset(&hop_data[n_hops-1], 0, sizeof(struct hop_data));
hop_data[n_hops-1].outgoing_cltv = base_expiry + delay;
pc = find_pay_command(ld, &rhash); pc = find_pay_command(ld, &rhash);
if (pc) { if (pc) {
@ -327,7 +330,7 @@ static void json_sendpay(struct command *cmd,
randombytes_buf(&sessionkey, sizeof(sessionkey)); randombytes_buf(&sessionkey, sizeof(sessionkey));
/* Onion will carry us from first peer onwards. */ /* Onion will carry us from first peer onwards. */
packet = create_onionpacket(cmd, ids, hoppayloads, sessionkey, packet = create_onionpacket(cmd, ids, hop_data, sessionkey,
rhash.u.u8, sizeof(struct sha256)); rhash.u.u8, sizeof(struct sha256));
onion = serialize_onionpacket(cmd, packet); onion = serialize_onionpacket(cmd, packet);