Skip to content

fix(libp2phttp): bound NewStream timeout #3225

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
MarcoPolo merged 2 commits into from
Mar 19, 2025
Merged

fix(libp2phttp): bound NewStream timeout #3225

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
802eb9d
fix(libp2phttp): bound NewStream timeout
algorandskiy Mar 7, 2025
b2e9f13
CR: remove basic_host dependency
algorandskiy Mar 17, 2025
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
15 changes: 14 additions & 1 deletion p2p/http/libp2phttp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ const LegacyWellKnownProtocols = "/.well-known/libp2p"
const peerMetadataLimit = 8 << 10 // 8KB
const peerMetadataLRUSize = 256 // How many different peer's metadata to keep in our LRU cache

// DefaultNewStreamTimeout is the default value for new stream establishing timeout.
// It is the same value as basic_host.DefaultNegotiationTimeout
var DefaultNewStreamTimeout = 10 * time.Second

type clientPeerIDContextKey struct{}
type serverPeerIDContextKey struct{}

Expand Down Expand Up @@ -496,7 +500,16 @@ func (rt *streamRoundTripper) RoundTrip(r *http.Request) (*http.Response, error)
})
}

s, err := rt.h.NewStream(r.Context(), rt.server, ProtocolIDForMultistreamSelect)
// If r.Context() timeout is greater than DefaultNewStreamTimeout
// use DefaultNewStreamTimeout for new stream negotiation.
newStreamCtx := r.Context()
if deadline, ok := newStreamCtx.Deadline(); !ok || deadline.After(time.Now().Add(DefaultNewStreamTimeout)) {
var cancel context.CancelFunc
newStreamCtx, cancel = context.WithTimeout(context.Background(), DefaultNewStreamTimeout)
defer cancel()
}

s, err := rt.h.NewStream(newStreamCtx, rt.server, ProtocolIDForMultistreamSelect)
if err != nil {
return nil, err
}
Expand Down
Loading