Skip to content

data_channel: handle stream EOF #205

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
melekes merged 4 commits into from
Jun 23, 2022
Merged

data_channel: handle stream EOF #205

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25adfe2
data_channel: handle stream EOF
melekes Jun 23, 2022
9f91b8f
format code
melekes Jun 23, 2022
6904735
add a comment
melekes Jun 23, 2022
c666d9d
improve comment
melekes Jun 23, 2022
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
33 changes: 24 additions & 9 deletions src/data_channel/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,18 +305,33 @@ impl RTCDataChannel {
_ = notify_rx.notified() => break,
result = data_channel.read_data_channel(&mut buffer) => {
match result{
// EOF (`data_channel` was either closed or the underlying stream got
// reset by the remote) => close and run `on_close` handler.
Ok((0, _)) =>
{
ready_state.store(RTCDataChannelState::Closed as u8, Ordering::SeqCst);

let on_close_handler2 = Arc::clone(&on_close_handler);
tokio::spawn(async move {
let mut handler = on_close_handler2.lock().await;
if let Some(f) = &mut *handler {
f().await;
}
});

break;
}
Ok((n, is_string)) => (n, is_string),
Err(err) => {
ready_state.store(RTCDataChannelState::Closed as u8, Ordering::SeqCst);
if err != sctp::Error::ErrStreamClosed {
let on_error_handler2 = Arc::clone(&on_error_handler);
tokio::spawn(async move {
let mut handler = on_error_handler2.lock().await;
if let Some(f) = &mut *handler {
f(err.into()).await;
}
});
}

let on_error_handler2 = Arc::clone(&on_error_handler);
tokio::spawn(async move {
let mut handler = on_error_handler2.lock().await;
if let Some(f) = &mut *handler {
f(err.into()).await;
}
});

let on_close_handler2 = Arc::clone(&on_close_handler);
tokio::spawn(async move {
Expand Down