Raven/osirose-new
SHA256
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 6 Releases Wiki Activity

- add: mouse cmd packet handling

Browse Source 
- add: change map handler
- update: logout handler to send the reply packet
- update: character id list change from u8 to u32
This commit is contained in:
raven
2025-01-28 22:48:11 -05:00
parent 09c10efb46
commit b5e16f0bef
7 changed files with 124 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packet-service/src/handlers/auth.rs
View File

@@ -1,15 +1,18 @@
use crate::auth_client::AuthClient;
use utils::null_string::NullTerminatedString;
use crate::connection_service::ConnectionService;
use crate::packet::{send_packet, Packet, PacketPayload};
use crate::packet_type::PacketType;
use crate::packets::cli_accept_req::CliAcceptReq;
use crate::packets::cli_channel_list_req::CliChannelListReq;
use crate::packets::cli_join_server_token_req::CliJoinServerTokenReq;
use crate::packets::cli_login_token_req::CliLoginTokenReq;
use crate::packets::cli_logout_req::CliLogoutReq;
use crate::packets::cli_srv_select_req::CliSrvSelectReq;
use crate::packets::srv_accept_reply::SrvAcceptReply;
use crate::packets::srv_channel_list_reply::{ChannelInfo, SrvChannelListReply};
use crate::packets::srv_join_server_reply::SrvJoinServerReply;
use crate::packets::srv_login_reply::{ServerInfo, SrvLoginReply};
use crate::packets::srv_logout_reply::SrvLogoutReply;
use crate::packets::srv_srv_select_reply::SrvSrvSelectReply;
use crate::packets::*;
use std::collections::HashMap;
@@ -17,15 +20,13 @@ use std::env;
use std::error::Error;
use std::net::SocketAddr;
use std::sync::Arc;
use tokio::io::AsyncWriteExt;
use tokio::net::TcpStream;
use tokio::sync::Mutex;
use tonic::{Code, Status};
use tracing::{debug, error, info, warn};
use utils::null_string::NullTerminatedString;
use utils::service_discovery;
use crate::connection_service::ConnectionService;
use crate::packets::cli_logout_req::CliLogoutReq;
use crate::packets::srv_join_server_reply::SrvJoinServerReply;
pub(crate) async fn handle_alive_req(stream: &mut TcpStream, packet: Packet, auth_client: Arc<Mutex<AuthClient>>, connection_service: Arc<ConnectionService>, connection_id: String) -> Result<(), Box<dyn Error + Send + Sync>> {
if let Some(mut state) = connection_service.get_connection(&connection_id) {
@@ -61,13 +62,13 @@ pub(crate) async fn handle_join_server_req(stream: &mut TcpStream, packet: Packe
let session = auth_client.validate_session(&session_id).await?;
if (!session.valid) {
warn!("Invalid session ID: {}", session_id);
let data = SrvJoinServerReply { result: srv_join_server_reply::Result::Failed, id: 0, pay_flag: 0 };
let response_packet = Packet::new(PacketType::PakscJoinServerReply, &data)?;
send_packet(stream, &response_packet).await?;
return Err("Session not valid".into());
}
let data = SrvJoinServerReply { result: srv_join_server_reply::Result::Ok, id: 1, pay_flag: 0 };
let response_packet = Packet::new(PacketType::PakscJoinServerReply, &data)?;
send_packet(stream, &response_packet).await?;
@@ -78,11 +79,15 @@ pub(crate) async fn handle_join_server_req(stream: &mut TcpStream, packet: Packe
}
pub(crate) async fn handle_logout_req(stream: &mut TcpStream, packet: Packet, auth_client: Arc<Mutex<AuthClient>>, connection_service: Arc<ConnectionService>, connection_id: String) -> Result<(), Box<dyn Error + Send + Sync>> {
let request = CliLogoutReq::decode(packet.payload.as_slice());
if let Some(mut state) = connection_service.get_connection(&connection_id) {
let session_id = state.session_id.clone().unwrap();
let mut auth_client = auth_client.lock().await;
auth_client.logout(&session_id).await?;
let data = SrvLogoutReply { wait_time: 1 };
let response_packet = Packet::new(PacketType::PakwcLogoutReply, &data)?;
send_packet(stream, &response_packet).await?;
stream.shutdown().await?;
Ok(())
} else {
Err("Unable to find connection state".into())
@@ -134,7 +139,7 @@ pub(crate) async fn handle_login_req(stream: &mut TcpStream, packet: Packet, aut
} else {
name = format!(" {}", name);
}
server_info.push(ServerInfo { test: u8::from(is_test), name: NullTerminatedString::new(&name), id});
server_info.push(ServerInfo { test: u8::from(is_test), name: NullTerminatedString::new(&name), id });
id = id + 1;
}
debug!("Server info: {:?}", server_info);
@@ -149,7 +154,7 @@ pub(crate) async fn handle_login_req(stream: &mut TcpStream, packet: Packet, aut
match tonic_status.code() {
Code::Unauthenticated => {
info!("Login failed: Invalid credentials");
let data = SrvLoginReply { result: srv_login_reply::Result::UnknownAccount, right: 0, type_: 0, servers_info: Vec::new() };
let response_packet = Packet::new(PacketType::PaklcLoginReply, &data)?;
send_packet(stream, &response_packet).await?;
@@ -190,7 +195,7 @@ pub(crate) async fn handle_server_select_req(stream: &mut TcpStream, packet: Pac
ip: NullTerminatedString::new(""), // If this is empty, the client should stay connected (requires client change)
port: 0, // See comment about ip above
};
let response_packet = Packet::new(PacketType::PaklcSrvSelectReply, &data)?;
send_packet(stream, &response_packet).await?;
Ok(())