Use RawNl80211Elements (#1)

Author: Sh3Rm4n

examples/dump_nl80211_scan.rs

@@ -3,7 +3,7 @@
 use std::env::args;
 
 use futures::stream::TryStreamExt;
-use netlink_packet_core::{DecodeError, ErrorContext};
+use netlink_packet_core::{DecodeError, Emitable, ErrorContext, Parseable};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let argv: Vec<_> = args().collect();
@@ -41,5 +41,21 @@ async fn dump_scan(if_index: u32) {
     assert!(!msgs.is_empty());
     for msg in msgs {
         println!("{msg:?}");
+
+        println!("Information Elements");
+        let ie: Vec<_> =
+            msg.payload.attributes.iter().filter_map(|attr| match attr {
+                wl_nl80211::Nl80211Attr::Bss(info) => {
+                    let ies: Vec<_>  = info.iter().filter_map(|info| match info {
+                    wl_nl80211::Nl80211BssInfo::BeaconInformationElements(ie)| wl_nl80211::Nl80211BssInfo::InformationElements(ie) | wl_nl80211::Nl80211BssInfo::ProbeResponseInformationElements(ie) =>
+                        Some(wl_nl80211::Nl80211Elements::parse(ie).unwrap()),
+                        _ => None,
+                    }).collect();
+                    Some(ies)
+                },
+                _ => None,
+            }).flatten().collect();
+
+        println!("{ie:?}");
     }
 }

src/element.rs

@@ -10,7 +10,41 @@ use crate::{
     Nl80211ElementHtCap,
 };
 
-pub(crate) struct Nl80211Elements(Vec<Nl80211Element>);
+/// Unparsed representation of IEEE 802.11-2020 `9.4.2 Elements`
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct RawNl80211Elements(pub Vec<u8>);
+
+impl<T: AsRef<[u8]> + ?Sized> Parseable<T> for RawNl80211Elements {
+    fn parse(raw: &T) -> Result<Self, DecodeError> {
+        let v = Vec::from(raw.as_ref());
+        Ok(RawNl80211Elements::from(v))
+    }
+}
+
+impl Parseable<RawNl80211Elements> for Nl80211Elements {
+    fn parse(raw: &RawNl80211Elements) -> Result<Self, DecodeError> {
+        Nl80211Elements::parse(&raw.0)
+    }
+}
+
+impl Emitable for RawNl80211Elements {
+    fn buffer_len(&self) -> usize {
+        self.0.len()
+    }
+
+    fn emit(&self, buffer: &mut [u8]) {
+        buffer.copy_from_slice(self.0.as_slice());
+    }
+}
+
+impl From<Vec<u8>> for RawNl80211Elements {
+    fn from(value: Vec<u8>) -> Self {
+        RawNl80211Elements(value)
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct Nl80211Elements(Vec<Nl80211Element>);
 
 impl<T: AsRef<[u8]> + ?Sized> Parseable<T> for Nl80211Elements {
     fn parse(buf: &T) -> Result<Self, DecodeError> {

src/lib.rs

@@ -35,7 +35,7 @@ pub use self::command::Nl80211Command;
 #[cfg(feature = "tokio_socket")]
 pub use self::connection::new_connection;
 pub use self::connection::new_connection_with_socket;
-pub use self::element::Nl80211Element;
+pub use self::element::{Nl80211Element, Nl80211Elements, RawNl80211Elements};
 pub use self::error::Nl80211Error;
 pub use self::ext_cap::{
     Nl80211ExtendedCapability, Nl80211IfTypeExtCapa, Nl80211IfTypeExtCapas,
@@ -95,7 +95,6 @@ pub use self::wiphy::{
     Nl80211WowlanTrigerPatternSupport, Nl80211WowlanTriggersSupport,
 };
 
-pub(crate) use self::element::Nl80211Elements;
 pub(crate) use self::feature::Nl80211ExtFeatures;
 pub(crate) use self::handle::nl80211_execute;
 pub(crate) use self::iface::Nl80211InterfaceTypes;

src/scan/bss_info.rs

@@ -39,7 +39,7 @@ use netlink_packet_core::{
 
 use crate::{
     bytes::{write_i32, write_u16, write_u32, write_u64},
-    Nl80211Element, Nl80211Elements,
+    RawNl80211Elements,
 };
 
 bitflags::bitflags! {
@@ -155,15 +155,15 @@ pub enum Nl80211BssInfo {
     /// Beacon interval of the (I)BSS
     BeaconInterval(u16),
     Capability(Nl80211BssCapabilities),
-    InformationElements(Vec<Nl80211Element>),
+    InformationElements(RawNl80211Elements),
     SignalMbm(i32),
     SignalUnspec(u8),
     Status(u32),
     SeenMsAgo(u32),
-    BeaconInformationElements(Vec<Nl80211Element>),
+    BeaconInformationElements(RawNl80211Elements),
     ChanWidth(u32),
     BeaconTsf(u64),
-    ProbeResponseInformationElements(Vec<Nl80211Element>),
+    ProbeResponseInformationElements(RawNl80211Elements),
     /// `CLOCK_BOOTTIME` timestamp when this entry was last updated by a
     /// received frame. The value is expected to be accurate to about 10ms.
     /// (u64, nanoseconds)
@@ -189,9 +189,7 @@ impl Nla for Nl80211BssInfo {
             Self::BeaconTsf(_) | Self::Tsf(_) | Self::LastSeenBootTime(_) => 8,
             Self::InformationElements(v)
             | Self::BeaconInformationElements(v)
-            | Self::ProbeResponseInformationElements(v) => {
-                Nl80211Elements::from(v).buffer_len()
-            }
+            | Self::ProbeResponseInformationElements(v) => v.buffer_len(),
             Self::Capability(_) => Nl80211BssCapabilities::LENGTH,
             Self::UseFor(_) => Nl80211BssUseFor::LENGTH,
             Self::Other(attr) => attr.value_len(),
@@ -237,9 +235,7 @@ impl Nla for Nl80211BssInfo {
             }
             Self::InformationElements(v)
             | Self::BeaconInformationElements(v)
-            | Self::ProbeResponseInformationElements(v) => {
-                Nl80211Elements::from(v).emit(buffer)
-            }
+            | Self::ProbeResponseInformationElements(v) => v.emit(buffer),
             Self::Capability(v) => v.emit(buffer),
             Self::UseFor(v) => v.emit(buffer),
             Self::Other(ref attr) => attr.emit(buffer),
@@ -284,13 +280,13 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>>
                 Self::Capability(Nl80211BssCapabilities::parse(payload)?)
             }
             NL80211_BSS_BEACON_IES => Self::BeaconInformationElements(
-                Nl80211Elements::parse(payload)?.into(),
-            ),
-            NL80211_BSS_INFORMATION_ELEMENTS => Self::InformationElements(
-                Nl80211Elements::parse(payload)?.into(),
+                RawNl80211Elements::parse(payload)?,
             ),
+            NL80211_BSS_INFORMATION_ELEMENTS => {
+                Self::InformationElements(RawNl80211Elements::parse(payload)?)
+            }
             NL80211_BSS_PRESP_DATA => Self::ProbeResponseInformationElements(
-                Nl80211Elements::parse(payload)?.into(),
+                RawNl80211Elements::parse(payload)?,
             ),
             NL80211_BSS_SIGNAL_MBM => {
                 let err_msg =