mercuryworkshop-mirror/epoxy-tls
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/epoxy-tls.git synced 2025-05-12 14:00:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/inner.rs -> src/mux/inner.rs

Browse source
This commit is contained in:
Toshit Chawda 2024-10-29 19:59:40 -07:00
parent cf6c8b8b89
commit d0ef03e029
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
wisp/src/lib.rs
View file

@ -11,7 +11,6 @@ mod fastwebsockets;
#[cfg(feature = "generic_stream")] #[cfg(feature = "generic_stream")]
#[cfg_attr(docsrs, doc(cfg(feature = "generic_stream")))] #[cfg_attr(docsrs, doc(cfg(feature = "generic_stream")))]
pub mod generic; pub mod generic;
mod inner;
mod mux; mod mux;
mod packet; mod packet;
mod stream; mod stream;

7
wisp/src/mux/client.rs
View file

@ -11,7 +11,6 @@ use futures::channel::oneshot;
use crate::{ use crate::{
extensions::{udp::UdpProtocolExtension, AnyProtocolExtension}, extensions::{udp::UdpProtocolExtension, AnyProtocolExtension},
inner::{MuxInner, WsEvent},
mux::send_info_packet, mux::send_info_packet,
ws::{AppendingWebSocketRead, LockedWebSocketWrite, Payload, WebSocketRead, WebSocketWrite}, ws::{AppendingWebSocketRead, LockedWebSocketWrite, Payload, WebSocketRead, WebSocketWrite},
CloseReason, MuxProtocolExtensionStream, MuxStream, Packet, PacketType, Role, StreamType, CloseReason, MuxProtocolExtensionStream, MuxStream, Packet, PacketType, Role, StreamType,
@ -19,8 +18,10 @@ use crate::{
}; };
use super::{ use super::{
get_supported_extensions, validate_continue_packet, Multiplexor, MuxResult, get_supported_extensions,
WispHandshakeResult, WispHandshakeResultKind, WispV2Handshake, inner::{MuxInner, WsEvent},
validate_continue_packet, Multiplexor, MuxResult, WispHandshakeResult, WispHandshakeResultKind,
WispV2Handshake,
}; };
async fn handshake<R: WebSocketRead>( async fn handshake<R: WebSocketRead>(

0
wisp/src/inner.rs → wisp/src/mux/inner.rs
View file

1
wisp/src/mux/mod.rs
View file

@ -1,4 +1,5 @@
mod client; mod client;
pub(crate) mod inner;
mod server; mod server;
use std::{future::Future, pin::Pin}; use std::{future::Future, pin::Pin};

7
wisp/src/mux/server.rs
View file

@ -11,15 +11,16 @@ use futures::channel::oneshot;
use crate::{ use crate::{
extensions::AnyProtocolExtension, extensions::AnyProtocolExtension,
inner::{MuxInner, WsEvent},
ws::{AppendingWebSocketRead, LockedWebSocketWrite, Payload, WebSocketRead, WebSocketWrite}, ws::{AppendingWebSocketRead, LockedWebSocketWrite, Payload, WebSocketRead, WebSocketWrite},
CloseReason, ConnectPacket, MuxProtocolExtensionStream, MuxStream, Packet, PacketType, Role, CloseReason, ConnectPacket, MuxProtocolExtensionStream, MuxStream, Packet, PacketType, Role,
WispError, WispError,
}; };
use super::{ use super::{
get_supported_extensions, send_info_packet, Multiplexor, MuxResult, WispHandshakeResult, get_supported_extensions,
WispHandshakeResultKind, WispV2Handshake, inner::{MuxInner, WsEvent},
send_info_packet, Multiplexor, MuxResult, WispHandshakeResult, WispHandshakeResultKind,
WispV2Handshake,
}; };
async fn handshake<R: WebSocketRead>( async fn handshake<R: WebSocketRead>(

4
wisp/src/stream/mod.rs
View file

@ -3,9 +3,7 @@ mod sink_unfold;
pub use compat::*; pub use compat::*;
use crate::{ use crate::{
inner::WsEvent, inner::WsEvent, ws::{Frame, LockedWebSocketWrite, Payload}, AtomicCloseReason, CloseReason, Packet, Role, StreamType, WispError
ws::{Frame, LockedWebSocketWrite, Payload},
AtomicCloseReason, CloseReason, Packet, Role, StreamType, WispError,
}; };
use bytes::{BufMut, Bytes, BytesMut}; use bytes::{BufMut, Bytes, BytesMut};