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

connectd: tell lightningd the channel_id when we give it the active peer.

Browse Source 
Now we always have it (either extracted from an unsolicited message,
or told to us by lightningd when it tells us it wants to talk), we can
always send it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-03-23 06:57:30 +10:30
parent 2bc58e2327
commit fe9f391a93
5 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lightningd/peer_control.c
View File

@@ -1237,7 +1237,7 @@ void peer_active(struct lightningd *ld, const u8 *msg, int fd)
struct node_id id;
u16 *msgtype;
struct channel *channel;
struct channel_id *channel_id;
struct channel_id channel_id;
struct peer *peer;
bool dual_fund;
u8 *error;
@@ -1342,8 +1342,8 @@ void peer_active(struct lightningd *ld, const u8 *msg, int fd)
/* It's possible that they want to reestablish a channel, but
* it's closed? */
if (*msgtype == WIRE_CHANNEL_REESTABLISH && channel_id) {
channel = find_channel_by_id(peer, channel_id);
if (*msgtype == WIRE_CHANNEL_REESTABLISH) {
channel = find_channel_by_id(peer, &channel_id);
if (channel && channel_closed(channel)) {
log_debug(channel->log,
"Reestablish on %s channel: using channeld to reply",
@@ -1351,12 +1351,12 @@ void peer_active(struct lightningd *ld, const u8 *msg, int fd)
peer_start_channeld(channel, peer_fd, NULL, true, true);
return;
} else {
const u8 *err = towire_errorfmt(tmpctx, channel_id,
const u8 *err = towire_errorfmt(tmpctx, &channel_id,
"Unknown channel for reestablish");
log_peer_debug(ld->log, &peer->id,
"Reestablish on UNKNOWN channel %s",
type_to_string(tmpctx, struct channel_id,
channel_id));
&channel_id));
/* Unless we're shutting down, tell connectd to send err */
if (ld->connectd)
subd_send_msg(ld->connectd,
@@ -1374,7 +1374,7 @@ void peer_active(struct lightningd *ld, const u8 *msg, int fd)
channel = new_unsaved_channel(peer,
peer->ld->config.fee_base,
peer->ld->config.fee_per_satoshi);
channel->cid = *channel_id;
channel->cid = channel_id;
peer_start_dualopend(peer, peer_fd, channel);
} else {
peer->uncommitted_channel = new_uncommitted_channel(peer);