Skip to content
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

Jump to bottom

websocket: don't return transport.ErrListenerClosed on closing listener #2867

Merged
merged 1 commit into from
Jul 16, 2024
Merged

websocket: don't return transport.ErrListenerClosed on closing listener #2867

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
23 changes: 13 additions & 10 deletions p2p/transport/websocket/listener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package websocket

import (
"crypto/tls"
"errors"
"fmt"
"net"
"net/http"
"strings"
"sync"

"github.com/libp2p/go-libp2p/core/transport"

Expand All @@ -22,8 +23,11 @@ type listener struct {

laddr ma.Multiaddr

closed chan struct{}
incoming chan *Conn

closeOnce sync.Once
closeErr error
closed chan struct{}
}

func (pwma *parsedWebsocketMultiaddr) toMultiaddr() ma.Multiaddr {
Expand Down Expand Up @@ -122,7 +126,6 @@ func (l *listener) Accept() (manet.Conn, error) {
c.Close()
return nil, err
}

return mnc, nil
case <-l.closed:
return nil, transport.ErrListenerClosed
Expand All @@ -134,13 +137,13 @@ func (l *listener) Addr() net.Addr {
}

func (l *listener) Close() error {
l.server.Close()
err := l.nl.Close()
<-l.closed
if strings.Contains(err.Error(), "use of closed network connection") {
return transport.ErrListenerClosed
}
return err
l.closeOnce.Do(func() {
err1 := l.nl.Close()
err2 := l.server.Close()
<-l.closed
l.closeErr = errors.Join(err1, err2)
})
return l.closeErr
}

func (l *listener) Multiaddr() ma.Multiaddr {
Expand Down
Loading