move data_channel out of transport

webrtc-rs · Mar 24, 2024 · d4d56c9 · d4d56c9
1 parent bbb4887
commit d4d56c9
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 11 deletions.
diff --git a/...ansport/data_channel/data_channel_init.rs → rtc/src/data_channel/data_channel_init.rs b/...ansport/data_channel/data_channel_init.rs → rtc/src/data_channel/data_channel_init.rs
diff --git a/...port/data_channel/data_channel_message.rs → rtc/src/data_channel/data_channel_message.rs b/...port/data_channel/data_channel_message.rs → rtc/src/data_channel/data_channel_message.rs
diff --git a/...t/data_channel/data_channel_parameters.rs → ...c/data_channel/data_channel_parameters.rs b/...t/data_channel/data_channel_parameters.rs → ...c/data_channel/data_channel_parameters.rs
diff --git a/...nsport/data_channel/data_channel_state.rs → rtc/src/data_channel/data_channel_state.rs b/...nsport/data_channel/data_channel_state.rs → rtc/src/data_channel/data_channel_state.rs
diff --git a/...ansport/data_channel/data_channel_test.rs → rtc/src/data_channel/data_channel_test.rs b/...ansport/data_channel/data_channel_test.rs → rtc/src/data_channel/data_channel_test.rs
diff --git a/rtc/src/transport/data_channel/mod.rs → rtc/src/data_channel/mod.rs b/rtc/src/transport/data_channel/mod.rs → rtc/src/data_channel/mod.rs
diff --git a/rtc/src/handlers/demuxer.rs → rtc/src/handler/demuxer.rs b/rtc/src/handlers/demuxer.rs → rtc/src/handler/demuxer.rs
@@ -1,4 +1,4 @@
-use crate::handlers::RTCHandler;
+use crate::handler::RTCHandler;
 use crate::messages::{DTLSMessage, RTCMessage, RTPMessage, STUNMessage};
 use log::{debug, error};
 use shared::Transmit;

diff --git a/rtc/src/handlers/dtls.rs → rtc/src/handler/dtls.rs b/rtc/src/handlers/dtls.rs → rtc/src/handler/dtls.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use std::time::Instant;
 
 use crate::api::setting_engine::SettingEngine;
-use crate::handlers::RTCHandler;
+use crate::handler::RTCHandler;
 use crate::messages::{DTLSMessage, RTCEvent, RTCMessage};
 use crate::transport::dtls_transport::RTCDtlsTransport;
 use dtls::endpoint::EndpointEvent;

diff --git a/rtc/src/handlers/ice.rs → rtc/src/handler/ice.rs b/rtc/src/handlers/ice.rs → rtc/src/handler/ice.rs
@@ -1,4 +1,4 @@
-use crate::handlers::RTCHandler;
+use crate::handler::RTCHandler;
 use crate::messages::{RTCEvent, RTCMessage, STUNMessage};
 use crate::transport::ice_transport::ice_candidate_pair::RTCIceCandidatePair;
 use crate::transport::ice_transport::{IceTransportEvent, RTCIceTransport};

diff --git a/rtc/src/handlers/mod.rs → rtc/src/handler/mod.rs b/rtc/src/handlers/mod.rs → rtc/src/handler/mod.rs
diff --git a/rtc/src/handlers/sctp.rs → rtc/src/handler/sctp.rs b/rtc/src/handlers/sctp.rs → rtc/src/handler/sctp.rs
@@ -1,4 +1,4 @@
-use crate::handlers::RTCHandler;
+use crate::handler::RTCHandler;
 use crate::messages::{
     DTLSMessage, DataChannelMessage, DataChannelMessageParams, DataChannelMessageType, RTCEvent,
     RTCMessage,

diff --git a/rtc/src/lib.rs b/rtc/src/lib.rs
@@ -7,7 +7,8 @@ extern crate lazy_static;
 */
 pub mod api;
 pub mod constants;
-pub mod handlers;
+pub mod data_channel;
+pub mod handler;
 pub mod messages;
 pub mod peer_connection;
 pub mod rtp_transceiver;

diff --git a/rtc/src/messages.rs b/rtc/src/messages.rs
@@ -1,4 +1,4 @@
-use crate::transport::data_channel::DataChannelEvent;
+use crate::data_channel::DataChannelEvent;
 use crate::transport::dtls_transport::DtlsTransportEvent;
 use crate::transport::ice_transport::IceTransportEvent;
 use crate::transport::sctp_transport::SctpTransportEvent;

diff --git a/rtc/src/stats/mod.rs b/rtc/src/stats/mod.rs
@@ -8,11 +8,11 @@ use std::collections::HashMap;
 use std::time::Instant;
 use std::time::SystemTime;
 
+use crate::data_channel::data_channel_state::RTCDataChannelState;
+use crate::data_channel::RTCDataChannel;
 use crate::peer_connection::certificate::RTCCertificate;
 use crate::rtp_transceiver::rtp_codec::RTCRtpCodecParameters;
 use crate::rtp_transceiver::{PayloadType, SSRC};
-use crate::transport::data_channel::data_channel_state::RTCDataChannelState;
-use crate::transport::data_channel::RTCDataChannel;
 use crate::transport::dtls_transport::dtls_fingerprint::RTCDtlsFingerprint;
 use crate::transport::sctp_transport::RTCSctpTransport;
 

diff --git a/rtc/src/transport/mod.rs b/rtc/src/transport/mod.rs
@@ -1,4 +1,3 @@
-pub mod data_channel;
 pub mod dtls_transport;
 pub mod ice_transport;
 pub mod sctp_transport;

diff --git a/rtc/src/transport/sctp_transport/mod.rs b/rtc/src/transport/sctp_transport/mod.rs
@@ -13,8 +13,8 @@ use std::sync::Arc;
 
 use crate::api::setting_engine::SettingEngine;
 //use crate::transports::data_channel::data_channel_parameters::DataChannelParameters;
-use crate::transport::data_channel::data_channel_state::RTCDataChannelState;
-use crate::transport::data_channel::RTCDataChannel;
+use crate::data_channel::data_channel_state::RTCDataChannelState;
+use crate::data_channel::RTCDataChannel;
 use crate::transport::dtls_transport::dtls_role::DTLSRole;
 //use crate::transports::dtls_transport::*;
 use crate::messages::RTCMessage;