redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-06-30 11:47:45 +00:00
Code Activity

Don't make packet parsing async

Browse source 
This doesn't need to be marked as async, the code isn't.
This commit is contained in:
Joshua Goins 2025-06-26 19:09:13 -04:00
parent c5695f5ed7
commit 4f364ae330
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bin/kawari-lobby.rs
View file

@ -60,7 +60,7 @@ async fn main() {
.expect("Failed to read data!"); .expect("Failed to read data!");
if n != 0 { if n != 0 {
let (segments, _) = connection.parse_packet(&buf[..n]).await; let (segments, _) = connection.parse_packet(&buf[..n]);
for segment in &segments { for segment in &segments {
match &segment.data { match &segment.data {
SegmentData::SecuritySetup { phrase, key } => { SegmentData::SecuritySetup { phrase, key } => {

2
src/bin/kawari-world.rs
View file

@ -147,7 +147,7 @@ async fn client_loop(
if n > 0 { if n > 0 {
connection.last_keep_alive = Instant::now(); connection.last_keep_alive = Instant::now();
let (segments, connection_type) = connection.parse_packet(&buf[..n]).await; let (segments, connection_type) = connection.parse_packet(&buf[..n]);
for segment in &segments { for segment in &segments {
match &segment.data { match &segment.data {
SegmentData::None() => {}, SegmentData::None() => {},

6
src/lobby/connection.rs
View file

@ -40,11 +40,11 @@ pub struct LobbyConnection {
} }
impl LobbyConnection { impl LobbyConnection {
pub async fn parse_packet( pub fn parse_packet(
&mut self, &mut self,
data: &[u8], data: &[u8],
) -> (Vec<PacketSegment<ClientLobbyIpcSegment>>, ConnectionType) { ) -> (Vec<PacketSegment<ClientLobbyIpcSegment>>, ConnectionType) {
parse_packet(data, &mut self.state).await parse_packet(data, &mut self.state)
} }
pub async fn send_segment(&mut self, segment: PacketSegment<ServerLobbyIpcSegment>) { pub async fn send_segment(&mut self, segment: PacketSegment<ServerLobbyIpcSegment>) {
@ -567,7 +567,7 @@ pub async fn send_custom_world_packet(segment: CustomIpcSegment) -> Option<Custo
let mut buf = vec![0; RECEIVE_BUFFER_SIZE]; let mut buf = vec![0; RECEIVE_BUFFER_SIZE];
let n = stream.read(&mut buf).await.expect("Failed to read data!"); let n = stream.read(&mut buf).await.expect("Failed to read data!");
if n != 0 { if n != 0 {
let (segments, _) = parse_packet::<CustomIpcSegment>(&buf[..n], &mut packet_state).await; let (segments, _) = parse_packet::<CustomIpcSegment>(&buf[..n], &mut packet_state);
return match &segments[0].data { return match &segments[0].data {
SegmentData::KawariIpc { data } => Some(data.clone()), SegmentData::KawariIpc { data } => Some(data.clone()),

2
src/packet/parsing.rs
View file

@ -222,7 +222,7 @@ pub struct PacketState {
pub clientbound_oodle: OodleNetwork, pub clientbound_oodle: OodleNetwork,
} }
pub async fn parse_packet<T: ReadWriteIpcSegment>( pub fn parse_packet<T: ReadWriteIpcSegment>(
data: &[u8], data: &[u8],
state: &mut PacketState, state: &mut PacketState,
) -> (Vec<PacketSegment<T>>, ConnectionType) { ) -> (Vec<PacketSegment<T>>, ConnectionType) {

4
src/world/connection.rs
View file

@ -130,11 +130,11 @@ pub struct ZoneConnection {
} }
impl ZoneConnection { impl ZoneConnection {
pub async fn parse_packet( pub fn parse_packet(
&mut self, &mut self,
data: &[u8], data: &[u8],
) -> (Vec<PacketSegment<ClientZoneIpcSegment>>, ConnectionType) { ) -> (Vec<PacketSegment<ClientZoneIpcSegment>>, ConnectionType) {
parse_packet(data, &mut self.state).await parse_packet(data, &mut self.state)
} }
pub async fn send_segment(&mut self, segment: PacketSegment<ServerZoneIpcSegment>) { pub async fn send_segment(&mut self, segment: PacketSegment<ServerZoneIpcSegment>) {