remove transport and merge it to util

Author: rainliu

Cargo.toml

@@ -10,7 +10,6 @@ members = [
     "stun",
     "turn",
     "util",
-    "transport",
 ]
 
 [profile.dev]

dtls/Cargo.toml

@@ -8,7 +8,6 @@ edition = "2018"
 
 [dependencies]
 util = { path = "../util" }
-transport = {path = "../transport"}
 byteorder = "1.3.2"
 lazy_static = "1.3.0"
 rand_core = "0.5.1"

dtls/src/conn.rs

@@ -24,8 +24,6 @@ use crate::record_layer::*;
 use crate::signature_hash_algorithm::parse_signature_schemes;
 use crate::state::*;
 
-use transport::replay_detector::*;
-
 use std::collections::HashMap;
 use std::io::{BufReader, BufWriter};
 use std::sync::atomic::{AtomicBool, AtomicU16, AtomicU64, Ordering};
@@ -38,6 +36,7 @@ use tokio::sync::{mpsc, Mutex};
 use tokio::time;
 use tokio::time::{timeout, Duration};
 
+use util::replay_detector::*;
 use util::Error;
 
 pub(crate) const INITIAL_TICKER_INTERVAL: time::Duration = time::Duration::from_secs(1);

srtp/Cargo.toml

@@ -8,7 +8,6 @@ edition = "2018"
 
 [dependencies]
 util = { path = "../util" }
-transport = {path = "../transport"}
 rtp = { path = "../rtp" }
 rtcp = { path = "../rtcp" }
 byteorder = "1.3.2"

srtp/src/context/mod.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use transport::replay_detector::*;
+use util::replay_detector::*;
 use util::Error;
 
 use super::protection_profile::*;

srtp/src/option.rs

@@ -1,6 +1,7 @@
 use super::context::srtcp::*;
 use super::context::*;
-use transport::replay_detector::*;
+
+use util::replay_detector::*;
 
 pub type ContextOption = Box<dyn Fn() -> Box<dyn ReplayDetector + Send>>;
 

srtp/src/session/mod.rs

@@ -3,8 +3,8 @@ mod session_rtp_test;
 
 use crate::{config::Config, context::Context, option, stream::Stream};
 
-use transport::{buffer::ERR_BUFFER_FULL, Buffer};
 use util::Error;
+use util::{buffer::ERR_BUFFER_FULL, Buffer};
 
 use tokio::{
     net::UdpSocket,

srtp/src/stream.rs

@@ -1,4 +1,4 @@
-use transport::Buffer;
+use util::Buffer;
 use util::Error;
 
 use tokio::sync::mpsc;

transport/Cargo.toml

@@ -17,6 +17,7 @@ rsa = "0.3.0"
 signature = "1.2.2"
 x509-parser = "0.8.2"
 der-parser = "4.1.0"
+lazy_static = "1.3.0"
 
 [dev-dependencies]
 tokio-test = "0.3"

transport/src/lib.rs

@@ -1,4 +1,4 @@
-use util::error::Error;
+use crate::error::Error;
 
 use std::sync::Arc;
 

util/Cargo.toml

@@ -1,6 +1,13 @@
 #![warn(rust_2018_idioms)]
 #![allow(dead_code)]
 
+#[macro_use]
+extern crate lazy_static;
+
+pub mod buffer;
 pub mod error;
+pub mod fixed_big_int;
+pub mod replay_detector;
 
+pub use crate::buffer::Buffer;
 pub use crate::error::Error;