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

fix(identify): don't close stream in protocol::recv #3344

Merged
merged 7 commits into from
Feb 19, 2023
Merged

fix(identify): don't close stream in protocol::recv #3344

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ffe5a8
fix(identify): flush stream in protocol::recv
elenaf9 Jan 17, 2023
f8efcb3
Add Changelog
elenaf9 Jan 17, 2023
cf21edb
feat(identify): don't flush in
elenaf9 Jan 27, 2023
71c48d2
Update Changelog
elenaf9 Jan 27, 2023
792ec11
Update protocols/identify/src/protocol.rs
mxinden Feb 10, 2023
956f7d6
Merge branch 'master' into identify-recv
mxinden Feb 10, 2023
c3ecbd3
Merge branch 'master' into identify-recv
mxinden Feb 19, 2023
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
3 changes: 3 additions & 0 deletions protocols/identify/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@

- Update to `libp2p-swarm` `v0.42.0`.

- Flush stream in `protocol::recv` instead of closing it. See [PR 3344].
elenaf9 marked this conversation as resolved.
Show resolved Hide resolved

[PR 3208]: https://github.com/libp2p/rust-libp2p/pull/3208
[PR 3344]: https://github.com/libp2p/rust-libp2p/pull/3344

# 0.41.1

Expand Down
7 changes: 5 additions & 2 deletions protocols/identify/src/protocol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,14 @@ where
Ok(())
}

async fn recv<T>(mut socket: T) -> Result<Info, UpgradeError>
async fn recv<T>(socket: T) -> Result<Info, UpgradeError>
where
T: AsyncRead + AsyncWrite + Unpin,
{
socket.close().await?;
// Even though we won't write to the stream anymore we don't close it here.
// The reason for this is that the `close` call on some transport's require the
// remote's ACK, but it could be that the remote already dropped the stream
// after finishing their write.
mxinden marked this conversation as resolved.
Show resolved Hide resolved

let info = FramedRead::new(
socket,
Expand Down