Add support for radio stats

Author: Sh3Rm4n

examples/dump_nl80211_survey.rs

@@ -29,7 +29,11 @@ async fn dump_survey(if_index: u32) -> Result<(), Error> {
     let (connection, handle, _) = wl_nl80211::new_connection()?;
     tokio::spawn(connection);
 
-    let mut survey_handle = handle.survey().dump(if_index).execute().await;
+    let mut survey_handle = handle
+        .survey()
+        .dump(wl_nl80211::Nl80211Survey::new(if_index).radio(true).build())
+        .execute()
+        .await;
 
     let mut msgs = Vec::new();
     while let Some(msg) = survey_handle.try_next().await? {

src/attr.rs

@@ -339,7 +339,7 @@ const NL80211_ATTR_MAX_CSA_COUNTERS: u16 = 206;
 const NL80211_ATTR_MAC_MASK: u16 = 215;
 const NL80211_ATTR_WIPHY_SELF_MANAGED_REG: u16 = 216;
 const NL80211_ATTR_EXT_FEATURES: u16 = 217;
-// const NL80211_ATTR_SURVEY_RADIO_STATS:u16 = 218;
+const NL80211_ATTR_SURVEY_RADIO_STATS: u16 = 218;
 // const NL80211_ATTR_NETNS_FD:u16 = 219;
 const NL80211_ATTR_SCHED_SCAN_DELAY: u16 = 220;
 // const NL80211_ATTR_REG_INDOOR:u16 = 221;
@@ -520,6 +520,7 @@ pub enum Nl80211Attr {
     /// in milliseconds
     MaxRemainOnChannelDuration(u32),
     OffchannelTxOk,
+    SurveyRadioStats,
     WowlanTrigersSupport(Vec<Nl80211WowlanTrigersSupport>),
     SoftwareIftypes(Vec<Nl80211InterfaceType>),
     Features(Nl80211Features),
@@ -637,6 +638,7 @@ impl Nla for Nl80211Attr {
             | Self::TdlsExternalSetup
             | Self::ControlPortEthertype
             | Self::OffchannelTxOk
+            | Self::SurveyRadioStats
             | Self::WiphySelfManagedReg => 0,
             Self::CipherSuites(s) => 4 * s.len(),
             Self::SupportedIftypes(s) => s.as_slice().buffer_len(),
@@ -707,6 +709,7 @@ impl Nla for Nl80211Attr {
             Self::Ssid(_) => NL80211_ATTR_SSID,
             Self::StationInfo(_) => NL80211_ATTR_STA_INFO,
             Self::SurveyInfo(_) => NL80211_ATTR_SURVEY_INFO,
+            Self::SurveyRadioStats => NL80211_ATTR_SURVEY_RADIO_STATS,
             Self::TransmitQueueStats(_) => NL80211_ATTR_TXQ_STATS,
             Self::TransmitQueueLimit(_) => NL80211_ATTR_TXQ_LIMIT,
             Self::TransmitQueueMemoryLimit(_) => NL80211_ATTR_TXQ_MEMORY_LIMIT,
@@ -839,6 +842,7 @@ impl Nla for Nl80211Attr {
             | Self::TdlsExternalSetup
             | Self::ControlPortEthertype
             | Self::OffchannelTxOk
+            | Self::SurveyRadioStats
             | Self::WiphySelfManagedReg => (),
             Self::WiphyChannelType(d) => write_u32(buffer, (*d).into()),
             Self::ChannelWidth(d) => write_u32(buffer, (*d).into()),
@@ -1079,6 +1083,7 @@ impl<'a, T: AsRef<[u8]> + ?Sized> Parseable<NlaBuffer<&'a T>> for Nl80211Attr {
                 }
                 Self::SurveyInfo(nlas)
             }
+            NL80211_ATTR_SURVEY_RADIO_STATS => Self::SurveyRadioStats,
             NL80211_ATTR_TXQ_STATS => {
                 let err_msg = format!(
                     "Invalid NL80211_ATTR_TXQ_STATS value {:?}",

src/lib.rs

@@ -65,7 +65,8 @@ pub use self::stats::{
     NestedNl80211TidStats, Nl80211TidStats, Nl80211TransmitQueueStat,
 };
 pub use self::survey::{
-    Nl80211SurveyGetRequest, Nl80211SurveyHandle, Nl80211SurveyInfo,
+    Nl80211Survey, Nl80211SurveyGetRequest, Nl80211SurveyHandle,
+    Nl80211SurveyInfo,
 };
 pub use self::wifi4::{
     Nl80211ElementHtCap, Nl80211HtAMpduPara, Nl80211HtAselCaps,

src/survey/get.rs

@@ -11,12 +11,12 @@ use crate::{
 
 pub struct Nl80211SurveyGetRequest {
     handle: Nl80211Handle,
-    if_index: u32,
+    attributes: Vec<Nl80211Attr>,
 }
 
 impl Nl80211SurveyGetRequest {
-    pub(crate) fn new(handle: Nl80211Handle, if_index: u32) -> Self {
-        Self { handle, if_index }
+    pub(crate) fn new(handle: Nl80211Handle, attributes: Vec<Nl80211Attr>) -> Self {
+        Self { handle, attributes }
     }
 
     pub async fn execute(
@@ -25,10 +25,9 @@ impl Nl80211SurveyGetRequest {
     {
         let Self {
             mut handle,
-            if_index,
+            attributes,
         } = self;
 
-        let attributes = vec![Nl80211Attr::IfIndex(if_index)];
         let nl80211_msg = Nl80211Message {
             cmd: Nl80211Command::GetSurvey,
             attributes,

src/survey/handle.rs

@@ -1,17 +1,45 @@
 // SPDX-License-Identifier: MIT
 
-use crate::{Nl80211Handle, Nl80211SurveyGetRequest};
+use netlink_packet_utils::nla::Nla;
+
+use crate::{
+    Nl80211Attr, Nl80211AttrsBuilder, Nl80211Handle, Nl80211SurveyGetRequest,
+};
 
 pub struct Nl80211SurveyHandle(Nl80211Handle);
 
+#[derive(Debug)]
+pub struct Nl80211Survey;
+
+impl Nl80211Survey {
+    /// Perform a survey dump
+    pub fn new(if_index: u32) -> Nl80211AttrsBuilder<Self> {
+        Nl80211AttrsBuilder::<Self>::new().if_index(if_index)
+    }
+}
+
+impl Nl80211AttrsBuilder<Nl80211Survey> {
+    /// Request overall radio statistics to be returned along with other survey data
+    pub fn radio(self, value: bool) -> Self {
+        if value {
+            self.replace(Nl80211Attr::SurveyRadioStats)
+        } else {
+            self.remove(Nl80211Attr::SurveyRadioStats.kind())
+        }
+    }
+}
+
 impl Nl80211SurveyHandle {
     pub fn new(handle: Nl80211Handle) -> Self {
         Self(handle)
     }
 
     /// Retrieve the survey info
     /// (equivalent to `iw dev DEV survey dump`)
-    pub fn dump(&mut self, if_index: u32) -> Nl80211SurveyGetRequest {
-        Nl80211SurveyGetRequest::new(self.0.clone(), if_index)
+    pub fn dump(
+        &mut self,
+        attributes: Vec<Nl80211Attr>,
+    ) -> Nl80211SurveyGetRequest {
+        Nl80211SurveyGetRequest::new(self.0.clone(), attributes)
     }
 }

src/survey/mod.rs

@@ -5,5 +5,5 @@ mod handle;
 mod survey_info;
 
 pub use self::get::Nl80211SurveyGetRequest;
-pub use self::handle::Nl80211SurveyHandle;
+pub use self::handle::{Nl80211Survey, Nl80211SurveyHandle};
 pub use self::survey_info::Nl80211SurveyInfo;