Skip to content

Commit a552130

Browse files
rustyrussellniftynei
authored andcommitted
lightningd: make sure we correctly clear connections from connectd on error.
Without this, the connect command hangs in one of my branches. This logic is from the old days when gossipd handled connections, and we wanted to make sure it didn't hang up on this client due to the error. Signed-off-by: Rusty Russell <[email protected]>
1 parent 62e1423 commit a552130

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ changes.
4141
- lightning-cli: arguments containing `"` now succeed, rather than causing JSON errors.
4242
- protocol: handle lnd sending more messages before `reestablish`; don't fail channel, and handle older lnd's spurious empty commitments.
4343
- Fixed `fundchannel` crash when we have many UTXOs and we skip unconfirmed ones.
44+
- lightningd: fixed occasional hang on `connect` when peer had sent error.
4445

4546
### Security
4647

lightningd/peer_control.c

-2
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,6 @@ void channel_errmsg(struct channel *channel,
388388
err_for_them,
389389
tal_count(err_for_them), 0);
390390

391-
/* Make sure channel_fail_permanent doesn't tell connectd we died! */
392-
channel->connected = false;
393391
notify_disconnect(channel->peer->ld, &channel->peer->id);
394392

395393
/* BOLT #1:

0 commit comments

Comments
 (0)