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

df-tests: simultaneous openchannel_init (while in progress)

Browse Source 
Reject a peer's request to open a channel while we're already in progress
This commit is contained in:
niftynei
2020-12-19 13:24:56 -06:00
committed by Christian Decker
parent 2c9ce2566c
commit 7e324177de
3 changed files with 79 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lightningd/dual_open_control.c
View File

@@ -361,6 +361,7 @@ static void
openchannel2_hook_cb(struct openchannel2_payload *payload STEALS)
{
struct subd *dualopend = payload->dualopend;
struct uncommitted_channel *uc;
u8 *msg;
/* Free payload regardless of what happens next */
@@ -370,6 +371,18 @@ openchannel2_hook_cb(struct openchannel2_payload *payload STEALS)
if (!dualopend)
return;
assert(dualopend->ctype == UNCOMMITTED);
uc = dualopend->channel;
/* Channel open is currently in progress elsewhere! */
if (uc->fc || uc->got_offer) {
msg = towire_dualopend_fail(NULL, "Already initiated channel"
" open");
log_debug(dualopend->ld->log,
"Our open in progress, denying their offer");
return subd_send_msg(dualopend, take(msg));
}
tal_del_destructor2(dualopend, openchannel2_remove_dualopend, payload);
if (payload->err_msg) {
@@ -407,6 +420,7 @@ openchannel2_hook_cb(struct openchannel2_payload *payload STEALS)
}
}
uc->got_offer = true;
msg = towire_dualopend_got_offer_reply(NULL, payload->accepter_funding,
payload->funding_feerate_per_kw,
payload->psbt,
@@ -1146,6 +1160,7 @@ static void open_failed(struct subd *dualopend, const u8 *msg)
assert(dualopend->ctype == UNCOMMITTED);
uc = dualopend->channel;
uc->got_offer = false;
if (!fromwire_dualopend_failed(msg, msg, &desc)) {
log_broken(uc->log,
@@ -1427,7 +1442,15 @@ static void accepter_got_offer(struct subd *dualopend,
if (peer_active_channel(uc->peer)) {
subd_send_msg(dualopend,
take(towire_dualopend_fail(NULL, "Already have active channel")));
take(towire_dualopend_fail(NULL,
"Already have active channel")));
return;
}
if (uc->fc) {
subd_send_msg(dualopend,
take(towire_dualopend_fail(NULL,
"Already initiated channel open")));
return;
}
@@ -1773,6 +1796,11 @@ static struct command_result *json_openchannel_init(struct command *cmd,
return command_fail(cmd, LIGHTNINGD, "Already funding channel");
}
if (peer->uncommitted_channel->got_offer) {
return command_fail(cmd, LIGHTNINGD,
"Channel open in progress");
}
#if EXPERIMENTAL_FEATURES
if (!feature_negotiated(cmd->ld->our_features,
peer->their_features,