Skip to content

MultiListener doesn't always close underlays that aren't accepted #230 #231

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
plorenz merged 1 commit into from
Feb 27, 2026
Merged

MultiListener doesn't always close underlays that aren't accepted #230 #231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 18 additions & 9 deletions multi_listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package channel

import (
"errors"
"sync"

"github.com/michaelquigley/pfxlog"
Expand All @@ -42,7 +43,10 @@ func (self *MultiListener) AcceptUnderlay(underlay Underlay) {

if !isGrouped {
if err := self.ungroupedChannelFallback(underlay); err != nil {
log.WithError(err).Errorf("failed to create channel")
log.WithError(err).Error("failed to create channel")
if closeErr := underlay.Close(); closeErr != nil {
log.WithError(closeErr).Error("error closing underlay")
}
}
return
}
Expand All @@ -63,7 +67,7 @@ func (self *MultiListener) AcceptUnderlay(underlay Underlay) {
if !isFirst {
log.Info("no existing channel found for underlay, but isFirstGroupConnection not set, closing connection")
if err := underlay.Close(); err != nil {
log.Info("error closing underlay")
log.WithError(err).Error("error closing underlay")
}
return
}
Expand All @@ -74,14 +78,19 @@ func (self *MultiListener) AcceptUnderlay(underlay Underlay) {
self.CloseChannel(chId)
})

if mc != nil {
if err != nil {
log.WithError(err).Errorf("failed to create multi-underlay channel")
} else {
self.lock.Lock()
self.channels[chId] = mc
self.lock.Unlock()
if mc == nil && err == nil {
err = errors.New("multi-channel factory returned nil")
}

if err != nil {
log.WithError(err).Error("failed to create multi-underlay channel")
if closeErr := underlay.Close(); closeErr != nil {
log.WithError(closeErr).Error("error closing underlay")
}
} else {
self.lock.Lock()
self.channels[chId] = mc
self.lock.Unlock()
}
}
}
Expand Down