Skip to content

update call to DataChannel::accept as per data pr #14 #224

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 2 commits into from
Jul 21, 2022
Merged

update call to DataChannel::accept as per data pr #14 #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2dfc00
update call to DataChannel::accept as per data pr #14
melekes Jul 20, 2022
a21f394
bump data and sctp crates versions
melekes Jul 20, 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
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ dtls = { package = "webrtc-dtls", version = "0.5.2" }
rtp = "0.6.5"
rtcp = "0.6.5"
srtp = { package = "webrtc-srtp", version = "0.8.9" }
sctp = { package = "webrtc-sctp", version = "0.4.3" }
data = { package = "webrtc-data", version = "0.3.3" }
sctp = { package = "webrtc-sctp", version = "0.5.0" }
data = { package = "webrtc-data", version = "0.4.0" }
media = { package = "webrtc-media", version = "0.4.5" }
interceptor = "0.7.6"
tokio = { version = "1.19", features = ["full"] }
Expand Down
10 changes: 10 additions & 0 deletions src/sctp_transport/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,22 @@ impl RTCSctpTransport {
}

async fn accept_data_channels(param: AcceptDataChannelParams) {
let dcs = param.data_channels.lock().await;
let mut existing_data_channels = Vec::new();
for dc in dcs.iter() {
if let Some(dc) = dc.data_channel.lock().await.clone() {
existing_data_channels.push(dc);
}
}
drop(dcs);

loop {
let dc = tokio::select! {
_ = param.notify_rx.notified() => break,
result = DataChannel::accept(
&param.sctp_association,
data::data_channel::Config::default(),
&existing_data_channels,
) => {
match result {
Ok(dc) => dc,
Expand Down