Made AID optional.

Frostie314159 · Jan 18, 2025 · 800f5e4 · 800f5e4
1 parent ed5055b
commit 800f5e4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/frames/mgmt_frame/body/assoc.rs b/src/frames/mgmt_frame/body/assoc.rs
@@ -78,7 +78,7 @@ impl<ElementContainer: TryIntoCtx<Error = scroll::Error>> TryIntoCtx
 pub struct AssociationResponseBody<'a, ElementContainer = ReadElements<'a>> {
     pub capabilities_info: CapabilitiesInformation,
     pub status_code: IEEE80211StatusCode,
-    pub association_id: AssociationID,
+    pub association_id: Option<AssociationID>,
     pub elements: ElementContainer,
     pub _phantom: PhantomData<&'a ()>,
 }
@@ -96,13 +96,19 @@ impl<'a> TryFromCtx<'a> for AssociationResponseBody<'a> {
             CapabilitiesInformation::from_bits(from.gread_with(&mut offset, Endian::Little)?);
         let status_code =
             IEEE80211StatusCode::from_bits(from.gread_with(&mut offset, Endian::Little)?);
-        let association_id = AssociationID::new_checked(
-            from.gread_with(&mut offset, Endian::Little)?,
-        )
-        .ok_or(scroll::Error::BadInput {
-            size: offset,
-            msg: "Association ID is out of bounds.",
-        })?;
+        let association_id = from.gread_with::<u16>(&mut offset, Endian::Little)?;
+        let association_id = if association_id == 0 {
+            None
+        } else {
+            Some(
+                AssociationID::new_checked(from.gread_with(&mut offset, Endian::Little)?).ok_or(
+                    scroll::Error::BadInput {
+                        size: offset,
+                        msg: "Association ID is out of bounds.",
+                    },
+                )?,
+            )
+        };
         let elements = from.gread(&mut offset)?;
 
         Ok((
@@ -137,7 +143,13 @@ impl<ElementContainer: TryIntoCtx<Error = scroll::Error>> TryIntoCtx
             Endian::Little,
         )?;
         buf.gwrite_with(self.status_code.into_bits(), &mut offset, Endian::Little)?;
-        buf.gwrite_with(self.association_id.into_bits(), &mut offset, Endian::Little)?;
+        buf.gwrite_with(
+            self.association_id
+                .map(AssociationID::into_bits)
+                .unwrap_or_default(),
+            &mut offset,
+            Endian::Little,
+        )?;
         buf.gwrite(self.elements, &mut offset)?;
 
         Ok(offset)