mirrors/IronRDP
1
0
Fork 0
mirror of https://github.com/Devolutions/IronRDP.git synced 2025-08-04 15:18:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

refactor(pdu): use a newtype for Option<SystemTime>

Browse source 
This allows to implement the external Encode/Decode traits.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2024-08-26 23:59:19 +04:00 • committed by Benoît Cortier
parent 23bc008d65
commit fda9530ef6
3 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ironrdp-connector/src/connection.rs
View file

@ -3,7 +3,7 @@ use std::mem;
use std::net::SocketAddr;
use ironrdp_core::WriteBuf;
use ironrdp_pdu::rdp::client_info::TimezoneInfo;
use ironrdp_pdu::rdp::client_info::{OptionalSystemTime, TimezoneInfo};
use ironrdp_pdu::{decode, encode_vec, gcc, mcs, nego, rdp, Encode, PduHint};
use ironrdp_svc::{StaticChannelSet, StaticVirtualChannel, SvcClientProcessor};
@ -749,10 +749,10 @@ fn create_client_info_pdu(config: &Config, routing_addr: &SocketAddr) -> rdp::Cl
.timezone(TimezoneInfo {
bias: 0,
standard_name: String::new(),
standard_date: None,
standard_date: OptionalSystemTime(None),
standard_bias: 0,
daylight_name: String::new(),
daylight_date: None,
daylight_date: OptionalSystemTime(None),
daylight_bias: 0,
})
.session_id(0)

23
crates/ironrdp-pdu/src/rdp/client_info.rs
View file

@ -388,10 +388,10 @@ impl<'de> Decode<'de> for ExtendedClientOptionalInfo {
pub struct TimezoneInfo {
pub bias: u32,
pub standard_name: String,
pub standard_date: Option<SystemTime>,
pub standard_date: OptionalSystemTime,
pub standard_bias: u32,
pub daylight_name: String,
pub daylight_date: Option<SystemTime>,
pub daylight_date: OptionalSystemTime,
pub daylight_bias: u32,
}
@ -445,11 +445,11 @@ impl<'de> Decode<'de> for TimezoneInfo {
let bias = src.read_u32();
let standard_name = utils::decode_string(src.read_slice(TIMEZONE_INFO_NAME_LEN), CharacterSet::Unicode, false)?;
let standard_date = <Option<SystemTime>>::decode(src)?;
let standard_date = OptionalSystemTime::decode(src)?;
let standard_bias = src.read_u32();
let daylight_name = utils::decode_string(src.read_slice(TIMEZONE_INFO_NAME_LEN), CharacterSet::Unicode, false)?;
let daylight_date = <Option<SystemTime>>::decode(src)?;
let daylight_date = OptionalSystemTime::decode(src)?;
let daylight_bias = src.read_u32();
Ok(Self {
@ -481,12 +481,15 @@ impl SystemTime {
const FIXED_PART_SIZE: usize = 2 /* Year */ + 2 /* Month */ + 2 /* DoW */ + 2 /* Day */ + 2 /* Hour */ + 2 /* Minute */ + 2 /* Second */ + 2 /* Ms */;
}
impl Encode for Option<SystemTime> {
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct OptionalSystemTime(pub Option<SystemTime>);
impl Encode for OptionalSystemTime {
fn encode(&self, dst: &mut WriteCursor<'_>) -> EncodeResult<()> {
ensure_size!(in: dst, size: self.size());
dst.write_u16(0); // year
if let Some(st) = self {
if let Some(st) = &self.0 {
dst.write_u16(st.month.to_u16().unwrap());
dst.write_u16(st.day_of_week.to_u16().unwrap());
dst.write_u16(st.day.to_u16().unwrap());
@ -510,7 +513,7 @@ impl Encode for Option<SystemTime> {
}
}
impl<'de> Decode<'de> for Option<SystemTime> {
impl<'de> Decode<'de> for OptionalSystemTime {
fn decode(src: &mut ReadCursor<'de>) -> DecodeResult<Self> {
ensure_size!(in: src, size: SystemTime::FIXED_PART_SIZE);
@ -528,7 +531,7 @@ impl<'de> Decode<'de> for Option<SystemTime> {
DayOfWeek::from_u16(day_of_week),
DayOfWeekOccurrence::from_u16(day),
) {
(Some(month), Some(day_of_week), Some(day)) => Ok(Some(SystemTime {
(Some(month), Some(day_of_week), Some(day)) => Ok(Self(Some(SystemTime {
month,
day_of_week,
day,
@ -536,8 +539,8 @@ impl<'de> Decode<'de> for Option<SystemTime> {
minute,
second,
milliseconds,
})),
_ => Ok(None),
}))),
_ => Ok(Self(None)),
}
}
}

8
crates/ironrdp-testsuite-core/src/client_info.rs
View file

@ -103,7 +103,7 @@ lazy_static::lazy_static! {
.timezone(TimezoneInfo {
bias: 0x01e0,
standard_name: String::from("Pacific Standard Time"),
standard_date: Some(SystemTime {
standard_date: OptionalSystemTime(Some(SystemTime {
month: Month::October,
day_of_week: DayOfWeek::Sunday,
day: DayOfWeekOccurrence::Last,
@ -111,10 +111,10 @@ lazy_static::lazy_static! {
minute: 0,
second: 0,
milliseconds: 0,
}),
})),
standard_bias: 0,
daylight_name: String::from("Pacific Daylight Time"),
daylight_date: Some(SystemTime {
daylight_date: OptionalSystemTime(Some(SystemTime {
month: Month::April,
day_of_week: DayOfWeek::Sunday,
day: DayOfWeekOccurrence::First,
@ -122,7 +122,7 @@ lazy_static::lazy_static! {
minute: 0,
second: 0,
milliseconds: 0,
}),
})),
daylight_bias: 0xffff_ffc4,
})
.session_id(0)