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

lightningd: kill channeld if we added an HTLC and it didn't commit in 30 seconds.

Browse Source 
This effectively constrains how long we'll delay an outgoing HTLC.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-08-09 12:23:04 +09:30
committed by Christian Decker
parent ebd229fb37
commit 223cd97c94
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lightningd/channel.c
View File

@@ -178,6 +178,7 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
channel->peer = peer;
channel->dbid = dbid;
channel->error = NULL;
channel->htlc_timeout = NULL;
if (their_shachain)
channel->their_shachain = *their_shachain;
else {

3
lightningd/channel.h
View File

@@ -70,6 +70,9 @@ struct channel {
u64 msatoshi_to_us_min;
u64 msatoshi_to_us_max;
/* Timer we use in case they don't add an HTLC in a timely manner. */
struct oneshot *htlc_timeout;
/* Last tx they gave us. */
struct bitcoin_tx *last_tx;
secp256k1_ecdsa_signature last_sig;

22
lightningd/peer_htlcs.c
View File

@@ -8,6 +8,7 @@
#include <common/json_escaped.h>
#include <common/overflows.h>
#include <common/sphinx.h>
#include <common/timeout.h>
#include <gossipd/gen_gossip_wire.h>
#include <lightningd/chaintopology.h>
#include <lightningd/htlc_end.h>
@@ -405,6 +406,19 @@ static void rcvd_htlc_reply(struct subd *subd, const u8 *msg, const int *fds UNU
/* When channeld includes it in commitment, we'll make it persistent. */
}
static void htlc_offer_timeout(struct channel *channel)
{
/* If owner died, we should already be taken care of. */
if (!channel->owner || channel->state != CHANNELD_NORMAL)
return;
log_unusual(channel->owner->log,
"Adding HTLC too slow: killing channel");
tal_free(channel->owner);
channel_set_billboard(channel, false,
"Adding HTLC timed out: killed channel");
}
enum onion_type send_htlc_out(struct channel *out, u64 amount, u32 cltv,
const struct sha256 *payment_hash,
const u8 *onion_routing_packet,
@@ -431,6 +445,12 @@ enum onion_type send_htlc_out(struct channel *out, u64 amount, u32 cltv,
payment_hash, onion_routing_packet, in);
tal_add_destructor(hout, destroy_hout_subd_died);
/* We give it 30 seconds to commit htlc. */
if (!out->htlc_timeout)
out->htlc_timeout = new_reltimer(&out->peer->ld->timers,
out, time_from_sec(30),
htlc_offer_timeout,
out);
msg = towire_channel_offer_htlc(out, amount, cltv, payment_hash,
onion_routing_packet);
subd_req(out->peer->ld, out->owner, take(msg), -1, 0, rcvd_htlc_reply, hout);
@@ -1012,6 +1032,8 @@ void peer_sending_commitsig(struct channel *channel, const u8 *msg)
secp256k1_ecdsa_signature *htlc_sigs;
struct lightningd *ld = channel->peer->ld;
channel->htlc_timeout = tal_free(channel->htlc_timeout);
if (!fromwire_channel_sending_commitsig(msg, msg,
&commitnum,
&feerate,