Skip to content

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

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

Closed
wants to merge 2 commits into from
Closed

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7258ff
update call to DataChannel::accept as per data pr #14
stuqdog Jul 12, 2022
0deb695
fix ownership
stuqdog Jul 12, 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
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() {
Copy link
Contributor

@melekes melekes Jul 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also one idea I just had is to modify DataChannel::accept to accept a reference to a list of existing data channels. That way we won't need to clone all of them, just the one with matching identifier.

Copy link
Contributor Author

@stuqdog stuqdog Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 will make a PR to update there.

Copy link
Contributor

@melekes melekes Jul 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened webrtc-rs/data#15

if let Some(dc) = dc.data_channel.lock().await.clone() {
let dc2 = dc.as_ref().clone();
Copy link
Contributor

@melekes melekes Jul 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the second clone? if it's an already cloned object

Copy link
Contributor Author

@stuqdog stuqdog Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, good question! The clone() should be to_owned() instead.

existing_data_channels.push(dc2);
}
}

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