Skip to content

Added temporary fix for data handling in yamux #1021

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
merged 1 commit into from
Jan 10, 2025
Merged

Added temporary fix for data handling in yamux #1021

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
69 changes: 38 additions & 31 deletions p2p/src/network/yamux/p2p_network_yamux_reducer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,37 +368,44 @@ impl P2pNetworkYamuxState {
};
match &mut frame.inner {
YamuxFrameInner::Data(data) => {
if let Some(new_window) =
stream.window_theirs.checked_sub(data.len() as u32)
{
// their window is big enough, decrease the size
// and send the whole frame
stream.window_theirs = new_window;
} else if stream.window_theirs != 0 && stream.pending.is_empty() {
// their window is not big enough, but has some space,
// and the queue is empty,
// do not send the whole frame,
// split it and put remaining in the queue,
if let Some(remaining) = frame.split_at(stream.window_theirs as usize) {
stream.pending.push_back(remaining);
}
// the window will be zero after sending
stream.window_theirs = 0;
} else {
// either the window cannot accept any byte,
// or the queue is already not empty
// in both cases the whole frame goes in the queue and nothing to send
stream.pending.push_back(frame);
if stream.pending.iter().map(YamuxFrame::len).sum::<usize>()
> yamux_state.pending_outgoing_limit
{
let dispatcher = state_context.into_dispatcher();
let error = P2pNetworkConnectionError::YamuxOverflow(stream_id);
dispatcher.push(P2pNetworkSchedulerAction::Error { addr, error });
}

return Ok(());
}
stream.window_theirs = stream
.window_theirs
.checked_sub(data.len() as u32)
.unwrap_or_default();

// TODO: code bellow include splitting the frame so that data which doesn't fit inside the window doesn't get sent, this breaks the bootstrap to rust

// if let Some(new_window) =
// stream.window_theirs.checked_sub(data.len() as u32)
// {
// // their window is big enough, decrease the size
// // and send the whole frame
// stream.window_theirs = new_window;
// } else if stream.window_theirs != 0 && stream.pending.is_empty() {
// // their window is not big enough, but has some space,
// // and the queue is empty,
// // do not send the whole frame,
// // split it and put remaining in the queue,
// if let Some(remaining) = frame.split_at(stream.window_theirs as usize) {
// stream.pending.push_back(remaining);
// }
// // the window will be zero after sending
// stream.window_theirs = 0;
// } else {
// // either the window cannot accept any byte,
// // or the queue is already not empty
// // in both cases the whole frame goes in the queue and nothing to send
// stream.pending.push_back(frame);
// if stream.pending.iter().map(YamuxFrame::len).sum::<usize>()
// > yamux_state.pending_outgoing_limit
// {
// let dispatcher = state_context.into_dispatcher();
// let error = P2pNetworkConnectionError::YamuxOverflow(stream_id);
// dispatcher.push(P2pNetworkSchedulerAction::Error { addr, error });
// }

// return Ok(());
// }
}
YamuxFrameInner::WindowUpdate { difference } => {
stream.update_window(true, *difference);
Expand Down
Loading