From c4d3da1f9489c5ecd0993b11dddaae9fa3a2ac1ae40add4b01fc7e7c9e7d8339 Mon Sep 17 00:00:00 2001 From: RavenX8 <7156279+RavenX8@users.noreply.github.com> Date: Sun, 9 Mar 2025 17:04:13 -0400 Subject: [PATCH] - fix: formatting for packet routing --- packet-service/src/router.rs | 121 ++++------------------------------- 1 file changed, 12 insertions(+), 109 deletions(-) diff --git a/packet-service/src/router.rs b/packet-service/src/router.rs index 99dfd3f..49b0dc9 100644 --- a/packet-service/src/router.rs +++ b/packet-service/src/router.rs @@ -73,6 +73,7 @@ impl PacketRouter { Ok(()) } + #[rustfmt::skip] pub async fn route_packet( &self, stream: &mut TcpStream, @@ -82,122 +83,24 @@ impl PacketRouter { debug!("Routing packet: {:?}", packet); match packet.packet_type { // Generic Server Packets - PacketType::PakcsAlive => { - auth::handle_alive_req( - stream, - packet, - self.auth_client.clone(), - self.connection_service.clone(), - connection_id, - ) - .await - } + PacketType::PakcsAlive => auth::handle_alive_req(stream, packet, self.auth_client.clone(), self.connection_service.clone(), connection_id).await, PacketType::PakcsAcceptReq => auth::handle_accept_req(stream, packet).await, - PacketType::PakcsJoinServerTokenReq => { - auth::handle_join_server_req( - stream, - packet, - self.auth_client.clone(), - self.connection_service.clone(), - connection_id, - ) - .await - } + PacketType::PakcsJoinServerTokenReq => auth::handle_join_server_req(stream, packet, self.auth_client.clone(), self.connection_service.clone(), connection_id).await, // Login Packets - PacketType::PakcsLoginTokenReq => { - auth::handle_login_req( - stream, - packet, - self.auth_client.clone(), - self.connection_service.clone(), - connection_id, - stream.peer_addr()?, - ) - .await - } - PacketType::PakcsLogoutReq => { - auth::handle_logout_req( - stream, - packet, - self.auth_client.clone(), - self.connection_service.clone(), - connection_id, - ) - .await - } - PacketType::PakcsSrvSelectReq => { - auth::handle_server_select_req( - stream, - packet, - self.connection_service.clone(), - connection_id, - ) - .await - } + PacketType::PakcsLoginTokenReq => auth::handle_login_req(stream, packet, self.auth_client.clone(), self.connection_service.clone(), connection_id, stream.peer_addr()?).await, + PacketType::PakcsLogoutReq => auth::handle_logout_req(stream, packet, self.auth_client.clone(), self.connection_service.clone(), connection_id).await, + PacketType::PakcsSrvSelectReq => auth::handle_server_select_req(stream, packet, self.connection_service.clone(), connection_id).await, PacketType::PakcsChannelListReq => auth::handle_channel_list_req(stream, packet).await, // Character Packets - PacketType::PakcsCharListReq => { - character::handle_char_list_req( - stream, - packet, - self.character_client.clone(), - self.connection_service.clone(), - connection_id, - ) - .await - } - PacketType::PakcsCreateCharReq => { - character::handle_create_char_req( - stream, - packet, - self.character_client.clone(), - self.connection_service.clone(), - connection_id, - ) - .await - } - PacketType::PakcsDeleteCharReq => { - character::handle_delete_char_req( - stream, - packet, - self.character_client.clone(), - self.connection_service.clone(), - connection_id, - ) - .await - } - PacketType::PakcsSelectCharReq => { - character::handle_select_char_req( - stream, - packet, - self.character_client.clone(), - self.connection_service.clone(), - connection_id, - ) - .await - } + PacketType::PakcsCharListReq => character::handle_char_list_req(stream, packet, self.character_client.clone(), self.connection_service.clone(), connection_id).await, + PacketType::PakcsCreateCharReq => character::handle_create_char_req(stream, packet, self.character_client.clone(), self.connection_service.clone(), connection_id).await, + PacketType::PakcsDeleteCharReq => character::handle_delete_char_req(stream, packet, self.character_client.clone(), self.connection_service.clone(), connection_id).await, + PacketType::PakcsSelectCharReq => character::handle_select_char_req(stream, packet, self.character_client.clone(), self.connection_service.clone(), connection_id).await, // World Packets - PacketType::PakcsChangeMapReq => { - world::handle_change_map_req( - stream, - packet, - self.character_client.clone(), - self.connection_service.clone(), - connection_id, - ) - .await - } - PacketType::PakcsMouseCmd => { - world::handle_mouse_cmd_req( - stream, - packet, - self.connection_service.clone(), - connection_id, - ) - .await - } + PacketType::PakcsChangeMapReq => world::handle_change_map_req(stream, packet, self.character_client.clone(), self.connection_service.clone(), connection_id).await, + PacketType::PakcsMouseCmd => world::handle_mouse_cmd_req(stream, packet, self.connection_service.clone(), connection_id).await, // 1 => chat::handle_chat(packet).await?, // 2 => movement::handle_movement(packet).await?,