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

fix crates.io fastwebsockets integration

Browse source
This commit is contained in:
Toshit Chawda 2024-07-22 16:47:29 -07:00
parent 434e9e72ea
commit 87b39f45dc
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
wisp/src/fastwebsockets.rs
View file

@ -26,6 +26,15 @@ fn match_payload_reverse(payload: crate::ws::Payload<'_>) -> Payload<'_> {
}
}
fn payload_to_bytesmut(payload: Payload<'_>) -> BytesMut {
match payload {
Payload::Borrowed(borrowed) => BytesMut::from(borrowed),
Payload::BorrowedMut(borrowed_mut) => BytesMut::from(&*borrowed_mut),
Payload::Owned(owned) => BytesMut::from(owned.as_slice()),
Payload::Bytes(b) => b,
}
}
impl From<OpCode> for crate::ws::OpCode {
fn from(opcode: OpCode) -> Self {
use OpCode::*;
@ -105,7 +114,7 @@ impl<S: AsyncRead + Unpin + Send> crate::ws::WebSocketRead for WebSocketRead<S>
)));
}
let mut buf = BytesMut::from(frame.payload);
let mut buf = payload_to_bytesmut(frame.payload);
let opcode = frame.opcode;
while !frame.fin {
@ -145,7 +154,7 @@ impl<S: AsyncRead + Unpin + Send> crate::ws::WebSocketRead for WebSocketRead<S>
)));
}
let mut buf = BytesMut::from(frame.payload);
let mut buf = payload_to_bytesmut(frame.payload);
let opcode = frame.opcode;
while !frame.fin {
@ -159,7 +168,7 @@ impl<S: AsyncRead + Unpin + Send> crate::ws::WebSocketRead for WebSocketRead<S>
)));
}
if frame_cnt == 1 {
let payload = BytesMut::from(frame.payload);
let payload = payload_to_bytesmut(frame.payload);
extra_frame = Some(crate::ws::Frame {
opcode: opcode.into(),
payload: crate::ws::Payload::Bytes(payload),