mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-09-02 17:53:48 +00:00
Code Issues Projects Releases Wiki Activity

Revert "quinn: Update to web-transport-quinn 0.5"

Browse source 
This reverts commit 50c2529904.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2120>
This commit is contained in:
Sebastian Dröge 2025-03-04 15:28:06 +02:00
parent 74c7cdb2d0
commit e056d9244d
5 changed files with 36 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Cargo.lock generated
View file

@ -332,7 +332,6 @@ checksum = "5e4e8200b9a4a5801a769d50eeabc05670fec7e959a8cb7a63a93e4e519942ae"
dependencies = [ dependencies = [
"aws-lc-sys", "aws-lc-sys",
"paste", "paste",
"untrusted 0.7.1",
"zeroize", "zeroize",
] ]
@ -891,7 +890,7 @@ dependencies = [
"bitflags 2.9.0", "bitflags 2.9.0",
"cexpr", "cexpr",
"clang-sys", "clang-sys",
"itertools 0.11.0", "itertools 0.12.1",
"lazy_static", "lazy_static",
"lazycell", "lazycell",
"log", "log",
@ -4751,7 +4750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"windows-targets 0.48.5", "windows-targets 0.52.6",
] ]
[[package]] [[package]]
@ -5931,8 +5930,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
dependencies = [ dependencies = [
"bytes", "bytes",
"heck 0.4.1", "heck 0.5.0",
"itertools 0.11.0", "itertools 0.12.1",
"log", "log",
"multimap", "multimap",
"once_cell", "once_cell",
@ -5952,7 +5951,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.11.0", "itertools 0.12.1",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.99", "syn 2.0.99",
@ -6451,7 +6450,7 @@ dependencies = [
"cfg-if", "cfg-if",
"getrandom 0.2.15", "getrandom 0.2.15",
"libc", "libc",
"untrusted 0.9.0", "untrusted",
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
@ -6722,7 +6721,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
dependencies = [ dependencies = [
"ring", "ring",
"untrusted 0.9.0", "untrusted",
] ]
[[package]] [[package]]
@ -6734,7 +6733,7 @@ dependencies = [
"aws-lc-rs", "aws-lc-rs",
"ring", "ring",
"rustls-pki-types", "rustls-pki-types",
"untrusted 0.9.0", "untrusted",
] ]
[[package]] [[package]]
@ -6795,7 +6794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
dependencies = [ dependencies = [
"ring", "ring",
"untrusted 0.9.0", "untrusted",
] ]
[[package]] [[package]]
@ -8004,12 +8003,6 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
[[package]]
name = "untrusted"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]] [[package]]
name = "untrusted" name = "untrusted"
version = "0.9.0" version = "0.9.0"
@ -8338,20 +8331,17 @@ dependencies = [
[[package]] [[package]]
name = "web-transport-quinn" name = "web-transport-quinn"
version = "0.5.0" version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61937694cad3742f278b38af267bb84b749efaca0c94ab1fcacadfb6aa544065" checksum = "3020b51cda10472a365e42d9a701916d4f04d74cc743de08246ef6a421c2d137"
dependencies = [ dependencies = [
"aws-lc-rs",
"bytes", "bytes",
"futures", "futures",
"http 1.2.0", "http 1.2.0",
"log", "log",
"quinn", "quinn",
"quinn-proto", "quinn-proto",
"rustls 0.23.23", "thiserror 1.0.69",
"rustls-native-certs 0.8.1",
"thiserror 2.0.12",
"tokio", "tokio",
"url", "url",
"web-transport-proto", "web-transport-proto",
@ -8373,7 +8363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
dependencies = [ dependencies = [
"ring", "ring",
"untrusted 0.9.0", "untrusted",
] ]
[[package]] [[package]]

2
net/quinn/Cargo.toml
View file

@ -27,7 +27,7 @@ thiserror = "2"
async-channel = "2.3" async-channel = "2.3"
itertools = "0.14" itertools = "0.14"
env_logger = "0.11" env_logger = "0.11"
web-transport-quinn = "0.5" web-transport-quinn = "0.3.3"
url = "2.5.2" url = "2.5.2"
once_cell = "1.20.2" once_cell = "1.20.2"

18
net/quinn/src/quinnwtclientsrc/imp.rs
View file

@ -13,7 +13,7 @@
use crate::quinnquicmeta::QuinnQuicMeta; use crate::quinnquicmeta::QuinnQuicMeta;
use crate::quinnquicquery::*; use crate::quinnquicquery::*;
use crate::utils::{ use crate::utils::{
client, client_endpoint, get_stats, make_socket_addr, server_endpoint, wait, Canceller, client_endpoint, get_stats, make_socket_addr, server_endpoint, wait, Canceller,
QuinnQuicEndpointConfig, WaitError, CONNECTION_CLOSE_CODE, CONNECTION_CLOSE_MSG, RUNTIME, QuinnQuicEndpointConfig, WaitError, CONNECTION_CLOSE_CODE, CONNECTION_CLOSE_MSG, RUNTIME,
}; };
use crate::{common::*, utils}; use crate::{common::*, utils};
@ -535,19 +535,21 @@ impl QuinnWebTransportClientSrc {
))), ))),
}?; }?;
let client = client(&endpoint_config).map_err(|err| { let client = client_endpoint(&endpoint_config).map_err(|err| {
WaitError::FutureError(gst::error_msg!( WaitError::FutureError(gst::error_msg!(
gst::ResourceError::Failed, gst::ResourceError::Failed,
["Failed to configure endpoint: {}", err] ["Failed to configure endpoint: {}", err]
)) ))
})?; })?;
let session = client.connect(&url).await.map_err(|err| { let session = web_transport_quinn::connect(&client, &url)
WaitError::FutureError(gst::error_msg!( .await
gst::ResourceError::Failed, .map_err(|err| {
["Failed to connect to server: {}", err] WaitError::FutureError(gst::error_msg!(
)) gst::ResourceError::Failed,
})?; ["Failed to connect to server: {}", err]
))
})?;
gst::info!( gst::info!(
CAT, CAT,

15
net/quinn/src/quinnwtserversink/imp.rs
View file

@ -623,15 +623,24 @@ impl QuinnWebTransportServerSink {
)) ))
})?; })?;
let mut incoming_conn = web_transport_quinn::Server::new(endpoint); let incoming_conn = endpoint.accept().await.unwrap();
let request = incoming_conn.accept().await.ok_or_else(|| { let connection = incoming_conn.await.map_err(|err| {
WaitError::FutureError(gst::error_msg!( WaitError::FutureError(gst::error_msg!(
gst::ResourceError::Failed, gst::ResourceError::Failed,
["Connection error"] ["Connection error: {}", err]
)) ))
})?; })?;
let request = web_transport_quinn::accept(connection)
.await
.map_err(|err| {
WaitError::FutureError(gst::error_msg!(
gst::ResourceError::Failed,
["Connection error: {}", err]
))
})?;
gst::info!( gst::info!(
CAT, CAT,
imp = self, imp = self,

10
net/quinn/src/utils.rs
View file

@ -28,7 +28,6 @@ use std::sync::{Arc, Mutex};
use std::time::Duration; use std::time::Duration;
use thiserror::Error; use thiserror::Error;
use tokio::runtime; use tokio::runtime;
use web_transport_quinn::Client;
pub const CONNECTION_CLOSE_CODE: u32 = 0; pub const CONNECTION_CLOSE_CODE: u32 = 0;
pub const CONNECTION_CLOSE_MSG: &str = "Stopped"; pub const CONNECTION_CLOSE_MSG: &str = "Stopped";
@ -434,15 +433,6 @@ pub fn client_endpoint(ep_config: &QuinnQuicEndpointConfig) -> Result<Endpoint,
Ok(endpoint) Ok(endpoint)
} }
pub fn client(ep_config: &QuinnQuicEndpointConfig) -> Result<Client, Box<dyn Error>> {
let client_cfg = configure_client(ep_config)?;
let mut endpoint = Endpoint::client(ep_config.client_addr.expect("client_addr not set"))?;
endpoint.set_default_client_config(client_cfg.clone());
Ok(web_transport_quinn::Client::new(endpoint, client_cfg))
}
pub fn get_stats(stats: Option<ConnectionStats>) -> gst::Structure { pub fn get_stats(stats: Option<ConnectionStats>) -> gst::Structure {
match stats { match stats {
Some(stats) => { Some(stats) => {