Skip to content

Commit

Permalink
Merge pull request #8162 from Roasbeef/v0-17-1-branch-rc3
Browse files Browse the repository at this point in the history
build: create v0.17.1 rc3 release branch
  • Loading branch information
Roasbeef authored Nov 9, 2023
2 parents 0116d9b + 18a5dda commit eea15f0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion build/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const (

// AppPreRelease MUST only contain characters from semanticAlphabet per
// the semantic versioning spec.
AppPreRelease = "beta.rc2"
AppPreRelease = "beta.rc3"
)

func init() {
Expand Down
2 changes: 2 additions & 0 deletions docs/release-notes/release-notes-0.17.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

# Bug Fixes

* A bug that caused certain API calls to hang [has been fixed](https://github.com/lightningnetwork/lnd/pull/8158).

* [LND now sets the `BADONION`](https://github.com/lightningnetwork/lnd/pull/7937)
bit when sending `update_fail_malformed_htlc`. This avoids a force close
with other implementations.
Expand Down
17 changes: 9 additions & 8 deletions peer/brontide.go
Original file line number Diff line number Diff line change
Expand Up @@ -655,9 +655,15 @@ func (p *Brontide) Start() error {
if len(msgs) > 0 {
p.log.Infof("Sending %d channel sync messages to peer after "+
"loading active channels", len(msgs))
if err := p.SendMessage(true, msgs...); err != nil {
p.log.Warnf("Failed sending channel sync "+
"messages to peer: %v", err)

// Send the messages directly via writeMessage and bypass the
// writeHandler goroutine to avoid cases where writeHandler
// may exit and cause a deadlock.
for _, msg := range msgs {
if err := p.writeMessage(msg); err != nil {
return fmt.Errorf("unable to send reestablish"+
"msg: %v", err)
}
}
}

Expand Down Expand Up @@ -2020,11 +2026,6 @@ func (p *Brontide) logWireMessage(msg lnwire.Message, read bool) {
// with a nil message iff a timeout error is returned. This will continue to
// flush the pending message to the wire.
func (p *Brontide) writeMessage(msg lnwire.Message) error {
// Simply exit if we're shutting down.
if atomic.LoadInt32(&p.disconnect) != 0 {
return lnpeer.ErrPeerExiting
}

// Only log the message on the first attempt.
if msg != nil {
p.logWireMessage(msg, false)
Expand Down

0 comments on commit eea15f0

Please sign in to comment.