Merge pull request #19 from datdenkikniet/sdrs

Sdrs

CHANGELOG.md

@@ -10,6 +10,7 @@
 * Rudimentary RMCP+ support. ([#13])
 * Add more SDR record types. ([#10], [#18])
 * Breaking change: improve error reporting in SDR records. ([#10], [#18])
+* Fix SDR iteration. ([#19])
 
 [#6]: https://github.com/datdenkikniet/ipmi-rs/pull/6
 [#7]: https://github.com/datdenkikniet/ipmi-rs/pull/7
@@ -19,6 +20,7 @@
 [#13]: https://github.com/datdenkikniet/ipmi-rs/pull/13
 [#14]: https://github.com/datdenkikniet/ipmi-rs/pull/14
 [#18]: https://github.com/datdenkikniet/ipmi-rs/pull/18
+[#19]: https://github.com/datdenkikniet/ipmi-rs/pull/19
 
 # [0.2.1](https://github.com/datdenkikniet/ipmi-rs/tree/v0.2.1)
 

src/lib.rs

@@ -114,6 +114,12 @@ where
 
     fn next(&mut self) -> Option<Self::Item> {
         let current_id = self.next_id?;
+
+        if current_id.is_last() {
+            self.next_id.take();
+            return None;
+        }
+
         let next_record = self
             .ipmi
             .send_recv(sdr::GetDeviceSdr::new(None, current_id));
@@ -125,14 +131,14 @@ where
                 (Some(record.record), next_record_id)
             }
             Err(IpmiError::ParsingFailed {
-                error: ParseResponseError::Parse((e, next_id)),
+                error: ParseResponseError::Parse((e, next_record_id)),
                 ..
             }) => {
                 log::warn!(
                     "Recoverable error while parsing SDR record 0x{:04X}: {e:?}",
                     current_id.value()
                 );
-                (None, next_id)
+                (None, next_record_id)
             }
             Err(e) => {
                 log::error!(
@@ -144,16 +150,12 @@ where
             }
         };
 
-        if current_id.is_last() {
+        if next_record_id == current_id {
+            log::error!("Got duplicate SDR record IDs! Stopping iteration.");
             self.next_id.take();
+            return None;
         } else {
-            if next_record_id == current_id {
-                log::error!("Got duplicate SDR record IDs! Stopping iteration.");
-                self.next_id.take();
-                return None;
-            } else {
-                self.next_id = Some(next_record_id);
-            }
+            self.next_id = Some(next_record_id);
         }
 
         value

src/storage/sdr/record/mod.rs

@@ -712,38 +712,19 @@ pub enum RecordContents {
 
 impl Record {
     pub fn common_data(&self) -> Option<&SensorRecordCommon> {
-        match &self.contents {
-            RecordContents::FullSensor(s) => Some(s.common()),
-            RecordContents::CompactSensor(s) => Some(s.common()),
-            RecordContents::EventOnlySensor(_) => None,
-            RecordContents::FruDeviceLocator(_) => None,
-            RecordContents::McDeviceLocator(_) => None,
-            RecordContents::Unknown { .. } => None,
-        }
+        self.contents.common_data()
     }
 
     pub fn full_sensor(&self) -> Option<&FullSensorRecord> {
-        if let RecordContents::FullSensor(full_sensor) = &self.contents {
-            Some(full_sensor)
-        } else {
-            None
-        }
+        self.contents.full_sensor()
     }
 
     pub fn compact_sensor(&self) -> Option<&CompactSensorRecord> {
-        if let RecordContents::CompactSensor(compact_sensor) = &self.contents {
-            Some(compact_sensor)
-        } else {
-            None
-        }
+        self.contents.compact_sensor()
     }
 
     pub fn event_only(&self) -> Option<&EventOnlySensorRecord> {
-        if let RecordContents::EventOnlySensor(event) = &self.contents {
-            Some(event)
-        } else {
-            None
-        }
+        self.contents.event_only()
     }
 
     pub fn parse(data: &[u8]) -> Result<Self, ParseError> {
@@ -790,7 +771,52 @@ impl Record {
     }
 
     pub fn id(&self) -> Option<&SensorId> {
-        match &self.contents {
+        self.contents.id()
+    }
+
+    pub fn sensor_number(&self) -> Option<SensorNumber> {
+        self.contents.sensor_number()
+    }
+}
+
+impl RecordContents {
+    pub fn common_data(&self) -> Option<&SensorRecordCommon> {
+        match self {
+            RecordContents::FullSensor(s) => Some(s.common()),
+            RecordContents::CompactSensor(s) => Some(s.common()),
+            RecordContents::EventOnlySensor(_) => None,
+            RecordContents::FruDeviceLocator(_) => None,
+            RecordContents::McDeviceLocator(_) => None,
+            RecordContents::Unknown { .. } => None,
+        }
+    }
+
+    pub fn full_sensor(&self) -> Option<&FullSensorRecord> {
+        if let RecordContents::FullSensor(full_sensor) = self {
+            Some(full_sensor)
+        } else {
+            None
+        }
+    }
+
+    pub fn compact_sensor(&self) -> Option<&CompactSensorRecord> {
+        if let RecordContents::CompactSensor(compact_sensor) = self {
+            Some(compact_sensor)
+        } else {
+            None
+        }
+    }
+
+    pub fn event_only(&self) -> Option<&EventOnlySensorRecord> {
+        if let RecordContents::EventOnlySensor(event) = self {
+            Some(event)
+        } else {
+            None
+        }
+    }
+
+    pub fn id(&self) -> Option<&SensorId> {
+        match self {
             RecordContents::FullSensor(full) => Some(full.id_string()),
             RecordContents::CompactSensor(compact) => Some(compact.id_string()),
             RecordContents::EventOnlySensor(event) => Some(&event.id_string),
@@ -801,7 +827,7 @@ impl Record {
     }
 
     pub fn sensor_number(&self) -> Option<SensorNumber> {
-        match &self.contents {
+        match self {
             RecordContents::FullSensor(full) => Some(full.sensor_number()),
             RecordContents::CompactSensor(compact) => Some(compact.sensor_number()),
             RecordContents::EventOnlySensor(event) => Some(event.key.sensor_number),