Skip to content

Commit

Permalink
Fixed HTCapabilities.
Browse files Browse the repository at this point in the history
  • Loading branch information
Frostie314159 committed Sep 7, 2023
1 parent 069fd9f commit c35887f
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions src/tlvs/data/ht_capabilities_tlv/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@ pub struct HTCapabilitiesTLV {
pub rx_spatial_stream_count: u8,
}
#[cfg(feature = "read")]
impl ReadFixed<8> for HTCapabilitiesTLV {
fn from_bytes(data: &[u8; 8]) -> Result<Self, ParserError> {
let mut data = data.into_iter().copied();
impl Read for HTCapabilitiesTLV {
fn from_bytes(data: &mut impl ExactSizeIterator<Item = u8>) -> Result<Self, ParserError> {
let _ = data.next_chunk::<2>();
let mut fixed_data = try_take(&mut data, 3).map_err(ParserError::TooLittleData)?;
let mut fixed_data = try_take(data, 3).map_err(ParserError::TooLittleData)?;
let ht_capabilities_info =
HTCapabilitiesInfo::from(u16::from_le_bytes(fixed_data.next_chunk().unwrap()));
let a_mpdu_parameters = AMpduParameters::from(fixed_data.next().unwrap());
Expand Down Expand Up @@ -54,14 +53,13 @@ impl Write for HTCapabilitiesTLV {
.collect()
}
}
impl_tlv_conversion!(true, HTCapabilitiesTLV, TLVType::HTCapabilities, 8);

impl_tlv_conversion!(false, HTCapabilitiesTLV, TLVType::HTCapabilities, 6);
#[cfg(test)]
#[test]
fn test_ht_capabilities() {
use alloc::borrow::ToOwned;

let bytes = include_bytes!("../../../../test_bins/ht_capabilities_tlv.bin");
let bytes = include_bytes!("../../../../test_bins/ht_capabilities_tlv.bin")[3..].to_vec();
assert_eq!(
HTCapabilitiesInfo::from(0x1u16 | 0xCu16),
HTCapabilitiesInfo {
Expand All @@ -70,7 +68,7 @@ fn test_ht_capabilities() {
..Default::default()
}
);
let ht_capabilities_tlv = HTCapabilitiesTLV::from_bytes(&bytes[3..].try_into().unwrap()).unwrap();
let ht_capabilities_tlv = HTCapabilitiesTLV::from_bytes(&mut bytes.iter().copied()).unwrap();
assert_eq!(
ht_capabilities_tlv,
HTCapabilitiesTLV {
Expand Down

0 comments on commit c35887f

Please sign in to comment.