Skip to content

[2/4] - peer: add new abstract message router #8520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 16, 2024
Merged

[2/4] - peer: add new abstract message router #8520

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f124195
msgmux: add new abstract message router
Roasbeef Jan 27, 2024
927aa84
peer: update readHandler to dispatch to msgRouter if set
Roasbeef Jan 31, 2024
b028af1
multi: make MsgRouter available in the ImplementationCfg
Roasbeef Apr 4, 2024
f09c517
peer: don't stop global msg router
Roasbeef Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions peer/brontide.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,11 @@ type Brontide struct {
// off new wire messages for handing.
msgRouter fn.Option[msgmux.Router]

// globalMsgRouter is a flag that indicates whether we have a global
// msg router. If so, then we don't worry about stopping the msg router
// when a peer disconnects.
globalMsgRouter bool
Comment on lines +535 to +538
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this field is totally unnecessary. I think we just inline the call to cfg.MsgRouter.IsSome()

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yeah can do that too: we can check against the config version as it has a life cycle independent of the peer itself.


startReady chan struct{}
quit chan struct{}
wg sync.WaitGroup
Expand All @@ -547,6 +552,11 @@ var _ lnpeer.Peer = (*Brontide)(nil)
func NewBrontide(cfg Config) *Brontide {
logPrefix := fmt.Sprintf("Peer(%x):", cfg.PubKeyBytes)

// We have a global message router if one was passed in via the config.
// In this case, we don't need to attempt to tear it down when the peer
// is stopped.
globalMsgRouter := cfg.MsgRouter.IsSome()

// We'll either use the msg router instance passed in, or create a new
// blank instance.
msgRouter := cfg.MsgRouter.Alt(fn.Some[msgmux.Router](
Expand Down Expand Up @@ -576,6 +586,7 @@ func NewBrontide(cfg Config) *Brontide {
quit: make(chan struct{}),
log: build.NewPrefixLog(logPrefix, peerLog),
msgRouter: msgRouter,
globalMsgRouter: globalMsgRouter,
}

if cfg.Conn != nil && cfg.Conn.RemoteAddr() != nil {
Expand Down Expand Up @@ -1393,9 +1404,13 @@ func (p *Brontide) Disconnect(reason error) {

close(p.quit)

p.msgRouter.WhenSome(func(router msgmux.Router) {
router.Stop()
})
// If our msg router isn't global (local to this instance), then we'll
// stop it. Otherwise, we'll leave it running.
if !p.globalMsgRouter {
p.msgRouter.WhenSome(func(router msgmux.Router) {
router.Stop()
})
}
}

// String returns the string representation of this peer.
Expand Down