diff --git a/src/bin/kawari-lobby.rs b/src/bin/kawari-lobby.rs index 46bdbb8..2d46763 100644 --- a/src/bin/kawari-lobby.rs +++ b/src/bin/kawari-lobby.rs @@ -60,7 +60,7 @@ async fn main() { .expect("Failed to read data!"); if n != 0 { - let (segments, _) = connection.parse_packet(&buf[..n]).await; + let (segments, _) = connection.parse_packet(&buf[..n]); for segment in &segments { match &segment.data { SegmentData::SecuritySetup { phrase, key } => { diff --git a/src/bin/kawari-world.rs b/src/bin/kawari-world.rs index 9587365..b83cb54 100644 --- a/src/bin/kawari-world.rs +++ b/src/bin/kawari-world.rs @@ -147,7 +147,7 @@ async fn client_loop( if n > 0 { 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 { match &segment.data { SegmentData::None() => {}, diff --git a/src/lobby/connection.rs b/src/lobby/connection.rs index cb1be61..e1c2690 100644 --- a/src/lobby/connection.rs +++ b/src/lobby/connection.rs @@ -40,11 +40,11 @@ pub struct LobbyConnection { } impl LobbyConnection { - pub async fn parse_packet( + pub fn parse_packet( &mut self, data: &[u8], ) -> (Vec>, ConnectionType) { - parse_packet(data, &mut self.state).await + parse_packet(data, &mut self.state) } pub async fn send_segment(&mut self, segment: PacketSegment) { @@ -567,7 +567,7 @@ pub async fn send_custom_world_packet(segment: CustomIpcSegment) -> Option(&buf[..n], &mut packet_state).await; + let (segments, _) = parse_packet::(&buf[..n], &mut packet_state); return match &segments[0].data { SegmentData::KawariIpc { data } => Some(data.clone()), diff --git a/src/packet/parsing.rs b/src/packet/parsing.rs index ce9275f..a30b136 100644 --- a/src/packet/parsing.rs +++ b/src/packet/parsing.rs @@ -222,7 +222,7 @@ pub struct PacketState { pub clientbound_oodle: OodleNetwork, } -pub async fn parse_packet( +pub fn parse_packet( data: &[u8], state: &mut PacketState, ) -> (Vec>, ConnectionType) { diff --git a/src/world/connection.rs b/src/world/connection.rs index 5a9e255..548fbc8 100644 --- a/src/world/connection.rs +++ b/src/world/connection.rs @@ -130,11 +130,11 @@ pub struct ZoneConnection { } impl ZoneConnection { - pub async fn parse_packet( + pub fn parse_packet( &mut self, data: &[u8], ) -> (Vec>, ConnectionType) { - parse_packet(data, &mut self.state).await + parse_packet(data, &mut self.state) } pub async fn send_segment(&mut self, segment: PacketSegment) {