Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 12 additions & 4 deletions pkg/dmsg/client_session.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,12 @@ func (cs *ClientSession) DialStream(dst Addr) (dStr *Stream, err error) {
return nil, err
}

// Clear deadline.
if err = dStr.SetDeadline(time.Time{}); err != nil {
// Set idle timeout — refreshed on each successful read.
if err = dStr.SetReadDeadline(time.Now().Add(StreamIdleTimeout)); err != nil {
return nil, err
}
// Clear the write deadline so writes are not affected.
if err = dStr.SetWriteDeadline(time.Time{}); err != nil {
return nil, err
}

Expand Down Expand Up @@ -169,8 +173,12 @@ func (cs *ClientSession) acceptStream() (dStr *Stream, err error) {
return nil, err
}

// Clear deadline.
if err = dStr.SetDeadline(time.Time{}); err != nil {
// Set idle timeout — refreshed on each successful read.
if err = dStr.SetReadDeadline(time.Now().Add(StreamIdleTimeout)); err != nil {
return nil, err
}
// Clear the write deadline so writes are not affected.
if err = dStr.SetWriteDeadline(time.Time{}); err != nil {
return nil, err
}

Expand Down
12 changes: 10 additions & 2 deletions pkg/dmsg/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -325,9 +325,17 @@ func (s *Stream) StreamID() uint32 {
return s.yStr.StreamID()
}

// Read implements io.Reader
// Read implements io.Reader.
// It refreshes the idle timeout on each successful read so that active
// streams are never killed, while stale streams stuck in waitRead with
// no incoming data will time out and release their ephemeral port.
func (s *Stream) Read(b []byte) (int, error) {
return s.nsConn.Read(b)
n, err := s.nsConn.Read(b)
if n > 0 {
// Reset the read deadline on successful read to keep the stream alive.
s.SetReadDeadline(time.Now().Add(StreamIdleTimeout)) //nolint:errcheck,gosec
}
return n, err
}

// Write implements io.Writer
Expand Down
5 changes: 5 additions & 0 deletions pkg/dmsg/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ var (
// HandshakeTimeout defines the duration a stream handshake should take.
HandshakeTimeout = time.Second * 20

// StreamIdleTimeout defines how long a stream can be idle (no reads)
// before it is considered stale and closed. This prevents streams stuck
// in waitRead from holding ephemeral ports indefinitely.
StreamIdleTimeout = 2 * time.Minute

// AcceptBufferSize defines the size of the accepts buffer.
AcceptBufferSize = 20
)
Expand Down
Loading