spacebar/rust-nex
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 50 Wiki Activity Actions

fix(rmc): fix sending back errors crashing

Browse source
This commit is contained in:
DJMrTV 2025-02-03 20:37:31 +01:00
commit 28004f7b4d
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rmc/response.rs
View file

@ -7,8 +7,7 @@ use crate::prudp::packet::flags::{NEED_ACK, RELIABLE};
use crate::prudp::packet::PacketOption::FragmentId; use crate::prudp::packet::PacketOption::FragmentId;
use crate::prudp::packet::types::DATA; use crate::prudp::packet::types::DATA;
use crate::prudp::socket::{ConnectionData, SocketData}; use crate::prudp::socket::{ConnectionData, SocketData};
use crate::rmc::structures::qresult::ERROR_MASK;
pub enum RMCResponseResult { pub enum RMCResponseResult {
Success{ Success{
@ -67,6 +66,7 @@ pub fn generate_response(protocol_id: u8, response: RMCResponseResult) -> io::Re
} => { } => {
data_out.push(0); data_out.push(0);
let error_code_val: u32 = error_code.into(); let error_code_val: u32 = error_code.into();
let error_code_val = error_code_val | ERROR_MASK;
data_out.write_all(bytes_of(&error_code_val))?; data_out.write_all(bytes_of(&error_code_val))?;
data_out.write_all(bytes_of(&call_id))?; data_out.write_all(bytes_of(&call_id))?;
} }

2
src/rmc/structures/qresult.rs
View file

@ -5,7 +5,7 @@ use crate::endianness::{IS_BIG_ENDIAN, ReadExtensions};
use crate::rmc::response::ErrorCode; use crate::rmc::response::ErrorCode;
use crate::rmc::structures::{RmcSerialize, Result}; use crate::rmc::structures::{RmcSerialize, Result};
const ERROR_MASK: u32 = 1 << 31; pub const ERROR_MASK: u32 = 1 << 31;
#[derive(Pod, Zeroable, Copy, Clone, SwapEndian)] #[derive(Pod, Zeroable, Copy, Clone, SwapEndian)]
#[repr(transparent)] #[repr(transparent)]