Refactor measurements command

Author: embediver

src/chunk_ctx.rs

@@ -1,6 +1,6 @@
 // Licensed under the Apache-2.0 license
 
-use crate::commands::measurements_rsp::MeasurementsResponse;
+use crate::commands::measurements::response::MeasurementsResponse;
 
 #[derive(Debug, PartialEq)]
 pub enum ChunkError {

src/commands/measurements/mod.rs

@@ -0,0 +1,79 @@
+// Licensed under the Apache-2.0 license
+
+//! GET_MEASUREMENTS and MEASURMENTS command types and logic
+
+/// Requester logic for GET_MEASUREMENTS and MEASURMENTS
+pub mod request;
+/// Responder logic for GET_MEASUREMENTS and MEASURMENTS
+pub mod response;
+
+use crate::codec::CommonCodec;
+use crate::protocol::*;
+use bitfield::bitfield;
+use zerocopy::{FromBytes, Immutable, IntoBytes};
+
+const RESPONSE_FIXED_FIELDS_SIZE: usize = 8;
+const MAX_RESPONSE_VARIABLE_FIELDS_SIZE: usize =
+    NONCE_LEN + size_of::<u32>() + size_of::<RequesterContext>();
+
+#[derive(FromBytes, IntoBytes, Immutable)]
+#[repr(C)]
+struct GetMeasurementsReqCommon {
+    req_attr: GetMeasurementsReqAttr,
+    meas_op: u8,
+}
+impl CommonCodec for GetMeasurementsReqCommon {}
+
+#[derive(FromBytes, IntoBytes, Immutable)]
+#[repr(C)]
+struct GetMeasurementsReqSignature {
+    requester_nonce: [u8; NONCE_LEN],
+    slot_id: u8,
+}
+impl CommonCodec for GetMeasurementsReqSignature {}
+
+bitfield! {
+    #[derive(FromBytes, IntoBytes, Immutable)]
+    #[repr(C)]
+    struct GetMeasurementsReqAttr(u8);
+    impl Debug;
+    u8;
+    pub signature_requested, _: 0, 0;
+    pub raw_bitstream_requested, _: 1, 1;
+    pub new_measurement_requested, _: 2, 2;
+    reserved, _: 7, 3;
+}
+
+bitfield! {
+    #[derive(FromBytes, IntoBytes, Immutable)]
+    #[repr(C)]
+    struct MeasurementsRspFixed([u8]);
+    impl Debug;
+    u8;
+    pub spdm_version, set_spdm_version: 7, 0;
+    pub req_resp_code, set_req_resp_code: 15, 8;
+    pub total_measurement_indices, set_total_measurement_indices: 23, 16;
+    pub slot_id, set_slot_id: 27, 24;
+    pub content_changed, set_content_changed: 29, 28;
+    reserved, _: 31, 30;
+    pub num_blocks, set_num_blocks: 39, 32;
+    pub measurement_record_len_byte0, set_measurement_record_len_byte0: 47, 40;
+    pub measurement_record_len_byte1, set_measurement_record_len_byte1: 55, 48;
+    pub measurement_record_len_byte2, set_measurement_record_len_byte2: 63, 56;
+}
+
+impl MeasurementsRspFixed<[u8; RESPONSE_FIXED_FIELDS_SIZE]> {
+    pub fn set_measurement_record_len(&mut self, len: u32) {
+        self.set_measurement_record_len_byte0((len & 0xFF) as u8);
+        self.set_measurement_record_len_byte1(((len >> 8) & 0xFF) as u8);
+        self.set_measurement_record_len_byte2(((len >> 16) & 0xFF) as u8);
+    }
+}
+
+impl Default for MeasurementsRspFixed<[u8; RESPONSE_FIXED_FIELDS_SIZE]> {
+    fn default() -> Self {
+        Self([0; RESPONSE_FIXED_FIELDS_SIZE])
+    }
+}
+
+impl CommonCodec for MeasurementsRspFixed<[u8; RESPONSE_FIXED_FIELDS_SIZE]> {}

src/commands/measurements/request.rs

@@ -0,0 +1 @@
+// Licensed under the Apache-2.0 license