remove retty dep for srtp

webrtc-rs · Mar 7, 2024 · a360245 · a360245
1 parent 6e188eb
commit a360245
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/rtc-dtls/Cargo.toml b/rtc-dtls/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/webrtc-rs/rtc"
 
 [dependencies]
 shared = { version = "0.1", path = "../rtc-shared", package = "rtc-shared", default-features = false, features = ["crypto", "replay"] }
-retty = "0.24"
+
 bytes = "1.4"
 byteorder = "1"
 rand_core = "0.6"

diff --git a/rtc-dtls/src/endpoint.rs b/rtc-dtls/src/endpoint.rs
@@ -1,7 +1,7 @@
 use crate::conn::DTLSConn;
-use crate::{EcnCodepoint, Transmit};
-
+use crate::Transmit;
 use shared::error::{Error, Result};
+use shared::EcnCodepoint;
 
 use crate::config::HandshakeConfig;
 use crate::state::State;

diff --git a/rtc-dtls/src/lib.rs b/rtc-dtls/src/lib.rs
@@ -26,7 +26,7 @@ pub mod state;
 use bytes::BytesMut;
 use cipher_suite::*;
 use extension::extension_use_srtp::SrtpProtectionProfile;
-use retty::transport::EcnCodepoint;
+use shared::EcnCodepoint;
 use std::net::{IpAddr, SocketAddr};
 use std::time::Instant;
 

diff --git a/rtc-sctp/Cargo.toml b/rtc-sctp/Cargo.toml
@@ -12,7 +12,6 @@ repository = "https://github.com/webrtc-rs/rtc"
 [dependencies]
 shared = { version = "0.1", path = "../rtc-shared", package = "rtc-shared", default-features = false, features = [] }
 
-retty = "0.24"
 bytes = "1"
 fxhash = "0.2"
 rand = "0.8"

diff --git a/rtc-sctp/src/endpoint/mod.rs b/rtc-sctp/src/endpoint/mod.rs
@@ -18,7 +18,8 @@ use crate::shared::{
     AssociationEvent, AssociationEventInner, AssociationId, EndpointEvent, EndpointEventInner,
 };
 use crate::util::{AssociationIdGenerator, RandomAssociationIdGenerator};
-use crate::{EcnCodepoint, Payload, Transmit};
+use crate::{Payload, Transmit};
+use shared::EcnCodepoint;
 
 use bytes::Bytes;
 use fxhash::FxHashMap;

diff --git a/rtc-sctp/src/lib.rs b/rtc-sctp/src/lib.rs
@@ -16,8 +16,8 @@
 #![allow(dead_code)]
 #![allow(clippy::bool_to_int_with_if)]
 
+use ::shared::EcnCodepoint;
 use bytes::Bytes;
-use retty::transport::EcnCodepoint;
 use std::time::Instant;
 use std::{
     fmt,

diff --git a/rtc-shared/Cargo.toml b/rtc-shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rtc-shared"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Rain Liu <yliu@webrtc.rs>"]
 edition = "2021"
 description = "RTC Shared in Rust"
@@ -24,3 +24,4 @@ rcgen = "0.12"
 sec1 = { version = "0.7", features = ["std"] }
 p256 = { version = "0.13", features = ["default", "ecdh", "ecdsa"] }
 aes = "0.8"
+retty = "0.27.0"
diff --git a/rtc-shared/src/lib.rs b/rtc-shared/src/lib.rs
@@ -12,3 +12,5 @@ pub mod replay_detector;
 
 pub mod error;
 pub mod util;
+
+pub use retty::transport::EcnCodepoint;
diff --git a/rtc-srtp/Cargo.toml b/rtc-srtp/Cargo.toml
@@ -14,7 +14,6 @@ shared = { version = "0.1", path = "../rtc-shared", package = "rtc-shared", defa
 rtp = { version = "0.1", path = "../rtc-rtp", package = "rtc-rtp" }
 rtcp = { version = "0.1", path = "../rtc-rtcp", package = "rtc-rtcp" }
 
-retty = "0.24"
 byteorder = "1"
 bytes = "1"
 thiserror = "1"

diff --git a/rtc-stun/Cargo.toml b/rtc-stun/Cargo.toml
@@ -15,9 +15,8 @@ bench = []
 
 [dependencies]
 shared = { version = "0.1", path = "../rtc-shared", package = "rtc-shared", default-features = false, features = [] }
-retty = "0.24"
-bytes = "1.4"
 
+bytes = "1.4"
 lazy_static = "1.4"
 url = "2.2"
 rand = "0.8"

diff --git a/rtc-stun/src/lib.rs b/rtc-stun/src/lib.rs
@@ -5,7 +5,7 @@
 extern crate lazy_static;
 
 use bytes::BytesMut;
-use retty::transport::EcnCodepoint;
+use shared::EcnCodepoint;
 use std::net::{IpAddr, SocketAddr};
 use std::time::Instant;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ pub mod replay_detector;

		pub mod error;
		pub mod util;

		pub use retty::transport::EcnCodepoint;