mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-26 20:30:59 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: clean up connect code.

Browse source 
1. The notification should be called every time.
2. channel can never be NULL, since it's tested above.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Fixed: JSON-RPC: `connect` notification now called even if we already have a live channel.
This commit is contained in:
Rusty Russell 2022-03-22 19:23:13 +10:30
parent fcd0b2eb42
commit eb203bf71e
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lightningd/peer_control.c
View file

@ -982,6 +982,9 @@ static void peer_connected_hook_final(struct peer_connected_hook_payload *payloa
* subd). */ * subd). */
tal_steal(tmpctx, payload); tal_steal(tmpctx, payload);
/* Notify anyone who cares */
notify_connect(ld, &peer->id, payload->incoming, &addr);
/* Check for specific errors of a hook */ /* Check for specific errors of a hook */
if (payload->error) { if (payload->error) {
error = payload->error; error = payload->error;
@ -1046,21 +1049,12 @@ static void peer_connected_hook_final(struct peer_connected_hook_payload *payloa
abort(); abort();
} }
notify_connect(ld, &peer->id, payload->incoming, &addr); /* If we get here, it means we have no channel */
assert(!channel);
if (feature_negotiated(ld->our_features, if (feature_negotiated(ld->our_features,
peer->their_features, peer->their_features,
OPT_DUAL_FUND)) { OPT_DUAL_FUND)) {
if (channel && !list_empty(&channel->inflights)) { peer_start_dualopend(peer, payload->peer_fd);
assert(!channel->owner);
assert(channel->state == DUALOPEND_OPEN_INIT
|| channel->state == DUALOPEND_AWAITING_LOCKIN
|| channel->state == AWAITING_UNILATERAL);
channel->peer->addr = addr;
channel->peer->connected_incoming = payload->incoming;
peer_restart_dualopend(peer, payload->peer_fd, channel);
} else
peer_start_dualopend(peer, payload->peer_fd);
} else } else
peer_start_openingd(peer, payload->peer_fd); peer_start_openingd(peer, payload->peer_fd);
return; return;