Skip to content

Disconnect and delete client stream on error #29

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

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Disconnect and delete client stream on error #29

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
8 changes: 8 additions & 0 deletions server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ type Server struct {
Services map[string]Service

activeConnections map[string]*yamux.Session
connsLock sync.RWMutex

listeners []net.Listener
listenersMU sync.Mutex
Expand Down Expand Up @@ -184,7 +185,9 @@ func (s *Server) handleTCPRouterClientConnection(conn WriteCloser) {
Str("remote addr", conn.RemoteAddr().String()).
Msg("handshake done... adding to active connections")

s.connsLock.Lock()
s.activeConnections[string(hs.Secret[:])] = session
s.connsLock.Unlock()
}

func (s *Server) handleConnection(conn WriteCloser) {
Expand Down Expand Up @@ -285,7 +288,12 @@ func (s *Server) handleService(incoming WriteCloser, serverName, peeked string,
stream, err := activeConn.OpenStream()
if err != nil {
incoming.Close()
activeConn.Close()
s.connsLock.Lock()
delete(s.activeConnections, service.ClientSecret)
s.connsLock.Unlock()
return fmt.Errorf("failed to open stream: %w", err)

}
outgoing = WrapConn(stream)

Expand Down