diff options
author | metamuffin <metamuffin@disroot.org> | 2023-06-25 09:18:20 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2023-06-25 09:18:20 +0200 |
commit | 462d9c511ad96cd2270d44bada243d981d5891e3 (patch) | |
tree | e5c62ab6d8cdbb67e132d8275e999bb091ac60e1 /client-native-lib | |
parent | e7a3c758bdd63d2a444f2fe578e54045c43ad6bb (diff) | |
download | keks-meet-462d9c511ad96cd2270d44bada243d981d5891e3.tar keks-meet-462d9c511ad96cd2270d44bada243d981d5891e3.tar.bz2 keks-meet-462d9c511ad96cd2270d44bada243d981d5891e3.tar.zst |
update all of the rusty stuff. also fixed webrtc build problems
Diffstat (limited to 'client-native-lib')
-rw-r--r-- | client-native-lib/Cargo.toml | 16 | ||||
-rw-r--r-- | client-native-lib/src/lib.rs | 1 | ||||
-rw-r--r-- | client-native-lib/src/peer.rs | 15 |
3 files changed, 15 insertions, 17 deletions
diff --git a/client-native-lib/Cargo.toml b/client-native-lib/Cargo.toml index c7c36d5..43e44e0 100644 --- a/client-native-lib/Cargo.toml +++ b/client-native-lib/Cargo.toml @@ -4,22 +4,22 @@ version = "0.1.0" edition = "2021" [dependencies] -tokio = { version = "1.25", features = ["full"] } -futures-util = "0.3.26" +tokio = { version = "1.28", features = ["full"] } +futures-util = "0.3.28" -webrtc = "0.6.0" +webrtc = "0.8.0" tokio-tungstenite = { version = "*", features = ["rustls-tls"] } -url = "2.3.1" +url = "2.4.0" -serde = { version = "1.0.152", features = ["derive"] } +serde = { version = "1.0.164", features = ["derive"] } serde_json = "*" log = "0.4" fastpbkdf2 = "0.1.0" -aes-gcm = "0.10.1" -sha256 = "1.1.2" +aes-gcm = "0.10.2" +sha256 = "1.1.4" rand = "0.8.5" rand_chacha = "0.3.1" -base64 = "0.21.0" +base64 = "0.21.2" bytes = "1.4.0" diff --git a/client-native-lib/src/lib.rs b/client-native-lib/src/lib.rs index 32418d4..5cfd2c6 100644 --- a/client-native-lib/src/lib.rs +++ b/client-native-lib/src/lib.rs @@ -4,7 +4,6 @@ Copyright (C) 2022 metamuffin <metamuffin@disroot.org> */ #![feature(async_closure)] -#![feature(box_syntax)] // #![feature(async_fn_in_trait)] use futures_util::Future; diff --git a/client-native-lib/src/peer.rs b/client-native-lib/src/peer.rs index 023be1d..5f08061 100644 --- a/client-native-lib/src/peer.rs +++ b/client-native-lib/src/peer.rs @@ -87,21 +87,20 @@ impl Peer { { let weak = Arc::<Peer>::downgrade(&peer); - peer.peer_connection.on_negotiation_needed(Box::new(move || { - let peer = weak.upgrade().unwrap(); - Box::pin(async { peer.on_negotiation_needed().await }) - })) + peer.peer_connection + .on_negotiation_needed(Box::new(move || { + let peer = weak.upgrade().unwrap(); + Box::pin(async { peer.on_negotiation_needed().await }) + })) } { let weak = Arc::<Peer>::downgrade(&peer); peer.peer_connection - .on_track(Box::new(move |track_remote, receiver| { - let receiver = receiver.unwrap(); - let track_remote = track_remote.unwrap(); + .on_track(Box::new(move |track_remote, receiver, _transceiver| { let peer = weak.upgrade().unwrap(); Box::pin(async move { - let id = &track_remote.stream_id().await; + let id = &track_remote.stream_id(); if let Some(res) = peer.remote_provided.read().await.get(id) { info!("track for ({:?}) '{:?}'", res.id, res.label); peer.inst |