[SERVER] iscsi refactor: First working version

1 files changed, 1811 insertions, 4011 deletions

diff --git a/src/server/iscsi.h b/src/server/iscsi.h
index 7137991..0c279fe 100644
--- a/src/server/iscsi.h
+++ b/src/server/iscsi.h
@@ -32,10 +32,6 @@
 #ifndef DNBD3_ISCSI_H_
 #define DNBD3_ISCSI_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -48,23 +44,23 @@ extern "C" {
 #include "image.h"
 
 #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
-     // GCC-compatible compiler, targeting x86/x86-64
-     #include <x86intrin.h>
+	 // GCC-compatible compiler, targeting x86/x86-64
+	 #include <x86intrin.h>
 #elif defined(__GNUC__) && defined(__ARM_NEON__)
-     // GCC-compatible compiler, targeting ARM with NEON
-     #include <arm_neon.h>
+	 // GCC-compatible compiler, targeting ARM with NEON
+	 #include <arm_neon.h>
 #elif defined(__GNUC__) && defined(__IWMMXT__)
-     // GCC-compatible compiler, targeting ARM with WMMX
-     #include <mmintrin.h>
+	 // GCC-compatible compiler, targeting ARM with WMMX
+	 #include <mmintrin.h>
 #elif (defined(__GNUC__) || defined(__xlC__)) && (defined(__VEC__) || defined(__ALTIVEC__))
-     // XLC or GCC-compatible compiler, targeting PowerPC with VMX/VSX
-     #include <altivec.h>
+	 // XLC or GCC-compatible compiler, targeting PowerPC with VMX/VSX
+	 #include <altivec.h>
 #elif defined(__GNUC__) && defined(__SPE__)
-     // GCC-compatible compiler, targeting PowerPC with SPE
-     #include <spe.h>
+	 // GCC-compatible compiler, targeting PowerPC with SPE
+	 #include <spe.h>
 #elif defined(_MSC_VER)
-     // Microsoft C/C++-compatible compiler
-     #include <intrin.h>
+	 // Microsoft C/C++-compatible compiler
+	 #include <intrin.h>
 #endif
 
 #if defined(__BIG_ENDIAN__) || (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN) || (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
@@ -241,47 +237,6 @@ static inline bool iscsi_is_pow2(const uint32_t value)
 	return ((value & (value - 1UL)) == 0UL);
 }
 
-/**
- * @brief Calculates the shift factor for a power of two value.
- *
- * This function is used to determine
- * the shift factor to use instead of
- * using very slow multiplication,
- * division and modulo operations.
- *
- * @param[in] value Value to retrieve the
- * the shift factor for. May NOT be
- * zero in which case the result is
- * undefined.
- * @return The shift count to use as a
- * replacement for multiplication
- * and division.
- */
-static inline uint32_t iscsi_get_log2_of_pow2(const uint32_t value)
-{
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__) || defined(__INTEL_COMPILER) || defined(__ECC)
-// GCC, CLang or Intel Compiler
-	return (((sizeof(uint32_t) * CHAR_BIT) - 1UL) - (uint32_t) __builtin_clz( value ));
-#elif defined(_MSC_VER)
-// MSVC
-	uint32_t shift;
-
-	_BitScanReverse( &shift, value );
-
-	return (((sizeof(uint32_t) * CHAR_BIT) - 1UL) - shift);
-#else
-// Other compilers (use slow parallel calculation method with logical OR, bit shift, logcal AND)
-	uint32_t shift = ((value & 0xAAAAAAAAUL) != 0UL);
-
-	shift |= ((value & 0xCCCCCCCCUL) != 0UL) << 1UL;
-	shift |= ((value & 0xF0F0F0F0UL) != 0UL) << 2UL;
-	shift |= ((value & 0xFF00FF00UL) != 0UL) << 3UL;
-	shift |= ((value & 0xFFFF0000UL) != 0UL) << 4UL;
-
-	return shift;
-#endif
-}
-
 
 /// Determines the next offset after member b of struct a.
 #define ISCSI_NEXT_OFFSET(a, b) (offsetof(struct a, b) + sizeof(((struct a *) 0)->b))
@@ -485,6 +440,7 @@ static inline uint32_t iscsi_get_log2_of_pow2(const uint32_t value)
 /// iSCSI opcode flags (I) Immediate bit: For Request PDUs, the I bit set to 1 is an immediate delivery marker.
 #define ISCSI_OPCODE_FLAGS_IMMEDIATE (1 << 6L)
 
+#define ASSERT_IS_BHS(structname) _Static_assert( sizeof(structname) == ISCSI_BHS_SIZE, #structname " messed up" )
 
 /**
  * @brief iSCSI Basic Header Segment packet data.
@@ -495,32 +451,34 @@ static inline uint32_t iscsi_get_log2_of_pow2(const uint32_t value)
  * has been determined.
  */
 typedef struct __attribute__((packed)) iscsi_bhs_packet {
-    /// Command opcode.
-    uint8_t opcode;
+	/// Command opcode.
+	uint8_t opcode;
 
-    /// Opcode-specific fields.
-    uint8_t opcode_fields[3];
+	/// Opcode-specific fields.
+	uint8_t opcode_fields[3];
 
-    /// Total length of AHS (Advanced Header Segment).
-    uint8_t total_ahs_len;
+	/// Total length of AHS (Advanced Header Segment).
+	uint8_t total_ahs_len;
 
-    /// Length of Data Segment.
-    uint8_t ds_len[3];
+	/// Length of Data Segment.
+	uint8_t ds_len[3];
 
-    union {
-        /// SCSI LUN bit mask.
-        uint64_t lun;
+	union {
+		/// SCSI LUN bit mask.
+		uint64_t lun;
 
-        /// Opcode-specific fields.
-        uint8_t opcode_spec[8];
-    } lun_opcode;
+		/// Opcode-specific fields.
+		uint8_t opcode_spec[8];
+	} lun_opcode;
 
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
+	/// Initiator Task Tag (ITT).
+	uint32_t init_task_tag;
 
-    /// Opcode-specific fields.
-    uint8_t opcode_spec_fields[28];
+	/// Opcode-specific fields.
+	uint8_t opcode_spec_fields[28];
 } iscsi_bhs_packet;
+ASSERT_IS_BHS( iscsi_bhs_packet );
+
 
 
 /// iSCSI AHS type: Extended Command Descriptor Block (CDB).
@@ -539,61 +497,19 @@ typedef struct __attribute__((packed)) iscsi_bhs_packet {
  * has been determined.
  */
 typedef struct __attribute__((packed)) iscsi_ahs_packet {
-    /// AHSLength.
-    uint16_t len;
+	/// AHSLength.
+	uint16_t len;
 
-    /// AHSType.
-    uint8_t type;
+	/// AHSType.
+	uint8_t type;
 
-    /// AHS-Specific.
-    uint8_t specific;
+	/// AHS-Specific.
+	uint8_t specific;
 
-    /// AHS-Specific data.
-    uint8_t data[0];
+	/// AHS-Specific data.
+	uint8_t data[0];
 } iscsi_ahs_packet;
 
-
-/**
- * @brief iSCSI Extended CDB AHS packet data structure.
- *
- * This type of AHS MUST NOT be used if the CDBLength is less than 17.
- * The length includes the reserved byte 3.
- */
-typedef struct __attribute__((packed)) iscsi_ext_cdb_ahs_packet {
-    /// AHSLength: AHSLength - (CDBLength - 15).
-    uint16_t len;
-
-    // AHSType: Identifier (always 1 according to iSCSI specifications).
-    uint8_t type;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint8_t reserved;
-
-    /// ExtendedCDB.
-    uint8_t data[0];
-} iscsi_ext_cdb_ahs_packet;
-
-/**
- * @brief iSCSI Bidirectional Read Expected Data Transfer Length AHS packet data structure.
- *
- * This structure is used to determine the bidirectional read
- * expected data transfer length.
- */
-typedef struct __attribute__((packed)) iscsi_bidi_read_exp_xfer_ahs_packet {
-    /// AHSLength: Always 5 according to iSCSI specifications for now.
-    uint16_t len;
-
-    /// AHSType: Always 2 according to iSCSI specifications for now.
-    uint8_t type; // Identifier (always 0x02 according to specs)
-
-    /// Reserved for future usage, always MUST be 0.
-    uint8_t reserved;
-
-    /// Bidirectional Read Expected Data Transfer Length.
-    uint32_t bidi_read_exp_xfer_len;
-} iscsi_bidi_read_exp_xfer_ahs_packet;
-
-
 /**
  * @brief DataSegment Error: Unexpected unsolicited data.
  *
@@ -635,84 +551,6 @@ typedef struct __attribute__((packed)) iscsi_bidi_read_exp_xfer_ahs_packet {
  */
 #define ISCSI_DS_ERROR_INCORRECT_AMOUNT_OF_DATA_ASCQ 0x0D
 
-
-/**
- * @brief DataSegment Error: Protocol Service CRC error.
- *
- * Certain iSCSI conditions result in the command being terminated at
- * the target (response code of Command Completed at Target) with a SCSI
- * CHECK CONDITION Status as outlined in the following definitions
- * (Sense key: Aborted Command 0x0B).
- */
-#define ISCSI_DS_ERROR_PROTOCOL_SERVICE_CRC_ERROR_ASC  0x47
-
-/**
- * @brief DataSegment Error: Protocol Service CRC error.
- *
- * Certain iSCSI conditions result in the command being terminated at
- * the target (response code of Command Completed at Target) with a SCSI
- * CHECK CONDITION Status as outlined in the following definitions
- * (Sense key: Aborted Command 0x0B).
- */
-#define ISCSI_DS_ERROR_PROTOCOL_SERVICE_CRC_ERROR_ASCQ 0x05
-
-
-/**
- * @brief DataSegment Error: Selective Negative / Sequence Number Acknowledgment (SNACK) rejected.
- *
- * Certain iSCSI conditions result in the command being terminated at
- * the target (response code of Command Completed at Target) with a SCSI
- * CHECK CONDITION Status as outlined in the following definitions
- * (Sense key: Aborted Command 0x0B).
- */
-#define ISCSI_DS_ERROR_SNACK_REJECTED_ASC  0x11
-
-/**
- * @brief DataSegment Error: Selective Negative / Sequence Number Acknowledgment (SNACK) rejected.
- *
- * Certain iSCSI conditions result in the command being terminated at
- * the target (response code of Command Completed at Target) with a SCSI
- * CHECK CONDITION Status as outlined in the following definitions
- * (Sense key: Aborted Command 0x0B).
- */
-#define ISCSI_DS_ERROR_SNACK_REJECTED_ASCQ 0x13
-
-
-/**
- * @brief iSCSI header digest in case CRC32C has been negotiated.
- *
- * Optional header and data digests protect the integrity of the header
- * and data, respectively. The digests, if present, are located,
- * respectively, after the header and PDU-specific data and cover,
- * respectively, the header and the PDU data, each including the padding
- * bytes, if any.
- *
- * The existence and type of digests are negotiated during the Login
- * Phase.
- */
-typedef struct __attribute__((packed)) iscsi_header_digest {
-    /// Header digest is a CRC32C for ensuring integrity.
-    uint32_t crc32c;
-} iscsi_header_digest;
-
-/**
- * @brief iSCSI data digest in case CRC32C has been negotiated.
- *
- * Optional header and data digests protect the integrity of the header
- * and data, respectively. The digests, if present, are located,
- * respectively, after the header and PDU-specific data and cover,
- * respectively, the header and the PDU data, each including the padding
- * bytes, if any.
- *
- * The existence and type of digests are negotiated during the Login
- * Phase.
- */
-typedef struct __attribute__((packed)) iscsi_data_digest {
-    /// Data digest is a CRC32C for ensuring integrity.
-    uint32_t crc32c;
-} iscsi_data_digest;
-
-
 /**
  * @brief iSCSI SCSI CDB packet data structure.
  *
@@ -721,11 +559,11 @@ typedef struct __attribute__((packed)) iscsi_data_digest {
  * MUST be used to contain the CDB spillover.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_cdb {
-    /// SCSI opcode.
-    uint8_t opcode;
+	/// SCSI opcode.
+	uint8_t opcode;
 
-    /// Additional op-code specific data.
-    uint8_t data[0];
+	/// Additional op-code specific data.
+	uint8_t data[0];
 } iscsi_scsi_cdb;
 
 
@@ -742,20 +580,20 @@ typedef struct __attribute__((packed)) iscsi_scsi_cdb {
  * There are 6 bytes in the CDB field for this command.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_cdb_inquiry {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
+	/// SCSI opcode.
+	iscsi_scsi_cdb cdb;
 
-    /// Logical Unit Number (LUN), CMMDT and EVPD.
-    uint8_t lun_flags;
+	/// Logical Unit Number (LUN), CMMDT and EVPD.
+	uint8_t lun_flags;
 
-    /// Page code.
-    uint8_t page_code;
+	/// Page code.
+	uint8_t page_code;
 
-    /// Allocation length in bytes.
-    uint16_t alloc_len;
+	/// Allocation length in bytes.
+	uint16_t alloc_len;
 
-    /// Control.
-    uint8_t control;
+	/// Control.
+	uint8_t control;
 } iscsi_scsi_cdb_inquiry;
 
 
@@ -765,17 +603,17 @@ typedef struct __attribute__((packed)) iscsi_scsi_cdb_inquiry {
  * There are 6 bytes in the CDB field for this command.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_cdb_read_write_6 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
+	/// SCSI opcode.
+	iscsi_scsi_cdb cdb;
 
-    /// Logical Block Address (LBA).
-    uint8_t lba[3];
+	/// Logical Block Address (LBA).
+	uint8_t lba[3];
 
-    /// Transfer length in bytes.
-    uint8_t xfer_len;
+	/// Transfer length in bytes.
+	uint8_t xfer_len;
 
-    /// Control.
-    uint8_t control;
+	/// Control.
+	uint8_t control;
 } iscsi_scsi_cdb_read_write_6;
 
 
@@ -785,23 +623,23 @@ typedef struct __attribute__((packed)) iscsi_scsi_cdb_read_write_6 {
  * There are 10 bytes in the CDB field for this command.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_cdb_read_write_10 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
+	/// SCSI opcode.
+	iscsi_scsi_cdb cdb;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Logical Block Address (LBA).
-    uint32_t lba;
+	/// Logical Block Address (LBA).
+	uint32_t lba;
 
-    /// Group number.
-    int8_t group_num;
+	/// Group number.
+	int8_t group_num;
 
-    /// Transfer length in bytes.
-    uint16_t xfer_len;
+	/// Transfer length in bytes.
+	uint16_t xfer_len;
 
-    /// Control.
-    uint8_t control;
+	/// Control.
+	uint8_t control;
 } iscsi_scsi_cdb_read_write_10;
 
 
@@ -811,23 +649,23 @@ typedef struct __attribute__((packed)) iscsi_scsi_cdb_read_write_10 {
  * There are 12 bytes in the CDB field for this command.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_cdb_read_write_12 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
+	/// SCSI opcode.
+	iscsi_scsi_cdb cdb;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Logical Block Address (LBA).
-    uint32_t lba;
+	/// Logical Block Address (LBA).
+	uint32_t lba;
 
-    /// Transfer length in bytes.
-    uint32_t xfer_len;
+	/// Transfer length in bytes.
+	uint32_t xfer_len;
 
-    /// Restricted for MMC-6 and group number.
-    int8_t restrict_group_num;
+	/// Restricted for MMC-6 and group number.
+	int8_t restrict_group_num;
 
-    /// Control.
-    uint8_t control;
+	/// Control.
+	uint8_t control;
 } iscsi_scsi_cdb_read_write_12;
 
 
@@ -837,23 +675,23 @@ typedef struct __attribute__((packed)) iscsi_scsi_cdb_read_write_12 {
  * There are 16 bytes in the CDB field for this command.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_cdb_read_write_16 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
+	/// SCSI opcode.
+	iscsi_scsi_cdb cdb;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Logical Block Address (LBA).
-    uint64_t lba;
+	/// Logical Block Address (LBA).
+	uint64_t lba;
 
-    /// Transfer length in bytes.
-    uint32_t xfer_len;
+	/// Transfer length in bytes.
+	uint32_t xfer_len;
 
-    /// Restricted for MMC-6 and group number.
-    int8_t restrict_group_num;
+	/// Restricted for MMC-6 and group number.
+	int8_t restrict_group_num;
 
-    /// Control.
-    uint8_t control;
+	/// Control.
+	uint8_t control;
 } iscsi_scsi_cdb_read_write_16;
 
 
@@ -873,86 +711,32 @@ typedef struct __attribute__((packed)) iscsi_scsi_cdb_read_write_16 {
  * There are 12 bytes in the CDB field for this command.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_cdb_report_luns {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
+	/// SCSI opcode.
+	iscsi_scsi_cdb cdb;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved;
 
-    /// Select report.
-    uint8_t select_report;
+	/// Select report.
+	uint8_t select_report;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved2;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint16_t reserved2;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved3;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved3;
 
-    /// Allocation length in bytes.
-    uint32_t alloc_len;
+	/// Allocation length in bytes.
+	uint32_t alloc_len;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved4;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved4;
 
-    /// Control.
-    uint8_t control;
+	/// Control.
+	uint8_t control;
 } iscsi_scsi_cdb_report_luns;
 
 
-/// iSCSI SCSI Command Descriptor Block (CDB) for COMPARE AND WRITE command flags: Force Unit Access (FUA).
-#define ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_FUA                  (1 << 3L)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for COMPARE AND WRITE command flags: Disable Page Out (DPO).
-#define ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_DPO                  (1 << 4L)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for COMPARE AND WRITE command write protect flags: First bit of the three bits.
-#define ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_WRPROTECT_FIRST_BIT  5
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for COMPARE AND WRITE command write protect flags: Last bit of the three bits.
-#define ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_WRPROTECT_LAST_BIT   ((ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_WRPROTECT_FIRST_BIT) + 3 - 1)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for COMPARE AND WRITE command write protect flags: Bit mask.
-#define ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_WRPROTECT_MASK       (ISCSI_BITS_GET_MASK(ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_WRPROTECT_FIRST_BIT, ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_WRPROTECT_LAST_BIT))
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for COMPARE AND WRITE command write protect flags: Extracts the write protect bits.
-#define ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_GET_WRPROTECT(x)     (ISCSI_BITS_GET((x), ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_WRPROTECT_FIRST_BIT, ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_WRPROTECT_LAST_BIT))
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for COMPARE AND WRITE command write protect flags: Stores into the write protect bits.
-#define ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_PUT_WRPROTECT(x)     (ISCSI_BITS_PUT((x), ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_WRPROTECT_FIRST_BIT, ISCSI_SCSI_CDB_CMP_WRITE_FLAGS_WRPROTECT_LAST_BIT))
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI COMPARE AND WRITE command.
- *
- * There are 16 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_cmp_write {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Logical Block Address (LBA).
-    uint64_t lba;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved2;
-
-    /// Number of blocks in bytes.
-    uint8_t num_blocks;
-
-    /// Restricted for MMC-6 and group number.
-    int8_t restrict_group_num;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_cmp_write;
-
-
 /// iSCSI SCSI Command Descriptor Block (CDB) for SERVICE ACTION IN(16) command service action: READ CAPACITY(16).
 #define ISCSI_SCSI_CDB_SERVICE_ACTION_IN_16_ACTION_READ_CAPACITY_16 0x10
 
@@ -981,196 +765,26 @@ typedef struct __attribute__((packed)) iscsi_scsi_cdb_cmp_write {
  * There are 16 bytes in the CDB field for this command.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_cdb_service_action_in_16 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
+	/// SCSI opcode.
+	iscsi_scsi_cdb cdb;
 
-    /// Service action.
-    uint8_t action;
+	/// Service action.
+	uint8_t action;
 
-    /// Logical Block Address (LBA), obselete by now.
-    uint64_t lba;
+	/// Logical Block Address (LBA), obselete by now.
+	uint64_t lba;
 
-    /// Allocation length in bytes.
-    uint32_t alloc_len;
+	/// Allocation length in bytes.
+	uint32_t alloc_len;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved;
 
-    /// Control.
-    uint8_t control;
+	/// Control.
+	uint8_t control;
 } iscsi_scsi_cdb_service_action_in_16;
 
 
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI SYNCHRONIZE CACHE(10) command.
- *
- * There are 10 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_sync_cache_10 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Logical Block Address (LBA).
-    uint32_t lba;
-
-    /// Group number.
-    int8_t group_num;
-
-    /// Transfer length in bytes.
-    uint16_t xfer_len;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_sync_cache_10;
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI SYNCHRONIZE CACHE(16) command.
- *
- * There are 16 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_sync_cache_16 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Logical Block Address (LBA).
-    uint64_t lba;
-
-    /// Transfer length in bytes.
-    uint32_t xfer_len;
-
-    /// Group number.
-    int8_t group_num;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_sync_cache_16;
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI WRITE SAME(10) command.
- *
- * There are 10 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_write_same_10 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Logical Block Address (LBA).
-    uint32_t lba;
-
-    /// Group number.
-    int8_t group_num;
-
-    /// Transfer length in bytes.
-    uint16_t xfer_len;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_write_same_10;
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI WRITE SAME(16) command.
- *
- * There are 16 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_write_same_16 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Logical Block Address (LBA).
-    uint64_t lba;
-
-    /// Transfer length in bytes.
-    uint32_t xfer_len;
-
-    /// Group number.
-    int8_t group_num;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_write_same_16;
-
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for MODE SELECT(6) command flags: Save Pages (SP).
-#define ISCSI_SCSI_CDB_MODE_SELECT_6_FLAGS_SP  (1 << 0)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for MODE SELECT(6) command flags: Revert To Defaults (RTD).
-#define ISCSI_SCSI_CDB_MODE_SELECT_6_FLAGS_RTD (1 << 1)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for MODE SELECT(6) command flags: Page Format (PF).
-#define ISCSI_SCSI_CDB_MODE_SELECT_6_FLAGS_PF  (1 << 4)
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI MODE SELECT(6) command.
- *
- * There are 6 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_mode_select_6 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved;
-
-    /// Parameter list length in bytes.
-    uint8_t param_list_len;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_mode_select_6;
-
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for MODE SELECT(10) command flags: Save Pages (SP).
-#define ISCSI_SCSI_CDB_MODE_SELECT_10_FLAGS_SP  (1 << 0)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for MODE SELECT(10) command flags: Page Format (PF).
-#define ISCSI_SCSI_CDB_MODE_SELECT_10_FLAGS_PF  (1 << 4)
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI MODE SELECT(10) command.
- *
- * There are 10 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_mode_select_10 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint32_t reserved;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved2;
-
-    /// Parameter list length in bytes.
-    uint16_t param_list_len;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_mode_select_10;
-
-
 /// iSCSI SCSI Command Descriptor Block (CDB) for MODE SENSE(6) command flags: Disable Block Descriptors (DBD).
 #define ISCSI_SCSI_CDB_MODE_SENSE_6_FLAGS_DBD (1 << 3)
 
@@ -1224,23 +838,23 @@ typedef struct __attribute__((packed)) iscsi_scsi_cdb_mode_select_10 {
  * There are 6 bytes in the CDB field for this command.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_cdb_mode_sense_6 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
+	/// SCSI opcode.
+	iscsi_scsi_cdb cdb;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Page code and page control.
-    uint8_t page_code_control;
+	/// Page code and page control.
+	uint8_t page_code_control;
 
-    /// Sub page code.
-    uint8_t sub_page_code;
+	/// Sub page code.
+	uint8_t sub_page_code;
 
-    /// Allocation length in bytes.
-    uint8_t alloc_len;
+	/// Allocation length in bytes.
+	uint8_t alloc_len;
 
-    /// Control.
-    uint8_t control;
+	/// Control.
+	uint8_t control;
 } iscsi_scsi_cdb_mode_sense_6;
 
 
@@ -1300,437 +914,32 @@ typedef struct __attribute__((packed)) iscsi_scsi_cdb_mode_sense_6 {
  * There are 10 bytes in the CDB field for this command.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_cdb_mode_sense_10 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
+	/// SCSI opcode.
+	iscsi_scsi_cdb cdb;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Page code and page control.
-    uint8_t page_code_control;
+	/// Page code and page control.
+	uint8_t page_code_control;
 
-    /// Sub page code.
-    uint8_t sub_page_code;
+	/// Sub page code.
+	uint8_t sub_page_code;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint16_t reserved;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved2;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved2;
 
-    /// Allocation length in bytes.
-    uint16_t alloc_len;
+	/// Allocation length in bytes.
+	uint16_t alloc_len;
 
-    /// Control.
-    uint8_t control;
+	/// Control.
+	uint8_t control;
 } iscsi_scsi_cdb_mode_sense_10;
 
 
-/// iSCSI SCSI Command Descriptor Block (CDB) for REQUEST SENSE command flags: Descriptor Format (DESC).
-#define ISCSI_SCSI_CDB_REQ_SENSE_FLAGS_DESC (1 << 0)
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI REQUEST SENSE command.
- *
- * There are 6 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_req_sense {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved;
-
-    /// Allocation length in bytes.
-    uint8_t alloc_len;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_req_sense;
-
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags: Reply immediately after CDB check (IMMED).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_EXEC_FLAGS_IMMED (1 << 0)
-
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Process the START and LOEJ bits.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_PROC_START_LOEJ_BITS 0x0
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Cause the logical unit to transition to the active power condition (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_ACTIVE               0x0
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Cause the logical unit to transition to the idle_a power condition (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_IDLE_A               0x0
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Cause the logical unit to transition to the idle_b power condition (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_IDLE_B               0x1
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Cause the logical unit to transition to the idle_c power condition (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_IDLE_C               0x2
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Cause the logical unit to transition to the standby_z power condition (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_STANDBY_Z            0x0
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Cause the logical unit to transition to the standby_b power condition (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_STANDBY_Y            0x1
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Initialize and start all of the idle and standby condition timers that are enabled (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_LU_CONTROL           0x0
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Force the idle_a condition timer to be set to zero (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_FORCE_IDLE_A_0       0x0
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Force the idle_b condition timer to be set to zero (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_FORCE_IDLE_B_0       0x1
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Force the idle_c condition timer to be set to zero (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_FORCE_IDLE_C_0       0x2
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Force the standby_z condition timer to be set to zero (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_FORCE_STANDBY_Z_0    0x0
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Force the standby_y condition timer to be set to zero (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_FORCE_STANDBY_Y_0    0x1
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: First bit of the four bits.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_FIRST_BIT            0
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Last bit of the four bits.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_LAST_BIT             ((ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_FIRST_BIT) + 4 - 1)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Bit mask.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_MASK                 (ISCSI_BITS_GET_MASK(ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_FIRST_BIT, ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_LAST_BIT))
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Extracts the power condition modifier bits.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_GET_POWER_COND_MOD(x)               (ISCSI_BITS_GET((x), ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_FIRST_BIT, ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_LAST_BIT))
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution power condition modifier: Stores into the power condition modifier bits.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_PUT_POWER_COND_MOD(x)               (ISCSI_BITS_PUT((x), ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_FIRST_BIT, ISCSI_SCSI_CDB_START_STOP_UNIT_POWER_COND_MOD_LAST_BIT))
-
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags: START.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_START                      (1 << 0)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags: LOad EJect (LOEJ).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_LOEJ                       (1 << 1)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags: Do not flush caches until a power condition that prevents accessing the medium is entered (NO_FLUSH).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_NO_FLUSH                   (1 << 2)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Process the START and LOEJ bits (START_VALID).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_START_VALID     0x0
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Cause the logical unit to transition to the active power condition (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_ACTIVE          0x1
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Cause the logical unit to transition to the idle_a to idle_c power conditions (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_IDLE            0x2
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Cause the logical unit to transition to the standby_z and standby_y power conditions (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_STANDBY         0x3
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Obselete.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_OBSELETE        0x5
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Initialize and start all of the idle and standby condition timers that are enabled (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_LU_CONTROL      0x7
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Force the idle_a to idle_c condition timers to be set to zero (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_FORCE_IDLE_0    0xA
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Force the standby_z and standby_y condition timers to be set to zero (see SPC5).
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_FORCE_STANDBY_0 0xB
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: First bit of the four bits.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_FIRST_BIT       4
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Last bit of the four bits.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_LAST_BIT        ((ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_FIRST_BIT) + 8 - 1)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Bit mask.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_MASK            (ISCSI_BITS_GET_MASK(ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_FIRST_BIT, ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_LAST_BIT))
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Extracts the power condition bits.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_GET_POWER_COND(x)          (ISCSI_BITS_GET((x), ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_FIRST_BIT, ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_LAST_BIT))
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for START STOP UNIT command execution flags power condition: Stores into the power condition bits.
-#define ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_PUT_POWER_COND(x)          (ISCSI_BITS_PUT((x), ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_FIRST_BIT, ISCSI_SCSI_CDB_START_STOP_UNIT_FLAGS_POWER_COND_LAST_BIT))
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI START STOP UNIT command.
- *
- * There are 6 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_start_stop_unit {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Execution flags.
-    int8_t exec_flags;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved;
-
-    /// Power condition modifier.
-    uint8_t power_cond_mod;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_start_stop_unit;
-
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Register - Register a reservation key without making a reservation.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_REGISTER                  0x00
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Reserve - Create a persistent reservation of the specified scope and type.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_RESERVE                   0x01
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Release - Releases the selected reservation for the requesting initiator.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_RELEASE                   0x02
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Clear – Clears all reservations keys and all persistent reservations.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_CLEAR                     0x03
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Preempt – Preempt reservations from another initiator.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_PREEMPT                   0x04
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Preempt reservations from another initiator and abort all tasks for all initiators with the specified reservation key.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_PREEMPT_ABORT             0x05
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Register and Ignore Existing Key – Register a new reservation key and discard existing reservation key.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_REGISTER_IGNORE_EXIST_KEY 0x06
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Register and Move Registers - Registers a reservation key for another I_T nexus and moves the persistent reservation to that I-T nexus.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_REGISTER_MOVE_REGS        0x07
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: First bit of the five bits.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_FIRST_BIT                 0
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Last bit of the five bits.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_LAST_BIT                  ((ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_FIRST_BIT) + 5 - 1)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Bit mask.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_MASK                      (ISCSI_BITS_GET_MASK(ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_FIRST_BIT, ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_LAST_BIT))
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Extracts the service action bits.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_GET_ACTION(x)                    (ISCSI_BITS_GET((x), ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_FIRST_BIT, ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_LAST_BIT))
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE OUT command service action: Stores into the service action bits.
-#define ISCSI_SCSI_CDB_PR_RESERVE_OUT_PUT_ACTION(x)                    (ISCSI_BITS_PUT((x), ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_FIRST_BIT, ISCSI_SCSI_CDB_PR_RESERVE_OUT_ACTION_LAST_BIT))
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI PERSISTENT RESERVE OUT command.
- *
- * There are 10 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_pr_reserve_out {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Service action.
-    uint8_t action;
-
-    /// Scope and reservation type.
-    uint8_t scope_type;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved;
-
-    /// Parameter list length in bytes.
-    uint32_t param_list_len;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_pr_reserve_out;
-
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE IN command service action: Read keys - Reads all registered reservation keys (i.e. registrations) as described in SPC5.
-#define ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_READ_KEYS                0x00
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE IN command service action: Read reservations - Reads the current persistent reservations as described in SPC5.
-#define ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_READ_RESERVATIONS        0x01
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE IN command service action: Report capabilities - Returns capability information.
-#define ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_READ_REPORT_CAPABILITIES 0x02
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE IN command service action: Read full status – Reads complete information about all registrations and the persistent reservations, if any.
-#define ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_READ_FULL_STATUS         0x03
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE IN command service action: First bit of the five bits.
-#define ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_FIRST_BIT                0
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE IN command service action: Last bit of the five bits.
-#define ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_LAST_BIT                 ((ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_FIRST_BIT) + 5 - 1)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE IN command service action: Bit mask.
-#define ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_MASK                     (ISCSI_BITS_GET_MASK(ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_FIRST_BIT, ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_LAST_BIT))
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE IN command service action: Extracts the service action bits.
-#define ISCSI_SCSI_CDB_PR_RESERVE_IN_GET_ACTION(x)                   (ISCSI_BITS_GET((x), ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_FIRST_BIT, ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_LAST_BIT))
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for PERSISTENT RESERVE IN command service action: Stores into the service action bits.
-#define ISCSI_SCSI_CDB_PR_RESERVE_IN_PUT_ACTION(x)                   (ISCSI_BITS_PUT((x), ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_FIRST_BIT, ISCSI_SCSI_CDB_PR_RESERVE_IN_ACTION_LAST_BIT))
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI PERSISTENT RESERVE IN command.
- *
- * There are 10 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_pr_reserve_in {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Service action.
-    uint8_t action;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint32_t reserved;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved2;
-
-    /// Parameter list length in bytes.
-    uint16_t param_list_len;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_pr_reserve_in;
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI RESERVE(6) command.
- *
- * There are 6 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_pr_reserve_6 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved_obselete;
-
-    /// Obselete byte.
-    uint8_t obselete;
-
-    /// Obselete word.
-    uint16_t obselete2;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_pr_reserve_6;
-
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for RESERVE(10) command flags: Long identifier larger than 255 (LONGID).
-#define ISCSI_SCSI_CDB_RESERVE_10_FLAGS_LONGID (1 << 1)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for RESERVE(10) command flags: Third-party reservation (3RDPTY).
-#define ISCSI_SCSI_CDB_RESERVE_10_FLAGS_3RDPTY (1 << 4)
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI RESERVE(10) command.
- *
- * There are 10 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_pr_reserve_10 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Obselete.
-    uint8_t obselete;
-
-    /// Third-party device identifier.
-    uint8_t third_party_dev_id;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved2;
-
-    /// Parameter list length in bytes.
-    uint16_t param_list_len;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_pr_reserve_10;
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI RELEASE(6) command.
- *
- * There are 6 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_pr_release_6 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved_obselete;
-
-    /// Obselete byte.
-    uint8_t obselete;
-
-    /// Obselete word.
-    uint16_t obselete2;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_pr_release_6;
-
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for RELEASE(10) command flags: Long identifier larger than 255 (LONGID).
-#define ISCSI_SCSI_CDB_RELEASE_10_FLAGS_LONGID (1 << 1)
-
-/// iSCSI SCSI Command Descriptor Block (CDB) for RELEASE(10) command flags: Third-party reservation (3RDPTY).
-#define ISCSI_SCSI_CDB_RELEASE_10_FLAGS_3RDPTY (1 << 4)
-
-
-/**
- * @brief iSCSI SCSI CDB packet data structure for SCSI RELEASE(10) command.
- *
- * There are 10 bytes in the CDB field for this command.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_cdb_pr_release_10 {
-    /// SCSI opcode.
-    iscsi_scsi_cdb cdb;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Obselete.
-    uint8_t obselete;
-
-    /// Third-party device identifier.
-    uint8_t third_party_dev_id;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved2;
-
-    /// Parameter list length in bytes.
-    uint16_t param_list_len;
-
-    /// Control.
-    uint8_t control;
-} iscsi_scsi_cdb_pr_release_10;
-
-
 /**
  * @brief iSCSI SCSI DataSegment Command packet structure.
  *
@@ -1743,14 +952,14 @@ typedef struct __attribute__((packed)) iscsi_scsi_cdb_pr_release_10 {
  * contain a vendor-specific detailed description of the failure).
  */
 typedef struct __attribute__((packed)) iscsi_scsi_ds_cmd_data {
-    /// SenseLength: This field indicates the length of Sense Data.
-    uint16_t len;
+	/// SenseLength: This field indicates the length of Sense Data.
+	uint16_t len;
 
-    /// The Sense Data contains detailed information about a CHECK CONDITION. SPC3 specifies the format and content of the Sense Data.
-    uint8_t sense_data[0];
+	/// The Sense Data contains detailed information about a CHECK CONDITION. SPC3 specifies the format and content of the Sense Data.
+	uint8_t sense_data[0];
 
-    /// Response Data.
-    uint8_t res_data[0];
+	/// Response Data.
+	uint8_t res_data[0];
 } iscsi_scsi_ds_cmd_data;
 
 
@@ -1958,20 +1167,20 @@ typedef struct __attribute__((packed)) iscsi_scsi_ds_cmd_data {
  * cleared.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_basic_inquiry_data_packet {
-    /// Peripheral device type and qualifier.
-    uint8_t peripheral_type_id;
+	/// Peripheral device type and qualifier.
+	uint8_t peripheral_type_id;
 
-    /// Peripheral device type modifier and removable media bit.
-    int8_t peripheral_type_mod_flags;
+	/// Peripheral device type modifier and removable media bit.
+	int8_t peripheral_type_mod_flags;
 
-    /// ANSI-Approved, ECMA and ISO version.
-    uint8_t version;
+	/// ANSI-Approved, ECMA and ISO version.
+	uint8_t version;
 
-    /// Response data format, HISUP, NORMACA, AENC and TrmIOP flags.
-    int8_t response_data_fmt_flags;
+	/// Response data format, HISUP, NORMACA, AENC and TrmIOP flags.
+	int8_t response_data_fmt_flags;
 
-    /// Additional length in bytes.
-    uint8_t add_len;
+	/// Additional length in bytes.
+	uint8_t add_len;
 } iscsi_scsi_basic_inquiry_data_packet;
 
 
@@ -2047,26 +1256,26 @@ typedef struct __attribute__((packed)) iscsi_scsi_basic_inquiry_data_packet {
  * cleared.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_std_inquiry_data_packet {
-    /// iSCSI SCSI basic inquiry data packet.
-    iscsi_scsi_basic_inquiry_data_packet basic_inquiry;
+	/// iSCSI SCSI basic inquiry data packet.
+	iscsi_scsi_basic_inquiry_data_packet basic_inquiry;
 
-    /// PROTECT, 3PC, TPGS, ACC and SCCS.
-    uint8_t tpgs_flags;
+	/// PROTECT, 3PC, TPGS, ACC and SCCS.
+	uint8_t tpgs_flags;
 
-    /// MULTIP, VS and ENCSERV.
-    int8_t services_flags;
+	/// MULTIP, VS and ENCSERV.
+	int8_t services_flags;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Vendor identification.
-    uint8_t vendor_id[8];
+	/// Vendor identification.
+	uint8_t vendor_id[8];
 
-    /// Product identification.
-    uint8_t product_id[16];
+	/// Product identification.
+	uint8_t product_id[16];
 
-    /// Product revision level.
-    uint8_t product_rev_level[4];
+	/// Product revision level.
+	uint8_t product_rev_level[4];
 } iscsi_scsi_std_inquiry_data_packet;
 
 
@@ -2095,29 +1304,29 @@ typedef struct __attribute__((packed)) iscsi_scsi_std_inquiry_data_packet {
  * cleared.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_ext_inquiry_data_packet {
-    /// iSCSI SCSI standard inquiry data packet.
-    iscsi_scsi_std_inquiry_data_packet std_inquiry;
+	/// iSCSI SCSI standard inquiry data packet.
+	iscsi_scsi_std_inquiry_data_packet std_inquiry;
 
-    /// Vendor specific.
-    uint8_t vendor_spec[20];
+	/// Vendor specific.
+	uint8_t vendor_spec[20];
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0).
+	uint8_t reserved;
 
-    /// Version descriptors.
-    uint16_t version_desc[8];
+	/// Version descriptors.
+	uint16_t version_desc[8];
 
-    /// Reserved for future usage (always MUST be 0).
-    uint64_t reserved2[2];
+	/// Reserved for future usage (always MUST be 0).
+	uint64_t reserved2[2];
 
-    /// Reserved for future usage (always MUST be 0).
-    uint32_t reserved3;
+	/// Reserved for future usage (always MUST be 0).
+	uint32_t reserved3;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint16_t reserved4;
+	/// Reserved for future usage (always MUST be 0).
+	uint16_t reserved4;
 } iscsi_scsi_ext_inquiry_data_packet;
 
 
@@ -2243,17 +1452,17 @@ typedef struct __attribute__((packed)) iscsi_scsi_ext_inquiry_data_packet {
  * set.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_inquiry_data_packet {
-    /// Peripheral device type and qualifier.
-    uint8_t peripheral_type_id;
+	/// Peripheral device type and qualifier.
+	uint8_t peripheral_type_id;
 
-    /// Page code.
-    uint8_t page_code;
+	/// Page code.
+	uint8_t page_code;
 
-    /// Allocation length in bytes.
-    uint16_t alloc_len;
+	/// Allocation length in bytes.
+	uint16_t alloc_len;
 
-    /// Parameters.
-    uint8_t params[0];
+	/// Parameters.
+	uint8_t params[0];
 } iscsi_scsi_vpd_page_inquiry_data_packet;
 
 
@@ -2378,20 +1587,20 @@ typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_inquiry_data_packet {
  * set.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_inquiry_data_packet {
-    /// Protocol identifier and code set.
-    uint8_t protocol_id_code_set;
+	/// Protocol identifier and code set.
+	uint8_t protocol_id_code_set;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0).
+	uint8_t reserved;
 
-    /// Length in bytes.
-    uint8_t len;
+	/// Length in bytes.
+	uint8_t len;
 
-    /// Designation descriptor.
-    uint8_t desc[0];
+	/// Designation descriptor.
+	uint8_t desc[0];
 } iscsi_scsi_vpd_page_design_desc_inquiry_data_packet;
 
 
@@ -2403,8 +1612,8 @@ typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_inquiry_d
  * set.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_ieee_naa_ext_inquiry_data_packet {
-    /// IEEE NAA Extended.
-    uint64_t ieee_naa_ext;
+	/// IEEE NAA Extended.
+	uint64_t ieee_naa_ext;
 } iscsi_scsi_vpd_page_design_desc_ieee_naa_ext_inquiry_data_packet;
 
 
@@ -2416,14 +1625,14 @@ typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_ieee_naa_
  * set.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_t10_vendor_id_inquiry_data_packet {
-    /// Vendor identification.
-    uint8_t vendor_id[8];
+	/// Vendor identification.
+	uint8_t vendor_id[8];
 
-    /// Product identification.
-    uint8_t product_id[16];
+	/// Product identification.
+	uint8_t product_id[16];
 
-    /// Unit serial number.
-    uint8_t unit_serial_num[32];
+	/// Unit serial number.
+	uint8_t unit_serial_num[32];
 } iscsi_scsi_vpd_page_design_desc_t10_vendor_id_inquiry_data_packet;
 
 
@@ -2435,11 +1644,11 @@ typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_t10_vendo
  * set.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_rel_target_port_inquiry_data_packet {
-    /// Reserved for future usage (always MUST be 0).
-    uint16_t reserved;
+	/// Reserved for future usage (always MUST be 0).
+	uint16_t reserved;
 
-    /// Port index.
-    uint16_t index;
+	/// Port index.
+	uint16_t index;
 } iscsi_scsi_vpd_page_design_desc_rel_target_port_inquiry_data_packet;
 
 
@@ -2451,11 +1660,11 @@ typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_rel_targe
  * set.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_target_port_group_inquiry_data_packet {
-    /// Reserved for future usage (always MUST be 0).
-    uint16_t reserved;
+	/// Reserved for future usage (always MUST be 0).
+	uint16_t reserved;
 
-    /// Port group index.
-    uint16_t index;
+	/// Port group index.
+	uint16_t index;
 } iscsi_scsi_vpd_page_design_desc_target_port_group_inquiry_data_packet;
 
 
@@ -2467,11 +1676,11 @@ typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_target_po
  * set.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_logical_unit_group_inquiry_data_packet {
-    /// Reserved for future usage (always MUST be 0).
-    uint16_t reserved;
+	/// Reserved for future usage (always MUST be 0).
+	uint16_t reserved;
 
-    /// Logical unit identifier.
-    uint16_t id;
+	/// Logical unit identifier.
+	uint16_t id;
 } iscsi_scsi_vpd_page_design_desc_logical_unit_group_inquiry_data_packet;
 
 
@@ -2619,296 +1828,47 @@ typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_design_desc_logical_u
  * set.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_ext_inquiry_data_packet {
-    /// Peripheral device type and qualifier.
-    uint8_t peripheral_type_id;
+	/// Peripheral device type and qualifier.
+	uint8_t peripheral_type_id;
 
-    /// Page code.
-    uint8_t page_code;
+	/// Page code.
+	uint8_t page_code;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0).
+	uint8_t reserved;
 
-    /// Page length in bytes.
-    uint8_t page_len;
+	/// Page length in bytes.
+	uint8_t page_len;
 
-    /// Check flags.
-    int8_t check_flags;
+	/// Check flags.
+	int8_t check_flags;
 
-    /// Support flags.
-    int8_t support_flags;
+	/// Support flags.
+	int8_t support_flags;
 
-    /// More support flags.
-    int8_t support_flags_2;
+	/// More support flags.
+	int8_t support_flags_2;
 
-    /// LUICLR.
-    uint8_t luiclr;
+	/// LUICLR.
+	uint8_t luiclr;
 
-    /// CBCS.
-    uint8_t cbcs;
+	/// CBCS.
+	uint8_t cbcs;
 
-    /// Micro DL.
-    uint8_t micro_dl;
+	/// Micro DL.
+	uint8_t micro_dl;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint64_t reserved2[6];
+	/// Reserved for future usage (always MUST be 0).
+	uint64_t reserved2[6];
 
-    /// Reserved for future usage (always MUST be 0).
-    uint32_t reserved3;
+	/// Reserved for future usage (always MUST be 0).
+	uint32_t reserved3;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint16_t reserved4;
+	/// Reserved for future usage (always MUST be 0).
+	uint16_t reserved4;
 } iscsi_scsi_vpd_page_ext_inquiry_data_packet;
 
 
-/// iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry Data policy page code: First bit of the six bits.
-#define ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_POLICY_PAGE_CODE_FIRST_BIT 0
-
-/// iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry Data policy page code: Last bit of the six bits.
-#define ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_POLICY_PAGE_CODE_LAST_BIT  ((ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_POLICY_PAGE_CODE_FIRST_BIT) + 6 - 1)
-
-/// iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry Data policy page code: Bit mask.
-#define ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_POLICY_PAGE_CODE_MASK      (ISCSI_BITS_GET_MASK(ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_POLICY_PAGE_CODE_FIRST_BIT, ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_POLICY_PAGE_CODE_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry Data policy page code: Extracts the policy page code bits.
-#define ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_GET_POLICY_PAGE_CODE(x)    (ISCSI_BITS_GET((x), ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_POLICY_PAGE_CODE_FIRST_BIT, ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_POLICY_PAGE_CODE_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry Data policy page code: Stores into the policy page code bits.
-#define ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_PUT_POLICY_PAGE_CODE(x)    (ISCSI_BITS_PUT((x), ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_POLICY_PAGE_CODE_FIRST_BIT, ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_POLICY_PAGE_CODE_LAST_BIT))
-
-
-/// iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry Data flags mode page policy: First bit of the two bits.
-#define ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_MODE_PAGE_POLICY_FIRST_BIT 0
-
-/// iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry Data flags mode page policy: Last bit of the two bits.
-#define ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_MODE_PAGE_POLICY_LAST_BIT  ((ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_MODE_PAGE_POLICY_FIRST_BIT) + 2 - 1)
-
-/// iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry Data flags mode page policy: Bit mask.
-#define ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_MODE_PAGE_POLICY_MASK      (ISCSI_BITS_GET_MASK(ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_MODE_PAGE_POLICY_FIRST_BIT, ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_MODE_PAGE_POLICY_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry Data flags mode page policy: Extracts the mode page policy bits.
-#define ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_GET_MODE_PAGE_POLICY(x)    (ISCSI_BITS_GET((x), ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_MODE_PAGE_POLICY_FIRST_BIT, ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_MODE_PAGE_POLICY_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry Data flags mode page policy: Stores into the mode page policy bits.
-#define ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_PUT_MODE_PAGE_POLICY(x)    (ISCSI_BITS_PUT((x), ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_MODE_PAGE_POLICY_FIRST_BIT, ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_MODE_PAGE_POLICY_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry Data flag: Multiple Logical Units Share (MLUS).
-#define ISCSI_SCSI_VPD_MODE_PAGE_POLICY_DESC_INQUIRY_DATA_FLAGS_MLUS                        (1 << 7)
-
-
-/**
- * @brief iSCSI SCSI Vital Product Data (VPD) Mode Page Policy Descriptor Inquiry data packet.
- *
- * This structure is used by the SCSI INQUIRY command
- * in order to fill in the result if the EVPD bit is
- * set.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_vpd_mode_page_policy_desc_inquiry_data_packet {
-    /// Policy page code.
-    uint8_t page_code;
-
-    /// Policy sub page code.
-    uint8_t sub_page_code;
-
-    /// Policy flags.
-    int8_t flags;
-
-    /// Reserved for future usage (always MUST be 0).
-    uint8_t reserved;
-} iscsi_scsi_vpd_mode_page_policy_desc_inquiry_data_packet;
-
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data protocol identifier: iSCSI.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PROTOCOL_ID_ISCSI     0x05
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data protocol identifier: First bit of the four bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PROTOCOL_ID_FIRST_BIT 0
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data protocol identifier: Last bit of the four bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PROTOCOL_ID_LAST_BIT  ((ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PROTOCOL_ID_FIRST_BIT) + 4 - 1)
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data protocol identifier: Bit mask.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PROTOCOL_ID_MASK      (ISCSI_BITS_GET_MASK(ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PROTOCOL_ID_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PROTOCOL_ID_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data protocol identifier: Extracts the protocol identifier bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_GET_PROTOCOL_ID(x)    (ISCSI_BITS_GET((x), ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PROTOCOL_ID_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PROTOCOL_ID_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data protocol identifier: Stores into the protocol identifier bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PUT_PROTOCOL_ID(x)    (ISCSI_BITS_PUT((x), ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PROTOCOL_ID_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PROTOCOL_ID_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data code set: Binary encoding.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_BINARY       0x01
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data code set: ASCII encoding.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_ASCII        0x02
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data code set: UTF-8 encoding.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_UTF8         0x03
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data code set: First bit of the four bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_FIRST_BIT    4
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data code set: Last bit of the four bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_LAST_BIT     ((ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_FIRST_BIT) + 8 - 1)
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data code set: Bit mask.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_MASK         (ISCSI_BITS_GET_MASK(ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data code set: Extracts the protocol identifier bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_GET_CODE_SET(x)       (ISCSI_BITS_GET((x), ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data code set: Stores into the protocol identifier bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_PUT_CODE_SET(x)       (ISCSI_BITS_PUT((x), ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_CODE_SET_LAST_BIT))
-
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: Vendor specific.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_VENDOR_SPEC        0x00
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: T10 vendor identifier.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_T10_VENDOR_ID      0x01
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: EUI64.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_EUI64              0x02
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: NAA.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_NAA                0x03
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: Relative target port.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_REL_TARGET_PORT    0x04
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: Target port group.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_TARGET_PORT_GROUP  0x05
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: Logical unit group.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_LOGICAL_UNIT_GROUP 0x06
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: MD5 logical unit.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_MD5_LOGICAL_UNIT   0x07
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: SCSI name.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_SCSI_NAME          0x08
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: First bit of the four bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_FIRST_BIT          0
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: Last bit of the four bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_LAST_BIT           ((ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_FIRST_BIT) + 4 - 1)
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: Bit mask.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_MASK               (ISCSI_BITS_GET_MASK(ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: Extracts the type bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_GET_TYPE(x)             (ISCSI_BITS_GET((x), ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags type: Stores into the type bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_PUT_TYPE(x)             (ISCSI_BITS_PUT((x), ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_TYPE_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags association: Logical unit.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_LOGICAL_UNIT      0x0
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags association: Target port.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_TARGET_PORT       0x1
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags association: Target device.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_TARGET_DEVICE     0x2
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags association: First bit of the two bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_FIRST_BIT         4
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags association: Last bit of the two bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_LAST_BIT          ((ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_FIRST_BIT) + 6 - 1)
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags association: Bit mask.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_MASK              (ISCSI_BITS_GET_MASK(ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags association: Extracts the association bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_GET_ASSOC(x)            (ISCSI_BITS_GET((x), ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags association: Stores into the association bits.
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_PUT_ASSOC(x)            (ISCSI_BITS_PUT((x), ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_FIRST_BIT, ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_ASSOC_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data flags: Protocol Identifier Valid (PIV).
-#define ISCSI_SCSI_VPD_SCSI_TARGET_PORT_DESIGN_DESC_INQUIRY_DATA_FLAGS_PIV                     (1 << 7)
-
-
-/**
- * @brief iSCSI SCSI Vital Product Data (VPD) SCSI Target Port Designation Descriptor Inquiry data packet.
- *
- * This structure is used by the SCSI INQUIRY command
- * in order to fill in the result if the EVPD bit is
- * set.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_vpd_scsi_target_port_design_dec_inquiry_data_packet {
-    /// Protocol identifier and code set.
-    uint8_t protocol_id_code_set;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Reserved for future usage (always MUST be 0).
-    uint8_t reserved;
-
-    /// Length in bytes.
-    uint8_t len;
-
-    /// Designator.
-    uint8_t design[0];
-} iscsi_scsi_vpd_scsi_target_port_design_dec_inquiry_data_packet;
-
-
-/**
- * @brief iSCSI SCSI Vital Product Data (VPD) SCSI Port Designation Descriptor Inquiry data packet.
- *
- * This structure is used by the SCSI INQUIRY command
- * in order to fill in the result if the EVPD bit is
- * set.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_vpd_scsi_port_design_dec_inquiry_data_packet {
-    /// Reserved for future usage (always MUST be 0).
-    uint16_t reserved;
-
-    /// Relative port identifier.
-    uint16_t rel_port_id;
-
-    /// Reserved for future usage (always MUST be 0).
-    uint16_t reserved2;
-
-    /// Initiator port length in bytes.
-    uint16_t init_port_len;
-
-    /// Initiator port identifier.
-    uint16_t init_port_id[0];
-
-    /// Reserved for future usage (always MUST be 0).
-    uint16_t reserved3;
-
-    /// SCSI Target Port Designation Descriptor length in bytes.
-    uint16_t target_desc_len;
-
-    /// SCSI Target Port Designation Descriptor.
-    iscsi_scsi_vpd_scsi_target_port_design_dec_inquiry_data_packet target_desc[0];
-} iscsi_scsi_vpd_scsi_port_design_dec_inquiry_data_packet;
-
-
-/**
- * @brief iSCSI SCSI command INQUIRY Vital Product Data (VPD) SCSI Port Designation Descriptor entry fill.
- *
- * This structure is used by iterating through
- * all iSCSI device ports in order to fill in
- * the INQUIRY Vital Product Data (VPD) SCSI
- * Port Designation Descriptor structure.
- */
-typedef struct iscsi_scsi_emu_primary_inquiry_ports_fill {
-    /// Pointer to current Vital Product Data (VPD) SCSI Port Designation Descriptor entry packet data.
-    iscsi_scsi_vpd_scsi_port_design_dec_inquiry_data_packet *port_entry;
-
-    /// Total length of Vital Product Data (VPD) SCSI Port Designation Descriptor entry packet data in bytes.
-    uint alloc_len;
-
-    /// Total remaining allocation length for packet data in bytes.
-    uint len;
-} iscsi_scsi_emu_primary_inquiry_ports_fill;
-
-
 /// iSCSI SCSI Vital Product Data (VPD) Page Block Limits Inquiry data UNMAP Granularity Alignment: First bit of the thirty one bits.
 #define ISCSI_SCSI_VPD_PAGE_BLOCK_LIMITS_INQUIRY_DATA_UNMAP_GRANULARITY_ALIGN_FIRST_BIT 0L
 
@@ -2936,44 +1896,44 @@ typedef struct iscsi_scsi_emu_primary_inquiry_ports_fill {
  * set.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_block_limits_inquiry_data_packet {
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Maximum COMPARE AND WRITE length in logical blocks.
-    uint8_t max_cmp_write_len;
+	/// Maximum COMPARE AND WRITE length in logical blocks.
+	uint8_t max_cmp_write_len;
 
-    /// Optimal transfer length granularity in logical blocks.
-    uint16_t optimal_granularity_xfer_len;
+	/// Optimal transfer length granularity in logical blocks.
+	uint16_t optimal_granularity_xfer_len;
 
-    /// Maximum transfer length in logical blocks.
-    uint32_t max_xfer_len;
+	/// Maximum transfer length in logical blocks.
+	uint32_t max_xfer_len;
 
-    /// Optimal transfer length in logical blocks.
-    uint32_t optimal_xfer_len;
+	/// Optimal transfer length in logical blocks.
+	uint32_t optimal_xfer_len;
 
-    /// Maximum prefetch length in logical blocks.
-    uint32_t max_prefetch_len;
+	/// Maximum prefetch length in logical blocks.
+	uint32_t max_prefetch_len;
 
-    /// Maximum UNMAP LBA count in LBAs.
-    uint32_t max_unmap_lba_cnt;
+	/// Maximum UNMAP LBA count in LBAs.
+	uint32_t max_unmap_lba_cnt;
 
-    /// Maximum UNMAP block descriptor count in block descriptors.
-    uint32_t max_unmap_block_desc_cnt;
+	/// Maximum UNMAP block descriptor count in block descriptors.
+	uint32_t max_unmap_block_desc_cnt;
 
-    /// Optimal UNMAP granularity in logical blocks.
-    uint32_t optimal_unmap_granularity;
+	/// Optimal UNMAP granularity in logical blocks.
+	uint32_t optimal_unmap_granularity;
 
-    /// UNMAP granularity alignment (first LBA) and UGAVALID bit.
-    uint32_t unmap_granularity_align_ugavalid;
+	/// UNMAP granularity alignment (first LBA) and UGAVALID bit.
+	uint32_t unmap_granularity_align_ugavalid;
 
-    /// Maximum WRITE SAME length in logical blocks.
-    uint64_t max_write_same_len;
+	/// Maximum WRITE SAME length in logical blocks.
+	uint64_t max_write_same_len;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint64_t reserved[2];
+	/// Reserved for future usage (always MUST be 0).
+	uint64_t reserved[2];
 
-    /// Reserved for future usage (always MUST be 0).
-    uint32_t reserved2;
+	/// Reserved for future usage (always MUST be 0).
+	uint32_t reserved2;
 } iscsi_scsi_vpd_page_block_limits_inquiry_data_packet;
 
 /// iSCSI SCSI Vital Product Data (VPD) Page Block Device Characteristics Inquiry data medium rotation rate: Medium rotation rate is not reported.
@@ -3069,131 +2029,32 @@ typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_block_limits_inquiry_
  * set.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_block_dev_chars_inquiry_data_packet {
-    /// Medium rotation rate.
-    uint16_t medium_rotation_rate;
+	/// Medium rotation rate.
+	uint16_t medium_rotation_rate;
 
-    /// Product type.
-    uint8_t product_type;
+	/// Product type.
+	uint8_t product_type;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Support flags.
-    uint8_t support_flags;
+	/// Support flags.
+	uint8_t support_flags;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint64_t reserved[6];
+	/// Reserved for future usage (always MUST be 0).
+	uint64_t reserved[6];
 
-    /// Reserved for future usage (always MUST be 0).
-    uint32_t reserved2;
+	/// Reserved for future usage (always MUST be 0).
+	uint32_t reserved2;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint16_t reserved3;
+	/// Reserved for future usage (always MUST be 0).
+	uint16_t reserved3;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint8_t reserved4;
+	/// Reserved for future usage (always MUST be 0).
+	uint8_t reserved4;
 } iscsi_scsi_vpd_page_block_dev_chars_inquiry_data_packet;
 
 
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data flags: Descriptor Present (DP).
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_FLAGS_DP      (1 << 0)
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data flags: Anchor Supported (ANC_SUP).
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_FLAGS_ANC_SUP (1 << 1)
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data flags: Logical Block Provisioning Read Zeros (LBPRZ).
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_FLAGS_LBPRZ   (1 << 2)
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data flags: Logical Block Provisioning WRITE SAME(10) (LBPWS10).
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_FLAGS_LBPWS10 (1 << 5)
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data flags: Logical Block Provisioning WRITE SAME (LBPWS).
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_FLAGS_LBPWS   (1 << 6)
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data flags: Logical Block Provisioning UNMAP (LBPU).
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_FLAGS_LBPU    (1 << 7)
-
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data provision type: The device server does NOT report a provisioning type.
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_PROVISIONING_NOT_REPORTED 0x0
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data provision type: The logical unit is resource provisioned (see SBC3).
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_RESOURCE_PROVISIONING     0x1
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data provision type: The logical unit is thin provisioned (see SBC3).
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_THIN_PROVISIONING         0x2
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data provision type: First bit of the three bits.
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_FIRST_BIT                 0
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data provision type: Last bit of the three bits.
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_LAST_BIT                  ((ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_FIRST_BIT) + 3 - 1)
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data provision type: Bit mask.
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_MASK                      (ISCSI_BITS_GET_MASK(ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_FIRST_BIT, ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data provision type: Extracts the provision type bits.
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_GET_PROVISION_TYPE(x)                    (ISCSI_BITS_GET((x), ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_FIRST_BIT, ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_LAST_BIT))
-
-/// iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data provision type: Stores into the provision type bits.
-#define ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PUT_PROVISION_TYPE(x)                    (ISCSI_BITS_PUT((x), ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_FIRST_BIT, ISCSI_SCSI_VPD_PAGE_THIN_PROVISION_INQUIRY_DATA_PROVISION_TYPE_LAST_BIT))
-
-
-/**
- * @brief iSCSI SCSI Vital Product Data (VPD) Page Thin Provision Inquiry data packet.
- *
- * This structure is used by the SCSI INQUIRY command
- * in order to fill in the result if the EVPD bit is
- * set.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_vpd_page_thin_provision_inquiry_data_packet {
-    /// Threshold exponent.
-    uint8_t threshold_exponent;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Provision type.
-    uint8_t provision_type;
-
-    /// Reserved for future usage (always MUST be 0).
-    uint8_t reserved;
-
-    /// Provision group descriptors.
-    uint8_t provision_group_desc[0];
-} iscsi_scsi_vpd_page_thin_provision_inquiry_data_packet;
-
-
-/**
- * @brief iSCSI SCSI Sense Event data packet.
- *
- * For a SCSI event, this data accompanies the report in the data
- * segment and identifies the condition.
- *
- * For an iSCSI event, additional vendor-unique data MAY accompany the
- * Async event. Initiators MAY ignore the data when not understood,
- * while processing the rest of the PDU.
- *
- * If the DataSegmentLength is not 0, the format of the DataSegment is
- * as follows:
- */
-typedef struct __attribute__((packed)) iscsi_scsi_sense_event_data_packet {
-    /**
-     * @brief SenseLength.
-     *
-     * This is the length of Sense Data. When the Sense Data field is empty
-     * (e.g., the event is not a SCSI event), SenseLength is 0.
-     */
-    uint16_t sense_len;
-
-    /// Sense Data.
-    uint16_t sense_data[0];
-
-    /// iSCSI Event Data.
-    uint16_t event_data[0];
-} iscsi_scsi_sense_event_data_packet;
-
-
 /// iSCSI SCSI sense data response code: Current format.
 #define ISCSI_SCSI_SENSE_DATA_RESPONSE_CODE_CURRENT_FMT  0x70
 
@@ -3251,20 +2112,20 @@ typedef struct __attribute__((packed)) iscsi_scsi_sense_event_data_packet {
  * all SCSI sense data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_sense_data_packet {
-    /// Response code.
-    int8_t response_code;
+	/// Response code.
+	int8_t response_code;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0).
+	uint8_t reserved;
 
-    /// Sense key and flags.
-    int8_t sense_key_flags;
+	/// Sense key and flags.
+	int8_t sense_key_flags;
 
-    /// Information.
-    uint32_t info;
+	/// Information.
+	uint32_t info;
 
-    /// Additional sense length in bytes.
-    uint8_t add_len;
+	/// Additional sense length in bytes.
+	uint8_t add_len;
 } iscsi_scsi_sense_data_packet;
 
 /// iSCSI SCSI maximum sense data length.
@@ -3297,26 +2158,26 @@ typedef struct __attribute__((packed)) iscsi_scsi_sense_data_packet {
  * the check condition status code.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_sense_data_check_cond_packet {
-    /// Basic SCSI sense data packet.
-    iscsi_scsi_sense_data_packet sense_data;
+	/// Basic SCSI sense data packet.
+	iscsi_scsi_sense_data_packet sense_data;
 
-    /// Information.
-    uint32_t cmd_spec_info;
+	/// Information.
+	uint32_t cmd_spec_info;
 
-    /// Additional Sense Code (ASC).
-    uint8_t asc;
+	/// Additional Sense Code (ASC).
+	uint8_t asc;
 
-    /// Additional Sense Code Qualifier (ASCQ).
-    uint8_t ascq;
+	/// Additional Sense Code Qualifier (ASCQ).
+	uint8_t ascq;
 
-    /// Field replaceable unit code.
-    uint32_t field_rep_unit_code;
+	/// Field replaceable unit code.
+	uint32_t field_rep_unit_code;
 
-    /// Sense key specific.
-    uint8_t sense_key_spec_flags;
+	/// Sense key specific.
+	uint8_t sense_key_spec_flags;
 
-    /// Sense key specific.
-    uint16_t sense_key_spec;
+	/// Sense key specific.
+	uint16_t sense_key_spec;
 } iscsi_scsi_sense_data_check_cond_packet;
 
 
@@ -3327,11 +2188,11 @@ typedef struct __attribute__((packed)) iscsi_scsi_sense_data_check_cond_packet {
  * and block length in bytes.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_read_capacity_10_parameter_data_packet {
-    /// Last valid Logical Block Address (LBA).
-    uint32_t lba;
+	/// Last valid Logical Block Address (LBA).
+	uint32_t lba;
 
-    /// Block length in bytes.
-    uint32_t block_len;
+	/// Block length in bytes.
+	uint32_t block_len;
 } iscsi_scsi_read_capacity_10_parameter_data_packet;
 
 
@@ -3429,23 +2290,23 @@ typedef struct __attribute__((packed)) iscsi_scsi_read_capacity_10_parameter_dat
  * block length in bytes and LBP information.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_service_action_in_16_parameter_data_packet {
-    /// Last valid Logical Block Address (LBA).
-    uint64_t lba;
+	/// Last valid Logical Block Address (LBA).
+	uint64_t lba;
 
-    /// Block length in bytes.
-    uint32_t block_len;
+	/// Block length in bytes.
+	uint32_t block_len;
 
-    /// Flags: RC_BASIS, P_TYPE and PROT_EN.
-    int8_t flags;
+	/// Flags: RC_BASIS, P_TYPE and PROT_EN.
+	int8_t flags;
 
-    /// P_I_EXPONENT and logical blocks per physical block exponent.
-    uint8_t exponents;
+	/// P_I_EXPONENT and logical blocks per physical block exponent.
+	uint8_t exponents;
 
-    /// Logical Block Provisioning Management Enabled (LBPME), Logical Block Provisioning Read Zeros (LBPRZ) and Lowest Aligned Logical Block Address (LALBA).
-    uint16_t lbp_lalba;
+	/// Logical Block Provisioning Management Enabled (LBPME), Logical Block Provisioning Read Zeros (LBPRZ) and Lowest Aligned Logical Block Address (LALBA).
+	uint16_t lbp_lalba;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint64_t reserved[2];
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint64_t reserved[2];
 } iscsi_scsi_service_action_in_16_parameter_data_packet;
 
 
@@ -3456,11 +2317,11 @@ typedef struct __attribute__((packed)) iscsi_scsi_service_action_in_16_parameter
  * LUN list in bytes.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_report_luns_parameter_data_lun_list_packet {
-    /// Number of LUN's following this packet in bytes.
-    uint32_t lun_list_len;
+	/// Number of LUN's following this packet in bytes.
+	uint32_t lun_list_len;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint32_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint32_t reserved;
 } iscsi_scsi_report_luns_parameter_data_lun_list_packet;
 
 
@@ -3471,44 +2332,19 @@ typedef struct __attribute__((packed)) iscsi_scsi_report_luns_parameter_data_lun
  * LUN list.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_report_luns_parameter_data_lun_entry_packet {
-    /// Logical Unit Number (LUN).
-    uint64_t lun;
+	/// Logical Unit Number (LUN).
+	uint64_t lun;
 } iscsi_scsi_report_luns_parameter_data_lun_entry_packet;
 
 
 /**
- * @brief iSCSI SCSI command REPORT LUNS parameter data LUN entry fill.
- *
- * This structure is used by iterating through
- * all iSCSI LUNs in order to fill in the
- * REPORT LUNS parameter data structure.
- */
-typedef struct iscsi_scsi_emu_primary_report_luns_fill {
-    /// Pointer to LUN list packet data.
-    iscsi_scsi_report_luns_parameter_data_lun_list_packet *lun_list;
-
-    /// Pointer to current LUN entry packet data.
-    iscsi_scsi_report_luns_parameter_data_lun_entry_packet *lun_entry;
-
-    /// Total length of LUN entry packet data in bytes.
-    uint32_t len;
-
-    /// Total remaining allocation length for packet data in bytes.
-    uint alloc_len;
-
-    /// Select report.
-    uint select_report;
-} iscsi_scsi_emu_primary_report_luns_fill;
-
-
-/**
  * @brief iSCSI SCSI command MODE SELECT(6) parameter list packet data.
  *
  * This returns 32-bit vendor specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_select_6_parameter_list_packet {
-    /// Vendor specific data.
-    uint32_t vendor_data;
+	/// Vendor specific data.
+	uint32_t vendor_data;
 } iscsi_scsi_mode_select_6_parameter_list_packet;
 
 
@@ -3518,8 +2354,8 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_select_6_parameter_list_p
  * This returns 64-bit vendor specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_select_10_parameter_list_packet {
-    /// Vendor specific data.
-    uint64_t vendor_data;
+	/// Vendor specific data.
+	uint64_t vendor_data;
 } iscsi_scsi_mode_select_10_parameter_list_packet;
 
 
@@ -3537,17 +2373,17 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_select_10_parameter_list_
  * data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_6_parameter_header_data_packet {
-    /// Mode data length in bytes.
-    uint8_t mode_data_len;
+	/// Mode data length in bytes.
+	uint8_t mode_data_len;
 
-    /// Medium type.
-    uint8_t medium_type;
+	/// Medium type.
+	uint8_t medium_type;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Block descriptor length in bytes.
-    uint8_t block_desc_len;
+	/// Block descriptor length in bytes.
+	uint8_t block_desc_len;
 } iscsi_scsi_mode_sense_6_parameter_header_data_packet;
 
 
@@ -3569,23 +2405,23 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_6_parameter_header_
  * data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_10_parameter_header_data_packet {
-    /// Mode data length in bytes.
-    uint16_t mode_data_len;
+	/// Mode data length in bytes.
+	uint16_t mode_data_len;
 
-    /// Medium type.
-    uint8_t medium_type;
+	/// Medium type.
+	uint8_t medium_type;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Long Logical Block Address (LONGLBA).
-    uint8_t long_lba;
+	/// Long Logical Block Address (LONGLBA).
+	uint8_t long_lba;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved;
 
-    /// Block descriptor length in bytes.
-    uint16_t block_desc_len;
+	/// Block descriptor length in bytes.
+	uint16_t block_desc_len;
 } iscsi_scsi_mode_sense_10_parameter_header_data_packet;
 
 
@@ -3597,14 +2433,14 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_10_parameter_header
  * descriptor data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_lba_parameter_block_desc_data_packet {
-    /// Number of blocks in logical blocks.
-    uint32_t num_blocks;
+	/// Number of blocks in logical blocks.
+	uint32_t num_blocks;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved;
 
-    /// Logical blcok length in bytes.
-    uint8_t block_len[3];
+	/// Logical blcok length in bytes.
+	uint8_t block_len[3];
 } iscsi_scsi_mode_sense_lba_parameter_block_desc_data_packet;
 
 
@@ -3616,14 +2452,14 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_lba_parameter_block
  * descriptor data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_long_lba_parameter_block_desc_data_packet {
-    /// Number of blocks in logical blocks.
-    uint64_t num_blocks;
+	/// Number of blocks in logical blocks.
+	uint64_t num_blocks;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint32_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint32_t reserved;
 
-    /// Logical blcok length in bytes.
-    uint32_t block_len;
+	/// Logical blcok length in bytes.
+	uint32_t block_len;
 } iscsi_scsi_mode_sense_long_lba_parameter_block_desc_data_packet;
 
 
@@ -3862,14 +2698,14 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_long_lba_parameter_
  * This returns mode page specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_mode_page_data_packet {
-    /// Page code and flags.
-    int8_t page_code_flags;
+	/// Page code and flags.
+	int8_t page_code_flags;
 
-    /// Page length in bytes.
-    uint8_t page_len;
+	/// Page length in bytes.
+	uint8_t page_len;
 
-    /// Mode parameters.
-    uint8_t params[0];
+	/// Mode parameters.
+	uint8_t params[0];
 } iscsi_scsi_mode_sense_mode_page_data_packet;
 
 
@@ -3879,17 +2715,17 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_mode_page_data_pack
  * This returns mode sub page specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_mode_sub_page_data_packet {
-    /// Page code and flags.
-    int8_t page_code_flags;
+	/// Page code and flags.
+	int8_t page_code_flags;
 
-    /// Sub page code.
-    uint8_t sub_page_code;
+	/// Sub page code.
+	uint8_t sub_page_code;
 
-    /// Page length in bytes.
-    uint16_t page_len;
+	/// Page length in bytes.
+	uint16_t page_len;
 
-    /// Mode parameters.
-    uint8_t params[0];
+	/// Mode parameters.
+	uint8_t params[0];
 } iscsi_scsi_mode_sense_mode_sub_page_data_packet;
 
 
@@ -3899,29 +2735,29 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_mode_sub_page_data_
  * This returns mode page specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_read_write_err_recovery_mode_page_data_packet {
-    /// Mode page.
-    iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
+	/// Mode page.
+	iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Read retry count.
-    uint8_t read_retry_cnt;
+	/// Read retry count.
+	uint8_t read_retry_cnt;
 
-    /// Obselete.
-    uint8_t obselete[3];
+	/// Obselete.
+	uint8_t obselete[3];
 
-    /// Restricted for MMC-6.
-    uint8_t restrict_mmc_6;
+	/// Restricted for MMC-6.
+	uint8_t restrict_mmc_6;
 
-    /// Write_retry count.
-    uint8_t write_retry_cnt;
+	/// Write_retry count.
+	uint8_t write_retry_cnt;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved;
 
-    /// Recovery time limit.
-    uint16_t recovery_time_limit;
+	/// Recovery time limit.
+	uint16_t recovery_time_limit;
 } iscsi_scsi_mode_sense_read_write_err_recovery_mode_page_data_packet;
 
 
@@ -3931,32 +2767,32 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_read_write_err_reco
  * This returns mode page specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_disconnect_reconnect_mode_page_data_packet {
-    /// Mode page.
-    iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
+	/// Mode page.
+	iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint16_t reserved;
 
-    /// Bus inactivity time limit.
-    uint16_t bus_inactivity_time_limit;
+	/// Bus inactivity time limit.
+	uint16_t bus_inactivity_time_limit;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved2;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint16_t reserved2;
 
-    /// Maximum connect time limit.
-    uint16_t max_connect_time_limit;
+	/// Maximum connect time limit.
+	uint16_t max_connect_time_limit;
 
-    /// Maximum burst size.
-    uint16_t max_burst_size;
+	/// Maximum burst size.
+	uint16_t max_burst_size;
 
-    /// Restricted.
-    uint8_t restricted;
+	/// Restricted.
+	uint8_t restricted;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved3;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved3;
 
-    /// First burst size.
-    uint16_t first_burst_size;
+	/// First burst size.
+	uint16_t first_burst_size;
 } iscsi_scsi_mode_sense_disconnect_reconnect_mode_page_data_packet;
 
 
@@ -3966,35 +2802,35 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_disconnect_reconnec
  * This returns mode page specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_verify_err_recovery_mode_page_data_packet {
-    /// Mode page.
-    iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
+	/// Mode page.
+	iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Verify retry count.
-    uint8_t verify_retry_cnt;
+	/// Verify retry count.
+	uint8_t verify_retry_cnt;
 
-    /// Obselete.
-    uint8_t obselete;
+	/// Obselete.
+	uint8_t obselete;
 
-    /// Head offset count.
-    uint8_t head_offset_cnt;
+	/// Head offset count.
+	uint8_t head_offset_cnt;
 
-    /// Data strobe offset count.
-    uint8_t data_strobe_offset_cnt;
+	/// Data strobe offset count.
+	uint8_t data_strobe_offset_cnt;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved;
 
-    /// Write retry count.
-    uint8_t write_retry_cnt;
+	/// Write retry count.
+	uint8_t write_retry_cnt;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved2;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved2;
 
-    /// Verify_recovery time limit.
-    uint16_t verify_recovery_time_limit;
+	/// Verify_recovery time limit.
+	uint16_t verify_recovery_time_limit;
 } iscsi_scsi_mode_sense_verify_err_recovery_mode_page_data_packet;
 
 
@@ -4029,41 +2865,41 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_verify_err_recovery
  * This returns mode page specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_caching_mode_page_data_packet {
-    /// Mode page.
-    iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
+	/// Mode page.
+	iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Retention priority.
-    uint8_t retention_pri;
+	/// Retention priority.
+	uint8_t retention_pri;
 
-    /// Disable prefetch transfer length.
-    uint16_t disable_prefetch_xfer_len;
+	/// Disable prefetch transfer length.
+	uint16_t disable_prefetch_xfer_len;
 
-    /// Minimum prefetch.
-    uint16_t min_prefetch;
+	/// Minimum prefetch.
+	uint16_t min_prefetch;
 
-    /// Maximum prefetch.
-    uint16_t max_prefetch;
+	/// Maximum prefetch.
+	uint16_t max_prefetch;
 
-    /// Maximum prefetch ceiling.
-    uint16_t max_prefetch_ceil;
+	/// Maximum prefetch ceiling.
+	uint16_t max_prefetch_ceil;
 
-    /// Cache flags.
-    int8_t cache_flags;
+	/// Cache flags.
+	int8_t cache_flags;
 
-    /// Number of cache segments.
-    uint8_t num_cache_segs;
+	/// Number of cache segments.
+	uint8_t num_cache_segs;
 
-    /// Cache segment size.
-    uint16_t cache_seg_size;
+	/// Cache segment size.
+	uint16_t cache_seg_size;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved;
 
-    /// Obselete.
-    uint8_t obselete[3];
+	/// Obselete.
+	uint8_t obselete[3];
 } iscsi_scsi_mode_sense_caching_mode_page_data_packet;
 
 
@@ -4073,29 +2909,29 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_caching_mode_page_d
  * This returns mode page specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_control_mode_page_data_packet {
-    /// Mode page.
-    iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
+	/// Mode page.
+	iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Queue flags.
-    int8_t queue_flags;
+	/// Queue flags.
+	int8_t queue_flags;
 
-    /// Control flags.
-    int8_t control_flags;
+	/// Control flags.
+	int8_t control_flags;
 
-    /// Application task flags.
-    int8_t app_task_flags;
+	/// Application task flags.
+	int8_t app_task_flags;
 
-    /// Ready AER holdoff period.
-    uint16_t ready_aer_holdoff_period;
+	/// Ready AER holdoff period.
+	uint16_t ready_aer_holdoff_period;
 
-    /// Busy timeout period.
-    uint16_t busy_timeout_period;
+	/// Busy timeout period.
+	uint16_t busy_timeout_period;
 
-    /// Extended self-test completition time.
-    uint16_t ext_self_test_complete_time;
+	/// Extended self-test completition time.
+	uint16_t ext_self_test_complete_time;
 } iscsi_scsi_mode_sense_control_mode_page_data_packet;
 
 
@@ -4105,23 +2941,23 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_control_mode_page_d
  * This returns mode sub page specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_control_ext_mode_page_data_packet {
-    /// Mode page.
-    iscsi_scsi_mode_sense_mode_sub_page_data_packet mode_sub_page;
+	/// Mode page.
+	iscsi_scsi_mode_sense_mode_sub_page_data_packet mode_sub_page;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Initial command priority.
-    uint8_t init_cmd_pri;
+	/// Initial command priority.
+	uint8_t init_cmd_pri;
 
-    /// Maximum sense data length in bytes.
-    uint8_t max_sense_data_len;
+	/// Maximum sense data length in bytes.
+	uint8_t max_sense_data_len;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint64_t reserved[3];
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint64_t reserved[3];
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved2;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved2;
 } iscsi_scsi_mode_sense_control_ext_mode_page_data_packet;
 
 
@@ -4131,32 +2967,32 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_control_ext_mode_pa
  * This returns mode page specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_xor_ext_mode_page_data_packet {
-    /// Mode page.
-    iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
+	/// Mode page.
+	iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved;
 
-    /// Maximum XOR write size in logical blocks.
-    uint32_t max_xor_write_size;
+	/// Maximum XOR write size in logical blocks.
+	uint32_t max_xor_write_size;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint32_t reserved2;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint32_t reserved2;
 
-    /// Maximum regenerate size in logical blocks.
-    uint32_t max_regenerate_size;
+	/// Maximum regenerate size in logical blocks.
+	uint32_t max_regenerate_size;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint32_t reserved3;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint32_t reserved3;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved4;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint16_t reserved4;
 
-    /// Rebuild delay.
-    uint16_t rebuild_delay;
+	/// Rebuild delay.
+	uint16_t rebuild_delay;
 } iscsi_scsi_mode_sense_xor_ext_mode_page_data_packet;
 
 
@@ -4166,44 +3002,44 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_xor_ext_mode_page_d
  * This returns mode page specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_power_cond_mode_page_data_packet {
-    /// Mode page.
-    iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
+	/// Mode page.
+	iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Idle and standby flags.
-    int8_t idle_standby_flags;
+	/// Idle and standby flags.
+	int8_t idle_standby_flags;
 
-    /// idle_a condition timer.
-    uint32_t idle_a_cond_timer;
+	/// idle_a condition timer.
+	uint32_t idle_a_cond_timer;
 
-    /// standby_z condition timer.
-    uint32_t standby_z_cond_timer;
+	/// standby_z condition timer.
+	uint32_t standby_z_cond_timer;
 
-    /// idle_b condition timer.
-    uint32_t idle_b_cond_timer;
+	/// idle_b condition timer.
+	uint32_t idle_b_cond_timer;
 
-    /// idle_c condition timer.
-    uint32_t idle_c_cond_timer;
+	/// idle_c condition timer.
+	uint32_t idle_c_cond_timer;
 
-    /// standby_y condition timer.
-    uint32_t standby_y_cond_timer;
+	/// standby_y condition timer.
+	uint32_t standby_y_cond_timer;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint64_t reserved;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint64_t reserved;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint32_t reserved2;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint32_t reserved2;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint16_t reserved3;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint16_t reserved3;
 
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved4;
+	/// Reserved for future usage (always MUST be 0 for now).
+	uint8_t reserved4;
 
-    /// Check Condition From (CCF) flags.
-    int8_t ccf_flags;
+	/// Check Condition From (CCF) flags.
+	int8_t ccf_flags;
 } iscsi_scsi_mode_sense_power_cond_mode_page_data_packet;
 
 
@@ -4213,65 +3049,23 @@ typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_power_cond_mode_pag
  * This returns mode page specific data.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_mode_sense_info_exceptions_control_mode_page_data_packet {
-    /// Mode page.
-    iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
+	/// Mode page.
+	iscsi_scsi_mode_sense_mode_page_data_packet mode_page;
 
-    /// Flags.
-    int8_t flags;
+	/// Flags.
+	int8_t flags;
 
-    /// Method Of Reporting Informational Exceptions (MRIE) flags.
-    uint8_t mrie;
+	/// Method Of Reporting Informational Exceptions (MRIE) flags.
+	uint8_t mrie;
 
-    /// Interval timer.
-    uint32_t interval_timer;
+	/// Interval timer.
+	uint32_t interval_timer;
 
-    /// Report count.
-    uint32_t report_cnt;
+	/// Report count.
+	uint32_t report_cnt;
 } iscsi_scsi_mode_sense_info_exceptions_control_mode_page_data_packet;
 
 
-/**
- * @brief iSCSI SCSI command PERSISTENT RESERVE OUT parameter list packet data.
- *
- * This returns persistent storage specific data
- * like the reservation and service action keys.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_pr_reserve_out_parameter_list_packet {
-    /// Reservation key.
-    uint64_t r_key;
-
-    /// Service action reservation key.
-    uint64_t sa_key;
-
-    /// Obselete.
-    uint32_t obselete;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Reserved for future usage (always MUST be 0 for now).
-    uint8_t reserved;
-
-    /// Obselete.
-    uint16_t obselete2;
-
-} iscsi_scsi_pr_reserve_out_parameter_list_packet;
-
-
-/**
- * @brief iSCSI SCSI command PERSISTENT RESERVE IN parameter data packet data.
- *
- * This returns persistent storage specific data
- * like the reservation and service action keys.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_pr_reserve_in_parameter_data_packet {
-    /// Persistent Reservations (PR) Generation.
-    uint32_t pr_gen;
-
-    /// Additional length in bytes.
-    uint32_t add_len;
-} iscsi_scsi_pr_reserve_in_parameter_data_packet;
-
 
 /// SCSI command opcode (embedded in iSCSI protocol): TEST UNIT READY.
 #define ISCSI_SCSI_OPCODE_TESTUNITREADY          0x00
@@ -4498,86 +3292,80 @@ typedef struct __attribute__((packed)) iscsi_scsi_pr_reserve_in_parameter_data_p
  * direction is indicated by the R and/or W bit).
  */
 typedef struct __attribute__((packed)) iscsi_scsi_cmd_packet {
-    /// Always 1 according to the iSCSI specification.
-    uint8_t opcode;
-
-    /// Flags and Task Attributes.
-    int8_t flags_task;
-
-    /// Reserved for future usage, MUST always be 0.
-    uint16_t reserved;
-
-    /// Total length of AHS.
-    uint8_t total_ahs_len;
-
-    /// Length of DataSegment.
-    uint8_t ds_len[3];
-
-    /// SCSI LUN bit mask.
-    uint64_t lun;
-
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
-
-    /**
-     * @brief Expected Data Transfer Length.
-     *
-     * For unidirectional operations, the Expected Data Transfer Length
-     * field contains the number of bytes of data involved in this SCSI
-     * operation. For a unidirectional write operation (W flag set to 1 and
-     * R flag set to 0), the initiator uses this field to specify the number
-     * of bytes of data it expects to transfer for this operation. For a
-     * unidirectional read operation (W flag set to 0 and R flag set to 1),
-     * the initiator uses this field to specify the number of bytes of data
-     * it expects the target to transfer to the initiator. It corresponds
-     * to the SAM-2 byte count.\n
-     * For bidirectional operations (both R and W flags are set to 1), this
-     * field contains the number of data bytes involved in the write
-     * transfer. For bidirectional operations, an additional header segment
-     * MUST be present in the header sequence that indicates the
-     * Bidirectional Read Expected Data Transfer Length. The Expected Data
-     * Transfer Length field and the Bidirectional Read Expected Data
-     * Transfer Length field correspond to the SAM-2 byte count.
-     * If the Expected Data Transfer Length for a write and the length of
-     * the immediate data part that follows the command (if any) are the
-     * same, then no more data PDUs are expected to follow. In this case,
-     * the F bit MUST be set to 1.\n
-     * If the Expected Data Transfer Length is higher than the
-     * FirstBurstLength (the negotiated maximum amount of unsolicited data
-     * the target will accept), the initiator MUST send the maximum amount
-     * of unsolicited data OR ONLY the immediate data, if any.
-     * Upon completion of a data transfer, the target informs the initiator
-     * (through residual counts) of how many bytes were actually processed
-     * (sent and/or received) by the target.
-     */
-    uint32_t exp_xfer_len;
-
-    /// The CmdSN enables ordered delivery across multiple connections in a single session.
-    uint32_t cmd_sn;
-
-    /// Command responses up to ExpStatSN - 1 (modulo 2**32) have been received (acknowledges status) on the connection.
-    uint32_t exp_stat_sn;
-
-    /**
-     * @brief SCSI Command Descriptor Block (CDB).
-     *
-     * There are 16 bytes in the CDB field to accommodate the commonly used
-     * CDBs. Whenever the CDB is larger than 16 bytes, an Extended CDB AHS
-     * MUST be used to contain the CDB spillover.
-     */
-    iscsi_scsi_cdb scsi_cdb;
-
-    /// Optional AHS packet data.
-    iscsi_ahs_packet ahs;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-
-    /// Optional data segment, command data.
-    iscsi_scsi_ds_cmd_data ds_cmd_data;
-
-    /// Optional data digest.
-    iscsi_data_digest data_digest;
+	/// Always 1 according to the iSCSI specification.
+	uint8_t opcode;
+
+	/// Flags and Task Attributes.
+	int8_t flags_task;
+
+	/// Reserved for future usage, MUST always be 0.
+	uint16_t reserved;
+
+	/// Total length of AHS.
+	uint8_t total_ahs_len;
+
+	/// Length of DataSegment.
+	uint8_t ds_len[3];
+
+	/// SCSI LUN bit mask.
+	uint64_t lun;
+
+	/// Initiator Task Tag (ITT).
+	uint32_t init_task_tag;
+
+	/**
+	 * @brief Expected Data Transfer Length.
+	 *
+	 * For unidirectional operations, the Expected Data Transfer Length
+	 * field contains the number of bytes of data involved in this SCSI
+	 * operation. For a unidirectional write operation (W flag set to 1 and
+	 * R flag set to 0), the initiator uses this field to specify the number
+	 * of bytes of data it expects to transfer for this operation. For a
+	 * unidirectional read operation (W flag set to 0 and R flag set to 1),
+	 * the initiator uses this field to specify the number of bytes of data
+	 * it expects the target to transfer to the initiator. It corresponds
+	 * to the SAM-2 byte count.\n
+	 * For bidirectional operations (both R and W flags are set to 1), this
+	 * field contains the number of data bytes involved in the write
+	 * transfer. For bidirectional operations, an additional header segment
+	 * MUST be present in the header sequence that indicates the
+	 * Bidirectional Read Expected Data Transfer Length. The Expected Data
+	 * Transfer Length field and the Bidirectional Read Expected Data
+	 * Transfer Length field correspond to the SAM-2 byte count.
+	 * If the Expected Data Transfer Length for a write and the length of
+	 * the immediate data part that follows the command (if any) are the
+	 * same, then no more data PDUs are expected to follow. In this case,
+	 * the F bit MUST be set to 1.\n
+	 * If the Expected Data Transfer Length is higher than the
+	 * FirstBurstLength (the negotiated maximum amount of unsolicited data
+	 * the target will accept), the initiator MUST send the maximum amount
+	 * of unsolicited data OR ONLY the immediate data, if any.
+	 * Upon completion of a data transfer, the target informs the initiator
+	 * (through residual counts) of how many bytes were actually processed
+	 * (sent and/or received) by the target.
+	 */
+	uint32_t exp_xfer_len;
+
+	/// The CmdSN enables ordered delivery across multiple connections in a single session.
+	uint32_t cmd_sn;
+
+	/// Command responses up to ExpStatSN - 1 (modulo 2**32) have been received (acknowledges status) on the connection.
+	uint32_t exp_stat_sn;
+
+	/**
+	 * @brief SCSI Command Descriptor Block (CDB).
+	 *
+	 * There are 16 bytes in the CDB field to accommodate the commonly used
+	 * CDBs. Whenever the CDB is larger than 16 bytes, an Extended CDB AHS
+	 * MUST be used to contain the CDB spillover.
+	 */
+	iscsi_scsi_cdb scsi_cdb;
+
+	/// Optional AHS packet data.
+	iscsi_ahs_packet ahs;
+
+	/// Optional data segment, command data.
+	iscsi_scsi_ds_cmd_data ds_cmd_data;
 } iscsi_scsi_cmd_packet;
 
 
@@ -4778,497 +3566,133 @@ typedef struct __attribute__((packed)) iscsi_scsi_cmd_packet {
  * terms, response value 0x00 maps to the SCSI service response (see
  */
 typedef struct __attribute__((packed)) iscsi_scsi_response_packet {
-    /// Always 0x21 according to specification.
-    uint8_t opcode;
-
-    /// Flags.
-    int8_t flags;
-
-    /// This field contains the iSCSI service response.
-    uint8_t response;
-
-    /// The Status field is used to report the SCSI status of the command (as specified in SAM2) and is only valid if the response code is Command Completed at Target.
-    uint8_t status;
-
-    /// Total AHS length.
-    uint8_t total_ahs_len;
-
-    /// Data segment length.
-    uint8_t ds_len[3];
-
-    /// Reserved for future usage. Always MUST be 0.
-    uint64_t reserved;
-
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
-
-    /**
-     * @brief Copy of the last accepted Selective Negative / Sequence Number Acknowledgment (SNACK) tag.
-     *
-     * This field contains a copy of the SNACK Tag of the last SNACK Tag
-     * accepted by the target on the same connection and for the command for
-     * which the response is issued. Otherwise, it is reserved and should
-     * be set to 0.\n
-     * After issuing a R-Data SNACK, the initiator must discard any SCSI
-     * status unless contained in a SCSI Response PDU carrying the same
-     * SNACK Tag as the last issued R-Data SNACK for the SCSI command on the
-     * current connection.
-     */
-    uint32_t snack_tag;
-
-    /**
-     * @brief StatSN - Status Sequence Number.
-     *
-     * The StatSN is a sequence number that the target iSCSI layer generates
-     * per connection and that in turn enables the initiator to acknowledge
-     * status reception. The StatSN is incremented by 1 for every
-     * response/status sent on a connection, except for responses sent as a
-     * result of a retry or SNACK. In the case of responses sent due to a
-     * retransmission request, the StatSN MUST be the same as the first time
-     * the PDU was sent, unless the connection has since been restarted.
-     */
-    uint32_t stat_sn;
-
-    /**
-     * @brief ExpCmdSN - Next Expected CmdSN from This Initiator.
-     *
-     * The ExpCmdSN is a sequence number that the target iSCSI returns to
-     * the initiator to acknowledge command reception. It is used to update
-     * a local variable with the same name. An ExpCmdSN equal to
-     * MaxCmdSN + 1 indicates that the target cannot accept new commands.
-     */
-    uint32_t exp_cmd_sn;
-
-    /**
-     * @brief MaxCmdSN - Maximum CmdSN from This Initiator.
-     *
-     * The MaxCmdSN is a sequence number that the target iSCSI returns to
-     * the initiator to indicate the maximum CmdSN the initiator can send.
-     * It is used to update a local variable with the same name. If the
-     * MaxCmdSN is equal to ExpCmdSN - 1, this indicates to the initiator
-     * that the target cannot receive any additional commands. When the
-     * MaxCmdSN changes at the target while the target has no pending PDUs
-     * to convey this information to the initiator, it MUST generate a
-     * NOP-In to carry the new MaxCmdSN.
-     */
-    uint32_t max_cmd_sn;
-
-    /**
-     * @brief ExpDataSN or Reserved.
-     *
-     * This field indicates the number of Data-In (read) PDUs the target has
-     * sent for the command.\n
-     * This field MUST be 0 if the response code is not Command Completed at
-     * Target or the target sent no Data-In PDUs for the command.
-     */
-    uint32_t exp_data_sn;
-
-    /**
-     * @brief Bidirectional Read Residual Count or Reserved.
-     *
-     * The Bidirectional Read Residual Count field MUST be valid in the case
-     * where either the u bit or the o bit is set. If neither bit is set,
-     * the Bidirectional Read Residual Count field is reserved. Targets may
-     * set the Bidirectional Read Residual Count, and initiators may use it
-     * when the response code is Command Completed at Target. If the o bit
-     * is set, the Bidirectional Read Residual Count indicates the number of
-     * bytes that were not transferred to the initiator because the
-     * initiator's Bidirectional Read Expected Data Transfer Length was not
-     * sufficient. If the u bit is set, the Bidirectional Read Residual
-     * Count indicates the number of bytes that were not transferred to the
-     * initiator out of the number of bytes expected to be transferred.
-     */
-    uint32_t bidi_read_res_cnt;
-
-    /**
-     * @brief Residual Count or Reserved.
-     *
-     * The Residual Count field MUST be valid in the case where either the U
-     * bit or the O bit is set. If neither bit is set, the Residual Count
-     * field MUST be ignored on reception and SHOULD be set to 0 when
-     * sending. Targets may set the residual count, and initiators may use
-     * it when the response code is Command Completed at Target (even if the
-     * status returned is not GOOD). If the O bit is set, the Residual
-     * Count indicates the number of bytes that were not transferred because
-     * the initiator's Expected Data Transfer Length was not sufficient. If
-     * the U bit is set, the Residual Count indicates the number of bytes
-     * that were not transferred out of the number of bytes expected to be
-     * transferred.
-     */
-    uint32_t res_cnt;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-
-    /// Optional data segment, command data.
-    iscsi_scsi_ds_cmd_data ds_cmd_data;
-
-    /// Optional data digest.
-    iscsi_data_digest data_digest;
+	/// Always 0x21 according to specification.
+	uint8_t opcode;
+
+	/// Flags.
+	int8_t flags;
+
+	/// This field contains the iSCSI service response.
+	uint8_t response;
+
+	/// The Status field is used to report the SCSI status of the command (as specified in SAM2) and is only valid if the response code is Command Completed at Target.
+	uint8_t status;
+
+	/// Total AHS length.
+	uint8_t total_ahs_len;
+
+	/// Data segment length.
+	uint8_t ds_len[3];
+
+	/// Reserved for future usage. Always MUST be 0.
+	uint64_t reserved;
+
+	/// Initiator Task Tag (ITT).
+	uint32_t init_task_tag;
+
+	/**
+	 * @brief Copy of the last accepted Selective Negative / Sequence Number Acknowledgment (SNACK) tag.
+	 *
+	 * This field contains a copy of the SNACK Tag of the last SNACK Tag
+	 * accepted by the target on the same connection and for the command for
+	 * which the response is issued. Otherwise, it is reserved and should
+	 * be set to 0.\n
+	 * After issuing a R-Data SNACK, the initiator must discard any SCSI
+	 * status unless contained in a SCSI Response PDU carrying the same
+	 * SNACK Tag as the last issued R-Data SNACK for the SCSI command on the
+	 * current connection.
+	 */
+	uint32_t snack_tag;
+
+	/**
+	 * @brief StatSN - Status Sequence Number.
+	 *
+	 * The StatSN is a sequence number that the target iSCSI layer generates
+	 * per connection and that in turn enables the initiator to acknowledge
+	 * status reception. The StatSN is incremented by 1 for every
+	 * response/status sent on a connection, except for responses sent as a
+	 * result of a retry or SNACK. In the case of responses sent due to a
+	 * retransmission request, the StatSN MUST be the same as the first time
+	 * the PDU was sent, unless the connection has since been restarted.
+	 */
+	uint32_t stat_sn;
+
+	/**
+	 * @brief ExpCmdSN - Next Expected CmdSN from This Initiator.
+	 *
+	 * The ExpCmdSN is a sequence number that the target iSCSI returns to
+	 * the initiator to acknowledge command reception. It is used to update
+	 * a local variable with the same name. An ExpCmdSN equal to
+	 * MaxCmdSN + 1 indicates that the target cannot accept new commands.
+	 */
+	uint32_t exp_cmd_sn;
+
+	/**
+	 * @brief MaxCmdSN - Maximum CmdSN from This Initiator.
+	 *
+	 * The MaxCmdSN is a sequence number that the target iSCSI returns to
+	 * the initiator to indicate the maximum CmdSN the initiator can send.
+	 * It is used to update a local variable with the same name. If the
+	 * MaxCmdSN is equal to ExpCmdSN - 1, this indicates to the initiator
+	 * that the target cannot receive any additional commands. When the
+	 * MaxCmdSN changes at the target while the target has no pending PDUs
+	 * to convey this information to the initiator, it MUST generate a
+	 * NOP-In to carry the new MaxCmdSN.
+	 */
+	uint32_t max_cmd_sn;
+
+	/**
+	 * @brief ExpDataSN or Reserved.
+	 *
+	 * This field indicates the number of Data-In (read) PDUs the target has
+	 * sent for the command.\n
+	 * This field MUST be 0 if the response code is not Command Completed at
+	 * Target or the target sent no Data-In PDUs for the command.
+	 */
+	uint32_t exp_data_sn;
+
+	/**
+	 * @brief Bidirectional Read Residual Count or Reserved.
+	 *
+	 * The Bidirectional Read Residual Count field MUST be valid in the case
+	 * where either the u bit or the o bit is set. If neither bit is set,
+	 * the Bidirectional Read Residual Count field is reserved. Targets may
+	 * set the Bidirectional Read Residual Count, and initiators may use it
+	 * when the response code is Command Completed at Target. If the o bit
+	 * is set, the Bidirectional Read Residual Count indicates the number of
+	 * bytes that were not transferred to the initiator because the
+	 * initiator's Bidirectional Read Expected Data Transfer Length was not
+	 * sufficient. If the u bit is set, the Bidirectional Read Residual
+	 * Count indicates the number of bytes that were not transferred to the
+	 * initiator out of the number of bytes expected to be transferred.
+	 */
+	uint32_t bidi_read_res_cnt;
+
+	/**
+	 * @brief Residual Count or Reserved.
+	 *
+	 * The Residual Count field MUST be valid in the case where either the U
+	 * bit or the O bit is set. If neither bit is set, the Residual Count
+	 * field MUST be ignored on reception and SHOULD be set to 0 when
+	 * sending. Targets may set the residual count, and initiators may use
+	 * it when the response code is Command Completed at Target (even if the
+	 * status returned is not GOOD). If the O bit is set, the Residual
+	 * Count indicates the number of bytes that were not transferred because
+	 * the initiator's Expected Data Transfer Length was not sufficient. If
+	 * the U bit is set, the Residual Count indicates the number of bytes
+	 * that were not transferred out of the number of bytes expected to be
+	 * transferred.
+	 */
+	uint32_t res_cnt;
+
+	/// Optional data segment, command data.
+	iscsi_scsi_ds_cmd_data ds_cmd_data;
 } iscsi_scsi_response_packet;
 
-
-/// Task management request function: ABORT TASK: aborts the task identified by the Referenced Task Tag field.
-#define ISCSI_TASK_MGMT_FUNC_REQ_FUNC_ABORT_TASK         0x01
-
-/// Task management request function: ABORT TASK SET: aborts all tasks issued via this session on the LU.
-#define ISCSI_TASK_MGMT_FUNC_REQ_FUNC_ABORT_TASK_SET     0x02
-
-/// Task management request function: CLEAR ACA - clears the Auto Contingent Allegiance condition.
-#define ISCSI_TASK_MGMT_FUNC_REQ_FUNC_CLEAR_ACA          0x03
-
-/// Task management request function: CLEAR TASK SET - aborts all tasks in the appropriate task set as defined by the TST field in the Control mode page (see SPC3).
-#define ISCSI_TASK_MGMT_FUNC_REQ_FUNC_CLEAR_TASK_SET     0x04
-
-/// Task management request function: LOGICAL UNIT RESET.
-#define ISCSI_TASK_MGMT_FUNC_REQ_FUNC_LOGICAL_UNIT_RESET 0x05
-
-/// Task management request function: TARGET WARM RESET.
-#define ISCSI_TASK_MGMT_FUNC_REQ_FUNC_TARGET_WARM_RESET  0x06
-
-/// Task management request function: TARGET COLD RESET.
-#define ISCSI_TASK_MGMT_FUNC_REQ_FUNC_TARGET_COLD_RESET  0x07
-
-/// Task management request function: TASK REASSIGN - reassigns connection allegiance for the task identified by the Initiator Task Tag field to this connection, thus resuming the iSCSI exchanges for the task.
-#define ISCSI_TASK_MGMT_FUNC_REQ_FUNC_TASK_REASSIGN      0x08
-
-
-/**
- * @brief iSCSI Task Management Function Request packet data.
- *
- * This structure is used to explicity control the execution of one
- * or more tasks (iSCSI and SCSI).
- */
-typedef struct __attribute__((packed)) iscsi_task_mgmt_func_req_packet {
-    /// Always 2 according to iSCSI specification.
-    uint8_t opcode;
-
-    /**
-     * @brief Function.
-     *
-     * The task management functions provide an initiator with a way to
-     * explicitly control the execution of one or more tasks (SCSI and iSCSI
-     * tasks). The task management function codes are listed below. For a
-     * more detailed description of SCSI task management, see SAM2.
-     */
-    int8_t func;
-
-    /// Reserved fot future usage, always MUST be 0.
-    uint16_t reserved;
-
-    /// TotalAHSLength (MUST be 0 for this PDU).
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength (MUST be 0 for this PDU).
-    uint8_t ds_len[3];
-
-    /**
-     * @brief Logical Unit Number (LUN) or Reserved.
-     *
-     * This field is required for functions that address a specific LU
-     * (ABORT TASK, CLEAR TASK SET, ABORT TASK SET, CLEAR ACA, LOGICAL UNIT
-     * RESET) and is reserved in all others
-     */
-    uint64_t lun;
-
-    /**
-     * @brief Initiator Task Tag (ITT).
-     *
-     * This is the Initiator Task Tag of the task to be aborted for the
-     * ABORT TASK function or reassigned for the TASK REASSIGN function.
-     * For all the other functions, this field MUST be set to the reserved
-     * value 0xFFFFFFFF.
-     */
-    uint32_t init_task_tag;
-
-    /// Referenced task tag or 0xFFFFFFFF.
-    uint32_t ref_task_tag;
-
-    /// CmdSN.
-    uint32_t cmd_sn;
-
-    /// ExpStatSN
-    uint32_t exp_stat_sn;
-
-    /**
-     * @brief RefCmdSN or Reserved.
-     *
-     * If an ABORT TASK is issued for a task created by an immediate
-     * command, then the RefCmdSN MUST be that of the task management
-     * request itself (i.e., the CmdSN and RefCmdSN are equal).\n
-     * For an ABORT TASK of a task created by a non-immediate command, the
-     * RefCmdSN MUST be set to the CmdSN of the task identified by the
-     * Referenced Task Tag field. Targets must use this field when the task
-     * identified by the Referenced Task Tag field is not with the target.
-     * Otherwise, this field is reserved.
-     */
-    uint32_t ref_cmd_sn;
-
-    /**
-     * @brief ExpDataSN or Reserved.
-     *
-     * For recovery purposes, the iSCSI target and initiator maintain a data
-     * acknowledgment reference number - the first input DataSN number
-     * unacknowledged by the initiator. When issuing a new command, this
-     * number is set to 0. If the function is TASK REASSIGN, which
-     * establishes a new connection allegiance for a previously issued read
-     * or bidirectional command, the ExpDataSN will contain an updated data
-     * acknowledgment reference number or the value 0; the latter indicates
-     * that the data acknowledgment reference number is unchanged. The
-     * initiator MUST discard any data PDUs from the previous execution that
-     * it did not acknowledge, and the target MUST transmit all Data-In PDUs
-     * (if any) starting with the data acknowledgment reference number. The
-     * number of retransmitted PDUs may or may not be the same as the
-     * original transmission, depending on if there was a change in
-     * MaxRecvDataSegmentLength in the reassignment. The target MAY also
-     * send no more Data-In PDUs if all data has been acknowledged.
-     * The value of ExpDataSN MUST be 0 or higher than the DataSN of the
-     * last acknowledged Data-In PDU, but not larger than DataSN + 1 of the
-     * last Data-IN PDU sent by the target. Any other value MUST be ignored
-     * by the target.
-     * For other functions, this field is reserved
-     */
-    uint32_t exp_data_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved2;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-} iscsi_task_mgmt_func_req_packet;
-
-
-/// Task management function response: Function complete.
-#define ISCSI_TASK_MGMT_FUNC_RESPONSE_FUNC_COMPLETE               0x00
-
-/// Task management function response: Task does not exist.
-#define ISCSI_TASK_MGMT_FUNC_RESPONSE_TASK_NO_EXIST               0x01
-
-/// Task management function response: LUN does not exist.
-#define ISCSI_TASK_MGMT_FUNC_RESPONSE_LUN_NO_EXIST                0x02
-
-/// Task management function response: Task still allegiant.
-#define ISCSI_TASK_MGMT_FUNC_RESPONSE_TASK_ALLEGIANT              0x03
-
-/// Task management function response: Task allegiance reassignment not supported.
-#define ISCSI_TASK_MGMT_FUNC_RESPONSE_TASK_UNSUPPORTED_ALLEGIANCE 0x04
-
-/// Task management function response: Task management function not supported.
-#define ISCSI_TASK_MGMT_FUNC_RESPONSE_TASK_UNSUPPORTED_MGMT       0x05
-
-/// Task management function response: Function authorization failed.
-#define ISCSI_TASK_MGMT_FUNC_RESPONSE_FUNC_AUTH_FAILED            0x06
-
-/// Task management function response: Function rejected.
-#define ISCSI_TASK_MGMT_FUNC_RESPONSE_FUNC_REJECTED               0xFF
-
-
-/**
- * @brief iSCSI Task Management Function Response packet data.
- *
- * For the functions ABORT TASK, ABORT TASK SET, CLEAR ACA, CLEAR TASK
- * SET, LOGICAL UNIT RESET, TARGET COLD RESET, TARGET WARM RESET, and
- * TASK REASSIGN, the target performs the requested task management
- * function and sends a task management response back to the initiator.
- * For TASK REASSIGN, the new connection allegiance MUST ONLY become
- * effective at the target after the target issues the task management
- * response.
- */
-typedef struct __attribute__((packed)) iscsi_task_mgmt_func_response_packet {
-    /// Always 0x22 according to specification.
-    uint8_t opcode;
-
-    /// Reserved for future usage (must be always 0x80 for now).
-    int8_t flags;
-
-    /**
-     * @brief Function response.
-     *
-     * For the TARGET COLD RESET and TARGET WARM RESET functions, the target
-     * cancels all pending operations across all LUs known to the issuing
-     * initiator. For the TARGET COLD RESET function, the target MUST then
-     * close all of its TCP connections to all initiators (terminates all
-     * sessions).\n
-     * The mapping of the response code into a SCSI service response code
-     * value, if needed, is outside the scope of this document. However, in
-     * symbolic terms, Response values 0 and 1 map to the SCSI service
-     * response of FUNCTION COMPLETE. Response value 2 maps to the SCSI
-     * service response of INCORRECT LOGICAL UNIT NUMBER. All other
-     * Response values map to the SCSI service response of FUNCTION
-     * REJECTED. If a Task Management Function Response PDU does not arrive
-     * before the session is terminated, the SCSI service response is
-     * SERVICE DELIVERY OR TARGET FAILURE.\n
-     * The response to ABORT TASK SET and CLEAR TASK SET MUST only be issued
-     * by the target after all of the commands affected have been received
-     * by the target, the corresponding task management functions have been
-     * executed by the SCSI target, and the delivery of all responses
-     * delivered until the task management function completion has been
-     * confirmed (acknowledged through the ExpStatSN) by the initiator on
-     * all connections of this session.\n
-     * For the ABORT TASK function,\n
-     * -# if the Referenced Task Tag identifies a valid task leading to a
-     *    successful termination, then targets must return the "Function
-     *    complete" response.
-     * -# if the Referenced Task Tag does not identify an existing task
-     *    but the CmdSN indicated by the RefCmdSN field in the Task
-     *    Management Function Request is within the valid CmdSN window
-     *    and less than the CmdSN of the Task Management Function Request
-     *    itself, then targets must consider the CmdSN as received and
-     *    return the "Function complete" response.
-     * -# if the Referenced Task Tag does not identify an existing task
-     *    and the CmdSN indicated by the RefCmdSN field in the Task
-     *    Management Function Request is outside the valid CmdSN window,
-     *    then targets must return the "Task does not exist" response
-     */
-    uint8_t response;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint8_t reserved;
-
-    /// TotalAHSLength (MUST be 0 for this PDU).
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength (MUST be 0 for this PDU).
-    uint8_t ds_len[3];
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved2;
-
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved3;
-
-    /// StatSN.
-    uint32_t stat_sn;
-
-    /// ExpCmdSN.
-    uint32_t exp_cmd_sn;
-
-    /// MaxCmdSN.
-    uint32_t max_cmd_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved4;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved5;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-} iscsi_task_mgmt_func_response_packet;
-
 /// SCSI data out / in flags: Immediately process transfer.
 #define ISCSI_SCSI_DATA_OUT_DATA_IN_FLAGS_IMMEDIATE (1 << 7)
 
 /**
- * @brief iSCSI SCSI Data Out request packet data.
- *
- * THis structure is used by iSCSI for SCSI data output
- * requests, i.e. write operations.
- */
-typedef struct __attribute__((packed)) iscsi_scsi_data_out_req_packet {
-    /// Always 2 according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Flags.
-    int8_t flags;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint16_t reserved;
-
-    /// TotalAHSLength.
-    uint8_t total_ahs_len;
-
-    /**
-     * @brief DataSegmentLength.
-     *
-     * This is the data payload length of a SCSI Data-In or SCSI Data-Out
-     * PDU. The sending of 0-length data segments should be avoided, but
-     * initiators and targets MUST be able to properly receive 0-length data
-     * segments.\n
-     * The data segments of Data-In and Data-Out PDUs SHOULD be filled to
-     * the integer number of 4-byte words (real payload), unless the F bit
-     * is set to 1.
-     */
-    uint8_t ds_len[3];
-
-    /**
-     * @brief Logical Unit Number (LUN) or Reserved.
-     *
-     * If the Target Transfer Tag is provided, then the LUN field MUST hold a
-     * valid value and be consistent with whatever was specified with the command;
-     * otherwise, the LUN field is reserved.
-     */
-    uint64_t lun;
-
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
-
-    /**
-     * @brief Target Transfer Tag or 0xFFFFFFFF.
-     *
-     * On outgoing data, the Target Transfer Tag is provided to the target
-     * if the transfer is honoring an R2T. In this case, the Target
-     * Transfer Tag field is a replica of the Target Transfer Tag provided
-     * with the R2T.\n
-     * The Target Transfer Tag values are not specified by this protocol,
-     * except that the value 0xFFFFFFFF is reserved and means that the
-     * Target Transfer Tag is not supplied.
-     */
-    uint32_t target_xfer_tag;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved2;
-
-    /// ExpStatSN.
-    uint32_t exp_stat_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved3;
-
-    /**
-     * @brief DataSN.
-     *
-     * For output (write) data PDUs, the DataSN is the Data-Out PDU number
-     * within the current output sequence. Either the current output
-     * sequence is identified by the Initiator Task Tag (for unsolicited
-     * data) or it is a data sequence generated for one R2T (for data
-     * solicited through R2T).
-     */
-    uint32_t data_sn;
-
-    /**
-     * @brief Buffer Offset.
-     *
-     * The Buffer Offset field contains the offset of this PDU payload data
-     * within the complete data transfer. The sum of the buffer offset and
-     * length should not exceed the expected transfer length for the
-     * command.\n
-     * The order of data PDUs within a sequence is determined by
-     * DataPDUInOrder. When set to Yes, it means that PDUs have to be in
-     * increasing buffer offset order and overlays are forbidden.\n
-     * The ordering between sequences is determined by DataSequenceInOrder.
-     * When set to Yes, it means that sequences have to be in increasing
-     * buffer offset order and overlays are forbidden.
-     */
-    uint32_t buf_offset;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved4;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-
-    /// Data segment.
-    iscsi_scsi_ds_cmd_data ds_cmd_data;
-
-    /// Optional data digest.
-    iscsi_data_digest data_digest;
-} iscsi_scsi_data_out_req_packet;
-
-/**
  * @brief SCSI Data In reponse flags: Status.
  *
  * (S) set to indicate that the Command Status field
@@ -5366,437 +3790,115 @@ typedef struct __attribute__((packed)) iscsi_scsi_data_out_req_packet {
  * responses, i.e. read operations.
  */
 typedef struct __attribute__((packed)) iscsi_scsi_data_in_response_packet {
-    /// Always 0x25 according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Incoming data flags. The fields StatSN, Status, and Residual Count only have meaningful content if the S bit is set to 1.
-    int8_t flags;
-
-    /// Rserved for future usage, always MUST be 0.
-    uint8_t reserved;
-
-    /**
-     * @brief Status or Reserved.
-     *
-     * Status can accompany the last Data-In PDU if the command did not end
-     * with an exception (i.e., the status is "good status" - GOOD,
-     * CONDITION MET, or INTERMEDIATE-CONDITION MET). The presence of
-     * status (and of a residual count) is signaled via the S flag bit.
-     * Although targets MAY choose to send even non-exception status in
-     * separate responses, initiators MUST support non-exception status in
-     * Data-In PDUs.
-     */
-    uint8_t status;
-
-    /// TotalAHSLength.
-    uint8_t total_ahs_len;
-
-    /**
-     * @brief DataSegmentLength.
-     *
-     * This is the data payload length of a SCSI Data-In or SCSI Data-Out
-     * PDU. The sending of 0-length data segments should be avoided, but
-     * initiators and targets MUST be able to properly receive 0-length data
-     * segments.\n
-     * The data segments of Data-In and Data-Out PDUs SHOULD be filled to
-     * the integer number of 4-byte words (real payload), unless the F bit
-     * is set to 1.
-     */
-    uint8_t ds_len[3];
-
-    /**
-     * @brief Logical Unit Number (LUN) or Reserved.
-     *
-     * If the Target Transfer Tag is provided, then the LUN field MUST hold a
-     * valid value and be consistent with whatever was specified with the command;
-     * otherwise, the LUN field is reserved.
-     */
-    uint64_t lun;
-
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
-
-    /**
-     * @brief Target Transfer Tag or 0xFFFFFFFF.
-     *
-     * On incoming data, the Target Transfer Tag and LUN MUST be provided by
-     * the target if the A bit is set to 1; otherwise, they are reserved.
-     * The Target Transfer Tag and LUN are copied by the initiator into the
-     * SNACK of type DataACK that it issues as a result of receiving a SCSI
-     * Data-In PDU with the A bit set to 1.\n
-     * The Target Transfer Tag values are not specified by this protocol,
-     * except that the value 0xFFFFFFFF is reserved and means that the
-     * Target Transfer Tag is not supplied.
-     */
-    uint32_t target_xfer_tag;
-
-    /// StatSN.
-    uint32_t stat_sn;
-
-    /// ExpCmdSN.
-
-    uint32_t exp_cmd_sn;
-
-    /// MaxCmdSN.
-    uint32_t max_cmd_sn;
-
-    /**
-     * @brief DataSN.
-     *
-     * For input (read) or bidirectional Data-In PDUs, the DataSN is the
-     * input PDU number within the data transfer for the command identified
-     * by the Initiator Task Tag.\n
-     * R2T and Data-In PDUs, in the context of bidirectional commands, share
-     * the numbering sequence.
-     */
-    uint32_t data_sn;
-
-    /**
-     * @brief Buffer Offset.
-     *
-     * The Buffer Offset field contains the offset of this PDU payload data
-     * within the complete data transfer. The sum of the buffer offset and
-     * length should not exceed the expected transfer length for the
-     * command.\n
-     * The order of data PDUs within a sequence is determined by
-     * DataPDUInOrder. When set to Yes, it means that PDUs have to be in
-     * increasing buffer offset order and overlays are forbidden.\n
-     * The ordering between sequences is determined by DataSequenceInOrder.
-     * When set to Yes, it means that sequences have to be in increasing
-     * buffer offset order and overlays are forbidden.
-     */
-    uint32_t buf_offset;
-
-    /// Residual Count or Reserved.
-    uint32_t res_cnt;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-
-    /// Data segment.
-    iscsi_scsi_ds_cmd_data ds_cmd_data;
-
-    /// Optional data digest.
-    iscsi_data_digest data_digest;
+	/// Always 0x25 according to iSCSI specification.
+	uint8_t opcode;
+
+	/// Incoming data flags. The fields StatSN, Status, and Residual Count only have meaningful content if the S bit is set to 1.
+	int8_t flags;
+
+	/// Rserved for future usage, always MUST be 0.
+	uint8_t reserved;
+
+	/**
+	 * @brief Status or Reserved.
+	 *
+	 * Status can accompany the last Data-In PDU if the command did not end
+	 * with an exception (i.e., the status is "good status" - GOOD,
+	 * CONDITION MET, or INTERMEDIATE-CONDITION MET). The presence of
+	 * status (and of a residual count) is signaled via the S flag bit.
+	 * Although targets MAY choose to send even non-exception status in
+	 * separate responses, initiators MUST support non-exception status in
+	 * Data-In PDUs.
+	 */
+	uint8_t status;
+
+	/// TotalAHSLength.
+	uint8_t total_ahs_len;
+
+	/**
+	 * @brief DataSegmentLength.
+	 *
+	 * This is the data payload length of a SCSI Data-In or SCSI Data-Out
+	 * PDU. The sending of 0-length data segments should be avoided, but
+	 * initiators and targets MUST be able to properly receive 0-length data
+	 * segments.\n
+	 * The data segments of Data-In and Data-Out PDUs SHOULD be filled to
+	 * the integer number of 4-byte words (real payload), unless the F bit
+	 * is set to 1.
+	 */
+	uint8_t ds_len[3];
+
+	/**
+	 * @brief Logical Unit Number (LUN) or Reserved.
+	 *
+	 * If the Target Transfer Tag is provided, then the LUN field MUST hold a
+	 * valid value and be consistent with whatever was specified with the command;
+	 * otherwise, the LUN field is reserved.
+	 */
+	uint64_t lun;
+
+	/// Initiator Task Tag (ITT).
+	uint32_t init_task_tag;
+
+	/**
+	 * @brief Target Transfer Tag or 0xFFFFFFFF.
+	 *
+	 * On incoming data, the Target Transfer Tag and LUN MUST be provided by
+	 * the target if the A bit is set to 1; otherwise, they are reserved.
+	 * The Target Transfer Tag and LUN are copied by the initiator into the
+	 * SNACK of type DataACK that it issues as a result of receiving a SCSI
+	 * Data-In PDU with the A bit set to 1.\n
+	 * The Target Transfer Tag values are not specified by this protocol,
+	 * except that the value 0xFFFFFFFF is reserved and means that the
+	 * Target Transfer Tag is not supplied.
+	 */
+	uint32_t target_xfer_tag;
+
+	/// StatSN.
+	uint32_t stat_sn;
+
+	/// ExpCmdSN.
+
+	uint32_t exp_cmd_sn;
+
+	/// MaxCmdSN.
+	uint32_t max_cmd_sn;
+
+	/**
+	 * @brief DataSN.
+	 *
+	 * For input (read) or bidirectional Data-In PDUs, the DataSN is the
+	 * input PDU number within the data transfer for the command identified
+	 * by the Initiator Task Tag.\n
+	 * R2T and Data-In PDUs, in the context of bidirectional commands, share
+	 * the numbering sequence.
+	 */
+	uint32_t data_sn;
+
+	/**
+	 * @brief Buffer Offset.
+	 *
+	 * The Buffer Offset field contains the offset of this PDU payload data
+	 * within the complete data transfer. The sum of the buffer offset and
+	 * length should not exceed the expected transfer length for the
+	 * command.\n
+	 * The order of data PDUs within a sequence is determined by
+	 * DataPDUInOrder. When set to Yes, it means that PDUs have to be in
+	 * increasing buffer offset order and overlays are forbidden.\n
+	 * The ordering between sequences is determined by DataSequenceInOrder.
+	 * When set to Yes, it means that sequences have to be in increasing
+	 * buffer offset order and overlays are forbidden.
+	 */
+	uint32_t buf_offset;
+
+	/// Residual Count or Reserved.
+	uint32_t res_cnt;
+
+	/// Data segment.
+	iscsi_scsi_ds_cmd_data ds_cmd_data;
 } iscsi_scsi_data_in_response_packet;
 
 /**
- * @brief iSCSI Ready To Transfer packet data.
- *
- * When an initiator has submitted a SCSI command with data that passes
- * from the initiator to the target (write), the target may specify
- * which blocks of data it is ready to receive. The target may request
- * that the data blocks be delivered in whichever order is convenient
- * for the target at that particular instant. This information is
- * passed from the target to the initiator in the Ready To Transfer
- * (R2T) PDU.
- *
- * In order to allow write operations without an explicit initial R2T,
- * the initiator and target MUST have negotiated the key InitialR2T to
- * No during login.
- *
- * An R2T MAY be answered with one or more SCSI Data-Out PDUs with a
- * matching Target Transfer Tag. If an R2T is answered with a single
- * Data-Out PDU, the buffer offset in the data PDU MUST be the same as
- * the one specified by the R2T, and the data length of the data PDU
- * MUST be the same as the Desired Data Transfer Length specified in the
- * R2T. If the R2T is answered with a sequence of data PDUs, the buffer
- * offset and length MUST be within the range of those specified by the
- * R2T, and the last PDU MUST have the F bit set to 1. If the last PDU
- * (marked with the F bit) is received before the Desired Data Transfer
- * Length is transferred, a target MAY choose to reject that PDU with
- * the "Protocol Error" reason code. DataPDUInOrder governs the
- * Data-Out PDU ordering. If DataPDUInOrder is set to Yes, the buffer
- * offsets and lengths for consecutive PDUs MUST form a continuous
- * non-overlapping range, and the PDUs MUST be sent in increasing offset
- * order.
- *
- * The target may send several R2T PDUs. It therefore can have a number
- * of pending data transfers. The number of outstanding R2T PDUs is
- * limited by the value of the negotiated key MaxOutstandingR2T. Within
- * a task, outstanding R2Ts MUST be fulfilled by the initiator in the
- * order in which they were received.
- *
- * R2T PDUs MAY also be used to recover Data-Out PDUs. Such an R2T
- * (Recovery-R2T) is generated by a target upon detecting the loss of
- * one or more Data-Out PDUs due to:
- *
- *    - Digest error
- *
- *    - Sequence error
- *
- *    - Sequence reception timeout
- *
- * A Recovery-R2T carries the next unused R2TSN but requests part of or
- * the entire data burst that an earlier R2T (with a lower R2TSN) had
- * already requested.
- *
- * DataSequenceInOrder governs the buffer offset ordering in consecutive
- * R2Ts. If DataSequenceInOrder is Yes, then consecutive R2Ts MUST
- * refer to continuous non-overlapping ranges, except for Recovery-R2Ts.
- */
-typedef struct __attribute__((packed)) iscsi_r2t_packet {
-    /// Always 0x31 according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Reserved for future usage (must be always 0x80 for now).
-    int8_t flags;
-
-    /// Reserved for future usage, always MUST be 0 for now.
-    uint16_t reserved;
-
-    /// TotalAHSLength, MUST be 0 for this PDU.
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength, MUST be 0 0 for this PDU.
-    uint8_t ds_len[3];
-
-    /// Logical Unit Number (LUN) or Reserved.
-    uint64_t lun;
-
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
-
-    /// Target Transfer Tag (TTT).
-    uint32_t target_xfer_tag;
-
-    /// The StatSN field will contain the next StatSN. The StatSN for this connection is not advanced after this PDU is sent.
-    uint32_t stat_sn;
-
-    /// ExpCmdSN.
-    uint32_t exp_cmd_sn;
-
-    /// MaxCmdSN.
-    uint32_t max_cmd_sn;
-
-    /// DataSN.
-    uint32_t data_sn;
-
-    /// Ready To Transfer Sequence Number (R2TSN) is the R2T PDU input PDU number within the command identified by the Initiator Task Tag. For bidirectional commands, R2T and Data-In PDUs share the input PDU numbering sequence.
-    uint32_t r2t_sn;
-
-    /**
-     * @brief Buffer Offset.
-     *
-     * The target therefore also specifies a buffer offset that indicates
-     * the point at which the data transfer should begin, relative to the
-     * beginning of the total data transfer.
-     */
-    uint32_t buf_offset;
-
-    /**
-     * @brief Desired Data Transfer Length.
-     *
-     * The target specifies how many bytes it wants the initiator to send
-     * because of this R2T PDU. The target may request the data from the
-     * initiator in several chunks, not necessarily in the original order of
-     * the data. The Desired Data Transfer Length MUST NOT be 0 and MUST NOT
-     * exceed MaxBurstLength.
-     */
-    uint32_t des_data_xfer_len;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-} iscsi_r2t_packet;
-
-
-/**
- * @brief SCSI Asynchronous Message Event: SCSI Async Event.
- *
- * A SCSI asynchronous event is reported in the sense data.
- * Sense Data that accompanies the report, in the data
- * segment, identifies the condition. The sending of a
- * SCSI event ("asynchronous event reporting" in SCSI
- * terminology) is dependent on the target support for SCSI
- * asynchronous event reporting as indicated in the
- * standard INQUIRY data. Its use may be enabled by
- * parameters in the SCSI Control mode page.
- */
-#define ISCSI_ASYNC_MSG_EVENT_SCSI_ASYNC_EVENT    0x00
-
-/**
- * @brief SCSI Asynchronous Message Event: Logout Request.
- *
- * The target requests Logout. This Async Message MUST
- * be sent on the same connection as the one requesting
- * to be logged out. The initiator MUST honor this request
- * by issuing a Logout as early as possible but no later
- * than Parameter3 seconds. The initiator MUST send a Logout
- * with a reason code of "close the connection" OR "close the
- * session" to close all the connections. Once this message is
- * received, the initiator SHOULD NOT issue new iSCSI commands on
- * the connection to be logged out. The target MAY reject any
- * new I/O requests that it receives after this message with the
- * reason code "Waiting for Logout". If the initiator does not
- * log out in Parameter3 seconds, the target should send an Async
- * PDU with iSCSI event code "Dropped the connection" if possible
- * or simply terminate the transport connection. Parameter1 and
- * Parameter2 are reserved.
- */
-#define ISCSI_ASYNC_MSG_EVENT_LOGOUT_REQUEST      0x01
-
-/**
- * @brief SCSI Asynchronous Message Event: Connection Drop Notification.
- *
- * The target indicates that it will drop the connection.
- * The Parameter1 field indicates the CID of the connection that
- * is going to be dropped.\n
- * The Parameter2 field (Time2Wait) indicates, in seconds, the
- * minimum time to wait before attempting to reconnect or
- * reassign.\n
- * The Parameter3 field (Time2Retain) indicates the maximum time
- * allowed to reassign commands after the initial wait (in
- * Parameter2).\n
- * If the initiator does not attempt to reconnect and/or reassign
- * the outstanding commands within the time specified by
- * Parameter3, or if Parameter3 is 0, the target will terminate
- * all outstanding commands on this connection. In this case, no
- * other responses should be expected from the target for the
- * outstanding commands on this connection.\n
- * A value of 0 for Parameter2 indicates that reconnect can be
- * attempted immediately.
- */
-#define ISCSI_ASYNC_MSG_EVENT_CONNECT_DROP_NOTIFY 0x02
-
-/**
- * @brief SCSI Asynchronous Message Event: Session Drop Notification.
- *
- * The target indicates that it will drop all the connections
- * of this session.\n
- * The Parameter1 field is reserved.\n
- * The Parameter2 field (Time2Wait) indicates, in seconds, the
- * minimum time to wait before attempting to reconnect.\n
- * The Parameter3 field (Time2Retain) indicates the maximum time
- * allowed to reassign commands after the initial wait (in
- * Parameter2).\n
- * If the initiator does not attempt to reconnect and/or reassign
- * the outstanding commands within the time specified by
- * Parameter3, or if Parameter3 is 0, the session is terminated.\n
- * In this case, the target will terminate all outstanding
- * commands in this session; no other responses should be
- * expected from the target for the outstanding commands in this
- * session. A value of 0 for Parameter2 indicates that reconnect
- * can be attempted immediately.
- */
-#define ISCSI_ASYNC_MSG_EVENT_SESSION_DROP_NOTIFY 0x03
-
-/**
- * @brief SCSI Asynchronous Message Event: Negotiation Request.
- *
- * The target requests parameter negotiation on this connection.
- * The initiator MUST honor this request by issuing a Text
- * Request (that can be empty) on the same connection as early
- * as possible, but no later than Parameter3 seconds, unless a
- * Text Request is already pending on the connection, or by
- * issuing a Logout Request. If the initiator does not issue a
- * Text Request, the target may reissue the Asynchronous Message
- * requesting parameter negotiation.
- */
-#define ISCSI_ASYNC_MSG_EVENT_NEGOTIATION_REQUEST 0x04
-
-/**
- * @brief SCSI Asynchronous Message Event: Task Termination.
- *
- * All active tasks for a LU with a matching LUN field in the
- * Async Message PDU are being terminated. The receiving
- * initiator iSCSI layer MUST respond to this message by
- * taking the following steps, in order:
- * - Stop Data-Out transfers on that connection for all active
- *   TTTs for the affected LUN quoted in the Async Message PDU.
- * - Acknowledge the StatSN of the Async Message PDU via a
- *   NOP-Out PDU with ITT=0xFFFFFFFF (i.e., non-ping flavor),
- *   while copying the LUN field from the Async Message to
- *   NOP-Out.
- * This value of AsyncEvent, however, MUST NOT be used on an
- * iSCSI session unless the new TaskReporting text key was
- * negotiated to FastAbort on the session.
- */
-#define ISCSI_ASYNC_MSG_EVENT_TASK_TERMINATION    0x05
-
-/// SCSI Asynchronous Message Event: First vendor-specific iSCSI event. The AsyncVCode details the vendor code, and data MAY accompany the report.
-#define ISCSI_ASYNC_MSG_EVENT_VENDOR_FIRST        0xF8
-
-/// SCSI Asynchronous Message Event: Last vendor-specific iSCSI event. The AsyncVCode details the vendor code, and data MAY accompany the report.
-#define ISCSI_ASYNC_MSG_EVENT_VENDOR_LAST         0xFF
-
-/**
- * @brief iSCSI Asynchronous Message packet data.
- *
- * An Asynchronous Message may be sent from the target to the initiator
- * without corresponding to a particular command. The target specifies
- * the reason for the event and sense data.\n
- * Some Asynchronous Messages are strictly related to iSCSI, while
- * others are related to SCSI
- */
-typedef struct __attribute__((packed)) iscsi_async_msg_packet {
-    /// Always 0x32 according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Reserved for future usage (must be always 0x80 for now).
-    int8_t flags;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint16_t reserved;
-
-    /// TotalAHSLength, MUST be 0 for this PDU.
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength, MUST be 0 0 for this PDU.
-    uint8_t ds_len[3];
-
-    /// The LUN field MUST be valid if AsyncEvent is 0. Otherwise, this field is reserved.
-    uint64_t lun;
-
-    /// Tag (always 0xFFFFFFFF for now).
-    uint32_t tag;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved2;
-
-    /**
-     * @brief StatSN.
-     *
-     * The StatSN counts this PDU as an acknowledgeable event (the StatSN is
-     * advanced), which allows for initiator and target state synchronization.
-     */
-    uint32_t stat_sn;
-
-    /// ExpCmdSN.
-    uint32_t exp_cmd_sn;
-
-    /// MaxCmdSN.
-    uint32_t max_cmd_sn;
-
-    /// AsyncEvent.
-    uint8_t async_event;
-
-    /// AsyncVCode is a vendor-specific detail code that is only valid if the AsyncEvent field indicates a vendor-specific event. Otherwise, it is reserved.
-    uint8_t async_vcode;
-
-    /// Parameter1 or Reserved.
-    uint16_t param_1;
-
-    /// Parameter2 or Reserved.
-    uint16_t param_2;
-
-    /// Parameter3 or Reserved.
-    uint16_t param_3;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved3;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-
-    /// Data segment.
-    iscsi_scsi_ds_cmd_data ds_cmd_data;
-
-    /// Optional data digest.
-    iscsi_data_digest data_digest;
-} iscsi_async_msg_packet;
-
-
-/**
  * @brief Text Request flags: Continue.
  *
  * (C) When set to 1, this bit indicates that the text (set of key=value
@@ -5831,106 +3933,100 @@ typedef struct __attribute__((packed)) iscsi_async_msg_packet {
  * implicitly terminated by the target.
  */
 typedef struct __attribute__((packed)) iscsi_text_req_packet {
-    /// Always 0x04 according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Text request flags.
-    int8_t flags;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint16_t reserved;
-
-    /// TotalAHSLength.
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength.
-    uint8_t ds_len[3];
-
-    /// Logical Unit Number (LUN) or Reserved.
-    uint64_t lun;
-
-    /**
-     * @brief Initiator Task Tag (ITT).
-     *
-     * This is the initiator-assigned identifier for this Text Request. If
-     * the command is sent as part of a sequence of Text Requests and
-     * responses, the Initiator Task Tag MUST be the same for all the
-     * requests within the sequence (similar to linked SCSI commands). The
-     * I bit for all requests in a sequence also MUST be the same.
-     */
-    uint32_t init_task_tag;
-
-    /**
-     * @brief Target Transfer Tag (TTT).
-     *
-     * When the Target Transfer Tag is set to the reserved value 0xFFFFFFFF,
-     * it tells the target that this is a new request, and the target resets
-     * any internal state associated with the Initiator Task Tag (resets the
-     * current negotiation state).\n
-     * The target sets the Target Transfer Tag in a Text Response to a value
-     * other than the reserved value 0xFFFFFFFF whenever it indicates that
-     * it has more data to send or more operations to perform that are
-     * associated with the specified Initiator Task Tag. It MUST do so
-     * whenever it sets the F bit to 0 in the response. By copying the
-     * Target Transfer Tag from the response to the next Text Request, the
-     * initiator tells the target to continue the operation for the specific
-     * Initiator Task Tag. The initiator MUST ignore the Target Transfer
-     * Tag in the Text Response when the F bit is set to 1.\n
-     * This mechanism allows the initiator and target to transfer a large
-     * amount of textual data over a sequence of text-command/text-response
-     * exchanges or to perform extended negotiation sequences.\n
-     * If the Target Transfer Tag is not 0xFFFFFFFF, the LUN field MUST be
-     * sent by the target in the Text Response.\n
-     * A target MAY reset its internal negotiation state if an exchange is
-     * stalled by the initiator for a long time or if it is running out of
-     * resources.\n
-     * Long Text Responses are handled as shown in the following example:\n
-     * @verbatim
-     *    I->T Text SendTargets=All (F = 1, TTT = 0xFFFFFFFF)
-     *    T->I Text <part 1> (F = 0, TTT = 0x12345678)
-     *    I->T Text <empty> (F = 1, TTT = 0x12345678)
-     *    T->I Text <part 2> (F = 0, TTT = 0x12345678)
-     *    I->T Text <empty> (F = 1, TTT = 0x12345678)
-     *    ...
-     *    T->I Text <part n> (F = 1, TTT = 0xFFFFFFFF)
-     * @endverbatim
-     */
-    uint32_t target_xfer_tag;
-
-    /// CmdSN.
-    uint32_t cmd_sn;
-
-    /// ExpStatSN.
-    uint32_t exp_stat_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved2[2];
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-
-    /**
-     * @brief Data segment.
-     *
-     * The data lengths of a Text Request MUST NOT exceed the iSCSI target
-     * MaxRecvDataSegmentLength (a parameter that is negotiated per
-     * connection and per direction).\n
-     * A key=value pair can span Text Request or Text Response boundaries.
-     * A key=value pair can start in one PDU and continue on the next. In
-     * other words, the end of a PDU does not necessarily signal the end of
-     * a key=value pair.\n
-     * The target responds by sending its response back to the initiator.
-     * The response text format is similar to the request text format. The
-     * Text Response MAY refer to key=value pairs presented in an earlier
-     * Text Request, and the text in the request may refer to earlier
-     * responses.\n
-     * Text operations are usually meant for parameter setting/negotiations
-     * but can also be used to perform some long-lasting operations.
-     */
-    iscsi_scsi_ds_cmd_data ds_cmd_data;
-
-    /// Optional data digest.
-    iscsi_data_digest data_digest;
+	/// Always 0x04 according to iSCSI specification.
+	uint8_t opcode;
+
+	/// Text request flags.
+	int8_t flags;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint16_t reserved;
+
+	/// TotalAHSLength.
+	uint8_t total_ahs_len;
+
+	/// DataSegmentLength.
+	uint8_t ds_len[3];
+
+	/// Logical Unit Number (LUN) or Reserved.
+	uint64_t lun;
+
+	/**
+	 * @brief Initiator Task Tag (ITT).
+	 *
+	 * This is the initiator-assigned identifier for this Text Request. If
+	 * the command is sent as part of a sequence of Text Requests and
+	 * responses, the Initiator Task Tag MUST be the same for all the
+	 * requests within the sequence (similar to linked SCSI commands). The
+	 * I bit for all requests in a sequence also MUST be the same.
+	 */
+	uint32_t init_task_tag;
+
+	/**
+	 * @brief Target Transfer Tag (TTT).
+	 *
+	 * When the Target Transfer Tag is set to the reserved value 0xFFFFFFFF,
+	 * it tells the target that this is a new request, and the target resets
+	 * any internal state associated with the Initiator Task Tag (resets the
+	 * current negotiation state).\n
+	 * The target sets the Target Transfer Tag in a Text Response to a value
+	 * other than the reserved value 0xFFFFFFFF whenever it indicates that
+	 * it has more data to send or more operations to perform that are
+	 * associated with the specified Initiator Task Tag. It MUST do so
+	 * whenever it sets the F bit to 0 in the response. By copying the
+	 * Target Transfer Tag from the response to the next Text Request, the
+	 * initiator tells the target to continue the operation for the specific
+	 * Initiator Task Tag. The initiator MUST ignore the Target Transfer
+	 * Tag in the Text Response when the F bit is set to 1.\n
+	 * This mechanism allows the initiator and target to transfer a large
+	 * amount of textual data over a sequence of text-command/text-response
+	 * exchanges or to perform extended negotiation sequences.\n
+	 * If the Target Transfer Tag is not 0xFFFFFFFF, the LUN field MUST be
+	 * sent by the target in the Text Response.\n
+	 * A target MAY reset its internal negotiation state if an exchange is
+	 * stalled by the initiator for a long time or if it is running out of
+	 * resources.\n
+	 * Long Text Responses are handled as shown in the following example:\n
+	 * @verbatim
+	 *    I->T Text SendTargets=All (F = 1, TTT = 0xFFFFFFFF)
+	 *    T->I Text <part 1> (F = 0, TTT = 0x12345678)
+	 *    I->T Text <empty> (F = 1, TTT = 0x12345678)
+	 *    T->I Text <part 2> (F = 0, TTT = 0x12345678)
+	 *    I->T Text <empty> (F = 1, TTT = 0x12345678)
+	 *    ...
+	 *    T->I Text <part n> (F = 1, TTT = 0xFFFFFFFF)
+	 * @endverbatim
+	 */
+	uint32_t target_xfer_tag;
+
+	/// CmdSN.
+	uint32_t cmd_sn;
+
+	/// ExpStatSN.
+	uint32_t exp_stat_sn;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint64_t reserved2[2];
+
+	/**
+	 * @brief Data segment.
+	 *
+	 * The data lengths of a Text Request MUST NOT exceed the iSCSI target
+	 * MaxRecvDataSegmentLength (a parameter that is negotiated per
+	 * connection and per direction).\n
+	 * A key=value pair can span Text Request or Text Response boundaries.
+	 * A key=value pair can start in one PDU and continue on the next. In
+	 * other words, the end of a PDU does not necessarily signal the end of
+	 * a key=value pair.\n
+	 * The target responds by sending its response back to the initiator.
+	 * The response text format is similar to the request text format. The
+	 * Text Response MAY refer to key=value pairs presented in an earlier
+	 * Text Request, and the text in the request may refer to earlier
+	 * responses.\n
+	 * Text operations are usually meant for parameter setting/negotiations
+	 * but can also be used to perform some long-lasting operations.
+	 */
+	iscsi_scsi_ds_cmd_data ds_cmd_data;
 } iscsi_text_req_packet;
 
 
@@ -5972,87 +4068,81 @@ typedef struct __attribute__((packed)) iscsi_text_req_packet {
  * of the Text Request.
  */
 typedef struct __attribute__((packed)) iscsi_text_response_packet {
-    /// Always 0x24 according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Text response flags.
-    int8_t flags;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint16_t reserved;
-
-    /// TotalAHSLength.
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength.
-    uint8_t ds_len[3];
-
-    /// Logical Unit Number (LUN) or Reserved.
-    uint64_t lun;
-
-    /// The Initiator Task Tag matches the tag used in the initial Text Request.
-    uint32_t init_task_tag;
-
-    /**
-     * @brief Target Transfer Tag (TTT).
-     *
-     * When a target has more work to do (e.g., cannot transfer all the
-     * remaining text data in a single Text Response or has to continue the
-     * negotiation) and has enough resources to proceed, it MUST set the
-     * Target Transfer Tag to a value other than the reserved value
-     * 0xFFFFFFFF. Otherwise, the Target Transfer Tag MUST be set to
-     * 0xFFFFFFFF.\n
-     * When the Target Transfer Tag is not 0xFFFFFFFF, the LUN field may be
-     * significant.\n
-     * The initiator MUST copy the Target Transfer Tag and LUN in its next
-     * request to indicate that it wants the rest of the data.\n
-     * When the target receives a Text Request with the Target Transfer Tag
-     * set to the reserved value 0xFFFFFFFF, it resets its internal
-     * information (resets state) associated with the given Initiator Task
-     * Tag (restarts the negotiation).\n
-     * When a target cannot finish the operation in a single Text Response
-     * and does not have enough resources to continue, it rejects the Text
-     * Request with the appropriate Reject code.\n
-     * A target may reset its internal state associated with an Initiator
-     * Task Tag (the current negotiation state) as expressed through the
-     * Target Transfer Tag if the initiator fails to continue the exchange
-     * for some time. The target may reject subsequent Text Requests with
-     * the Target Transfer Tag set to the "stale" value.
-     */
-    uint32_t target_xfer_tag;
-
-    /// StatSN. The target StatSN variable is advanced by each Text Response sent.
-    uint32_t stat_sn;
-
-    /// ExpCmdSN.
-    uint32_t exp_cmd_sn;
-
-    /// MaxCmdSN.
-    uint32_t max_cmd_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved2[2];
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-
-    /**
-     * @brief Data segment.
-     *
-     * The data lengths of a Text Response MUST NOT exceed the iSCSI
-     * initiator MaxRecvDataSegmentLength (a parameter that is negotiated
-     * per connection and per direction).\n
-     * The text in the Text Response Data is governed by the same rules as
-     * the text in the Text Request Data.\n
-     * Although the initiator is the requesting party and controls the
-     * request-response initiation and termination, the target can offer
-     * key=value pairs of its own as part of a sequence and not only in
-     * response to the initiator.
-     */
-    iscsi_scsi_ds_cmd_data ds_cmd_data;
-
-    /// Optional data digest.
-    iscsi_data_digest data_digest;
+	/// Always 0x24 according to iSCSI specification.
+	uint8_t opcode;
+
+	/// Text response flags.
+	int8_t flags;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint16_t reserved;
+
+	/// TotalAHSLength.
+	uint8_t total_ahs_len;
+
+	/// DataSegmentLength.
+	uint8_t ds_len[3];
+
+	/// Logical Unit Number (LUN) or Reserved.
+	uint64_t lun;
+
+	/// The Initiator Task Tag matches the tag used in the initial Text Request.
+	uint32_t init_task_tag;
+
+	/**
+	 * @brief Target Transfer Tag (TTT).
+	 *
+	 * When a target has more work to do (e.g., cannot transfer all the
+	 * remaining text data in a single Text Response or has to continue the
+	 * negotiation) and has enough resources to proceed, it MUST set the
+	 * Target Transfer Tag to a value other than the reserved value
+	 * 0xFFFFFFFF. Otherwise, the Target Transfer Tag MUST be set to
+	 * 0xFFFFFFFF.\n
+	 * When the Target Transfer Tag is not 0xFFFFFFFF, the LUN field may be
+	 * significant.\n
+	 * The initiator MUST copy the Target Transfer Tag and LUN in its next
+	 * request to indicate that it wants the rest of the data.\n
+	 * When the target receives a Text Request with the Target Transfer Tag
+	 * set to the reserved value 0xFFFFFFFF, it resets its internal
+	 * information (resets state) associated with the given Initiator Task
+	 * Tag (restarts the negotiation).\n
+	 * When a target cannot finish the operation in a single Text Response
+	 * and does not have enough resources to continue, it rejects the Text
+	 * Request with the appropriate Reject code.\n
+	 * A target may reset its internal state associated with an Initiator
+	 * Task Tag (the current negotiation state) as expressed through the
+	 * Target Transfer Tag if the initiator fails to continue the exchange
+	 * for some time. The target may reject subsequent Text Requests with
+	 * the Target Transfer Tag set to the "stale" value.
+	 */
+	uint32_t target_xfer_tag;
+
+	/// StatSN. The target StatSN variable is advanced by each Text Response sent.
+	uint32_t stat_sn;
+
+	/// ExpCmdSN.
+	uint32_t exp_cmd_sn;
+
+	/// MaxCmdSN.
+	uint32_t max_cmd_sn;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint64_t reserved2[2];
+
+	/**
+	 * @brief Data segment.
+	 *
+	 * The data lengths of a Text Response MUST NOT exceed the iSCSI
+	 * initiator MaxRecvDataSegmentLength (a parameter that is negotiated
+	 * per connection and per direction).\n
+	 * The text in the Text Response Data is governed by the same rules as
+	 * the text in the Text Request Data.\n
+	 * Although the initiator is the requesting party and controls the
+	 * request-response initiation and termination, the target can offer
+	 * key=value pairs of its own as part of a sequence and not only in
+	 * response to the initiator.
+	 */
+	iscsi_scsi_ds_cmd_data ds_cmd_data;
 } iscsi_text_response_packet;
 
 
@@ -6129,17 +4219,17 @@ typedef struct __attribute__((packed)) iscsi_text_response_packet {
  * MUST also be persistent over power cycles, reboot, card swap, etc.
  */
 typedef struct __attribute__((packed)) iscsi_isid {
-    /// Meaning depends on T bit, either 22-bit OUI or reserved.
-    uint8_t a;
+	/// Meaning depends on T bit, either 22-bit OUI or reserved.
+	uint8_t a;
 
-    /// Meaning depends on T bit, either 22-bit OUI, EN (IANA Enterprise Number) or random.
-    uint16_t b;
+	/// Meaning depends on T bit, either 22-bit OUI, EN (IANA Enterprise Number) or random.
+	uint16_t b;
 
-    /// Meaning depends on T bit, either 24-bit Qualifier, EN (IANA Enterprise Number) or random.
-    uint8_t c;
+	/// Meaning depends on T bit, either 24-bit Qualifier, EN (IANA Enterprise Number) or random.
+	uint8_t c;
 
-    /// Meaning depends on T bit, either 24-bit Qualifier or Qualifier.
-    uint16_t d;
+	/// Meaning depends on T bit, either 24-bit Qualifier or Qualifier.
+	uint16_t d;
 } iscsi_isid;
 
 
@@ -6265,119 +4355,119 @@ typedef struct __attribute__((packed)) iscsi_isid {
  * Login Requests are always considered as immediate.
  */
 typedef struct __attribute__((packed)) iscsi_login_req_packet {
-    /// Always 0x03 according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Login request flags.
-    int8_t flags;
-
-    /**
-     * @brief Version-max indicates the maximum version number supported.
-     *
-     * All Login Requests within the Login Phase MUST carry the same
-     * Version-max. Currently, this is always 0.\n
-     * The target MUST use the value presented with the first Login Request.
-     */
-    uint8_t version_max;
-
-    /**
-     * @brief Version-min indicates the minimum version number supported.
-     *
-     * All Login Requests within the Login Phase MUST carry the same
-     * Version-min. The target MUST use the value presented with the first
-     * Login Request. Always 0 for now.
-     */
-    uint8_t version_min;
-
-    /// TotalAHSLength.
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength.
-    uint8_t ds_len[3];
-
-    /// Initiator Session ID (ISID).
-    iscsi_isid isid;
-
-    /**
-     * @brief Target Session Identifying Handle (TSIH).
-     *
-     * The TSIH must be set in the first Login Request. The reserved value
-     * 0 MUST be used on the first connection for a new session. Otherwise,
-     * the TSIH sent by the target at the conclusion of the successful login
-     * of the first connection for this session MUST be used. The TSIH
-     * identifies to the target the associated existing session for this new
-     * connection.\n
-     * All Login Requests within a Login Phase MUST carry the same TSIH.
-     * The target MUST check the value presented with the first Login
-     * Request.
-     */
-    uint16_t tsih;
-
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
-
-    /**
-     * @brief Connection ID (CID).
-     *
-     * The CID provides a unique ID for this connection within the session.\n
-     * All Login Requests within the Login Phase MUST carry the same CID.
-     * The target MUST use the value presented with the first Login Request.\n
-     * A Login Request with a non-zero TSIH and a CID equal to that of an
-     * existing connection implies a logout of the connection followed by a
-     * login.
-     */
-    uint16_t cid;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint16_t reserved;
-
-    /**
-     * @brief CmdSN.
-     *
-     * The CmdSN is either the initial command sequence number of a session
-     * (for the first Login Request of a session - the "leading" login) or
-     * the command sequence number in the command stream if the login is for
-     * a new connection in an existing session.\n
-     * Examples:
-     * - Login on a leading connection: If the leading login carries the
-     *   CmdSN 123, all other Login Requests in the same Login Phase carry
-     *   the CmdSN 123, and the first non-immediate command in the Full
-     *   Feature Phase also carries the CmdSN 123.
-     * - Login on other than a leading connection: If the current CmdSN at
-     *   the time the first login on the connection is issued is 500, then
-     *   that PDU carries CmdSN=500. Subsequent Login Requests that are
-     *   needed to complete this Login Phase may carry a CmdSN higher than
-     *   500 if non-immediate requests that were issued on other connections
-     *   in the same session advance the CmdSN.
-     *
-     * If the Login Request is a leading Login Request, the target MUST use
-     * the value presented in the CmdSN as the target value for the
-     * ExpCmdSN.
-     */
-    uint32_t cmd_sn;
-
-    /**
-     * @brief ExpStatSN.
-     *
-     * For the first Login Request on a connection, this is the ExpStatSN
-     * for the old connection, and this field is only valid if the Login
-     * Request restarts a connection.\n
-     * For subsequent Login Requests, it is used to acknowledge the Login
-     * Responses with their increasing StatSN values.
-     */
-    uint32_t exp_stat_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved2[2];
-
-    /**
-     * @brief Data segment - Login Parameters in Text Request Format.
-     *
-     * The initiator MUST provide some basic parameters in order
-     * to enable the target to determine if the initiator may use
-     * the target's resources and the initial text parameters for the security exchange
-     */
-    iscsi_scsi_ds_cmd_data ds_cmd_data;
+	/// Always 0x03 according to iSCSI specification.
+	uint8_t opcode;
+
+	/// Login request flags.
+	int8_t flags;
+
+	/**
+	 * @brief Version-max indicates the maximum version number supported.
+	 *
+	 * All Login Requests within the Login Phase MUST carry the same
+	 * Version-max. Currently, this is always 0.\n
+	 * The target MUST use the value presented with the first Login Request.
+	 */
+	uint8_t version_max;
+
+	/**
+	 * @brief Version-min indicates the minimum version number supported.
+	 *
+	 * All Login Requests within the Login Phase MUST carry the same
+	 * Version-min. The target MUST use the value presented with the first
+	 * Login Request. Always 0 for now.
+	 */
+	uint8_t version_min;
+
+	/// TotalAHSLength.
+	uint8_t total_ahs_len;
+
+	/// DataSegmentLength.
+	uint8_t ds_len[3];
+
+	/// Initiator Session ID (ISID).
+	iscsi_isid isid;
+
+	/**
+	 * @brief Target Session Identifying Handle (TSIH).
+	 *
+	 * The TSIH must be set in the first Login Request. The reserved value
+	 * 0 MUST be used on the first connection for a new session. Otherwise,
+	 * the TSIH sent by the target at the conclusion of the successful login
+	 * of the first connection for this session MUST be used. The TSIH
+	 * identifies to the target the associated existing session for this new
+	 * connection.\n
+	 * All Login Requests within a Login Phase MUST carry the same TSIH.
+	 * The target MUST check the value presented with the first Login
+	 * Request.
+	 */
+	uint16_t tsih;
+
+	/// Initiator Task Tag (ITT).
+	uint32_t init_task_tag;
+
+	/**
+	 * @brief Connection ID (CID).
+	 *
+	 * The CID provides a unique ID for this connection within the session.\n
+	 * All Login Requests within the Login Phase MUST carry the same CID.
+	 * The target MUST use the value presented with the first Login Request.\n
+	 * A Login Request with a non-zero TSIH and a CID equal to that of an
+	 * existing connection implies a logout of the connection followed by a
+	 * login.
+	 */
+	uint16_t cid;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint16_t reserved;
+
+	/**
+	 * @brief CmdSN.
+	 *
+	 * The CmdSN is either the initial command sequence number of a session
+	 * (for the first Login Request of a session - the "leading" login) or
+	 * the command sequence number in the command stream if the login is for
+	 * a new connection in an existing session.\n
+	 * Examples:
+	 * - Login on a leading connection: If the leading login carries the
+	 *   CmdSN 123, all other Login Requests in the same Login Phase carry
+	 *   the CmdSN 123, and the first non-immediate command in the Full
+	 *   Feature Phase also carries the CmdSN 123.
+	 * - Login on other than a leading connection: If the current CmdSN at
+	 *   the time the first login on the connection is issued is 500, then
+	 *   that PDU carries CmdSN=500. Subsequent Login Requests that are
+	 *   needed to complete this Login Phase may carry a CmdSN higher than
+	 *   500 if non-immediate requests that were issued on other connections
+	 *   in the same session advance the CmdSN.
+	 *
+	 * If the Login Request is a leading Login Request, the target MUST use
+	 * the value presented in the CmdSN as the target value for the
+	 * ExpCmdSN.
+	 */
+	uint32_t cmd_sn;
+
+	/**
+	 * @brief ExpStatSN.
+	 *
+	 * For the first Login Request on a connection, this is the ExpStatSN
+	 * for the old connection, and this field is only valid if the Login
+	 * Request restarts a connection.\n
+	 * For subsequent Login Requests, it is used to acknowledge the Login
+	 * Responses with their increasing StatSN values.
+	 */
+	uint32_t exp_stat_sn;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint64_t reserved2[2];
+
+	/**
+	 * @brief Data segment - Login Parameters in Text Request Format.
+	 *
+	 * The initiator MUST provide some basic parameters in order
+	 * to enable the target to determine if the initiator may use
+	 * the target's resources and the initial text parameters for the security exchange
+	 */
+	iscsi_scsi_ds_cmd_data ds_cmd_data;
 } iscsi_login_req_packet;
 
 
@@ -6624,107 +4714,107 @@ typedef struct __attribute__((packed)) iscsi_login_req_packet {
  * Phase.
  */
 typedef struct __attribute__((packed)) iscsi_login_response_packet {
-    /// Always 0x23 according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Login response flags.
-    int8_t flags;
-
-    /**
-     * @brief This is the highest version number supported by the target.
-     *
-     * All Login Responses within the Login Phase MUST carry the same
-     * Version-max.
-     */
-    uint8_t version_max;
-
-    /**
-     * @brief Version-active indicates the highest version supported by the target and initiator.
-     *
-     * If the target does not support a version within the
-     * range specified by the initiator, the target rejects the login and
-     * this field indicates the lowest version supported by the target.
-     * All Login Responses within the Login Phase MUST carry the same
-     * Version-active.\n
-     * The initiator MUST use the value presented as a response to the first
-     * Login Request.
-     */
-    uint8_t version_active;
-
-    /// TotalAHSLength.
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength.
-    uint8_t ds_len[3];
-
-    /// Initiator Session ID (ISID).
-    iscsi_isid isid;
-
-    /**
-     * @brief Target Session Identifying Handle (TSIH).
-     *
-     * The TSIH is the target-assigned session-identifying handle. Its
-     * internal format and content are not defined by this protocol, except
-     * for the value 0, which is reserved. With the exception of the Login
-     * Final-Response in a new session, this field should be set to the TSIH
-     * provided by the initiator in the Login Request. For a new session,
-     * the target MUST generate a non-zero TSIH and ONLY return it in the
-     * Login Final-Response.
-     */
-    uint16_t tsih;
-
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved;
-
-    /**
-     * @brief StatSN.
-     *
-     * For the first Login Response (the response to the first Login
-     * Request), this is the starting status sequence number for the
-     * connection. The next response of any kind - including the next
-     * Login Response, if any, in the same Login Phase - will carry this
-     * number + 1. This field is only valid if the Status-Class is 0.
-     */
-    uint32_t stat_sn;
-
-    /// ExpCmdSN.
-    uint32_t exp_cmd_sn;
-
-    /// MaxCmdSN.
-    uint32_t max_cmd_sn;
-
-    /**
-     * @brief Status-class.
-     *
-     * Status-class (see above for details). If the Status-Class is
-     * not 0, the initiator and target MUST close the TCP connection
-     * If the target wishes to reject the Login Request for more than one
-     * reason, it should return the primary reason for the rejection.
-     */
-    uint8_t status_class;
-
-    /// Status-detail.
-    uint8_t status_detail;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint16_t reserved2;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved3;
-
-    /**
-     * @brief Data segment - Login Parameters in Text Request Format.
-     *
-     * The target MUST provide some basic parameters in order to enable the
-     * initiator to determine if it is connected to the correct port and the
-     * initial text parameters for the security exchange.\n
-     * All the rules specified for Text Responses also hold for Login
-     * Responses.
-     */
-    iscsi_scsi_ds_cmd_data ds_cmd_data;
+	/// Always 0x23 according to iSCSI specification.
+	uint8_t opcode;
+
+	/// Login response flags.
+	int8_t flags;
+
+	/**
+	 * @brief This is the highest version number supported by the target.
+	 *
+	 * All Login Responses within the Login Phase MUST carry the same
+	 * Version-max.
+	 */
+	uint8_t version_max;
+
+	/**
+	 * @brief Version-active indicates the highest version supported by the target and initiator.
+	 *
+	 * If the target does not support a version within the
+	 * range specified by the initiator, the target rejects the login and
+	 * this field indicates the lowest version supported by the target.
+	 * All Login Responses within the Login Phase MUST carry the same
+	 * Version-active.\n
+	 * The initiator MUST use the value presented as a response to the first
+	 * Login Request.
+	 */
+	uint8_t version_active;
+
+	/// TotalAHSLength.
+	uint8_t total_ahs_len;
+
+	/// DataSegmentLength.
+	uint8_t ds_len[3];
+
+	/// Initiator Session ID (ISID).
+	iscsi_isid isid;
+
+	/**
+	 * @brief Target Session Identifying Handle (TSIH).
+	 *
+	 * The TSIH is the target-assigned session-identifying handle. Its
+	 * internal format and content are not defined by this protocol, except
+	 * for the value 0, which is reserved. With the exception of the Login
+	 * Final-Response in a new session, this field should be set to the TSIH
+	 * provided by the initiator in the Login Request. For a new session,
+	 * the target MUST generate a non-zero TSIH and ONLY return it in the
+	 * Login Final-Response.
+	 */
+	uint16_t tsih;
+
+	/// Initiator Task Tag (ITT).
+	uint32_t init_task_tag;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint32_t reserved;
+
+	/**
+	 * @brief StatSN.
+	 *
+	 * For the first Login Response (the response to the first Login
+	 * Request), this is the starting status sequence number for the
+	 * connection. The next response of any kind - including the next
+	 * Login Response, if any, in the same Login Phase - will carry this
+	 * number + 1. This field is only valid if the Status-Class is 0.
+	 */
+	uint32_t stat_sn;
+
+	/// ExpCmdSN.
+	uint32_t exp_cmd_sn;
+
+	/// MaxCmdSN.
+	uint32_t max_cmd_sn;
+
+	/**
+	 * @brief Status-class.
+	 *
+	 * Status-class (see above for details). If the Status-Class is
+	 * not 0, the initiator and target MUST close the TCP connection
+	 * If the target wishes to reject the Login Request for more than one
+	 * reason, it should return the primary reason for the rejection.
+	 */
+	uint8_t status_class;
+
+	/// Status-detail.
+	uint8_t status_detail;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint16_t reserved2;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint64_t reserved3;
+
+	/**
+	 * @brief Data segment - Login Parameters in Text Request Format.
+	 *
+	 * The target MUST provide some basic parameters in order to enable the
+	 * initiator to determine if it is connected to the correct port and the
+	 * initial text parameters for the security exchange.\n
+	 * All the rules specified for Text Responses also hold for Login
+	 * Responses.
+	 */
+	iscsi_scsi_ds_cmd_data ds_cmd_data;
 } iscsi_login_response_packet;
 
 
@@ -6832,82 +4922,79 @@ typedef struct __attribute__((packed)) iscsi_login_response_packet {
  * recovery, unless the session is also closed.
  */
 typedef struct __attribute__((packed)) iscsi_logout_req_packet {
-    /// Always 6 according to iSCSI specification.
-    uint8_t opcode;
-
-    /**
-     * @brief Reason code.
-     *
-     * A target implicitly terminates the active tasks due to the iSCSI
-     * protocol in the following cases:
-     * -# When a connection is implicitly or explicitly logged out with
-     *    the reason code "close the connection" and there are active
-     *    tasks allegiant to that connection.
-     * -# When a connection fails and eventually the connection state
-     *    times out and there are active tasks allegiant to that
-     *    connection
-     * -# When a successful recovery Logout is performed while there are
-     *    active tasks allegiant to that connection and those tasks
-     *    eventually time out after the Time2Wait and Time2Retain periods
-     *    without allegiance reassignment
-     * -# When a connection is implicitly or explicitly logged out with
-     *    the reason code "close the session" and there are active tasks
-     *    in that session
-     *
-     * If the tasks terminated in any of the above cases are SCSI tasks,
-     * they must be internally terminated as if with CHECK CONDITION status.
-     * This status is only meaningful for appropriately handling the
-     * internal SCSI state and SCSI side effects with respect to ordering,
-     * because this status is never communicated back as a terminating
-     * status to the initiator. However, additional actions may have to be
-     * taken at the SCSI level, depending on the SCSI context as defined by
-     * the SCSI standards (e.g., queued commands and ACA; UA for the next
-     * command on the I_T nexus in cases a), b), and c) above). After the
-     * tasks are terminated, the target MUST report a Unit Attention condition
-     * on the next command processed on any connection for each affected
-     * I_T_L nexus with the status of CHECK CONDITION, the ASC/ASCQ value
-     * of 0x47 / 0x7F ("SOME COMMANDS CLEARED BY ISCSI PROTOCOL EVENT"), etc.
-     */
-    int8_t reason_code;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint16_t reserved;
-
-    /// TotalAHSLength (MUST be 0 for this PDU).
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength (MUST be 0 for this PDU).
-    uint8_t ds_len[3];
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved2;
-
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
-
-    /**
-     * @brief Connection ID (CID).
-     *
-     * This is the connection ID of the connection to be closed (including
-     * closing the TCP stream). This field is only valid if the reason code
-     * is not "close the session".
-     */
-    uint16_t cid;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint16_t reserved3;
-
-    /// CmdSN.
-    uint32_t cmd_sn;
-
-    /// This is the last ExpStatSN value for the connection to be closed.
-    uint32_t exp_stat_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved4[2];
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
+	/// Always 6 according to iSCSI specification.
+	uint8_t opcode;
+
+	/**
+	 * @brief Reason code.
+	 *
+	 * A target implicitly terminates the active tasks due to the iSCSI
+	 * protocol in the following cases:
+	 * -# When a connection is implicitly or explicitly logged out with
+	 *    the reason code "close the connection" and there are active
+	 *    tasks allegiant to that connection.
+	 * -# When a connection fails and eventually the connection state
+	 *    times out and there are active tasks allegiant to that
+	 *    connection
+	 * -# When a successful recovery Logout is performed while there are
+	 *    active tasks allegiant to that connection and those tasks
+	 *    eventually time out after the Time2Wait and Time2Retain periods
+	 *    without allegiance reassignment
+	 * -# When a connection is implicitly or explicitly logged out with
+	 *    the reason code "close the session" and there are active tasks
+	 *    in that session
+	 *
+	 * If the tasks terminated in any of the above cases are SCSI tasks,
+	 * they must be internally terminated as if with CHECK CONDITION status.
+	 * This status is only meaningful for appropriately handling the
+	 * internal SCSI state and SCSI side effects with respect to ordering,
+	 * because this status is never communicated back as a terminating
+	 * status to the initiator. However, additional actions may have to be
+	 * taken at the SCSI level, depending on the SCSI context as defined by
+	 * the SCSI standards (e.g., queued commands and ACA; UA for the next
+	 * command on the I_T nexus in cases a), b), and c) above). After the
+	 * tasks are terminated, the target MUST report a Unit Attention condition
+	 * on the next command processed on any connection for each affected
+	 * I_T_L nexus with the status of CHECK CONDITION, the ASC/ASCQ value
+	 * of 0x47 / 0x7F ("SOME COMMANDS CLEARED BY ISCSI PROTOCOL EVENT"), etc.
+	 */
+	int8_t reason_code;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint16_t reserved;
+
+	/// TotalAHSLength (MUST be 0 for this PDU).
+	uint8_t total_ahs_len;
+
+	/// DataSegmentLength (MUST be 0 for this PDU).
+	uint8_t ds_len[3];
+
+	/// Reserved for future usage, always MUST be 0.
+	uint64_t reserved2;
+
+	/// Initiator Task Tag (ITT).
+	uint32_t init_task_tag;
+
+	/**
+	 * @brief Connection ID (CID).
+	 *
+	 * This is the connection ID of the connection to be closed (including
+	 * closing the TCP stream). This field is only valid if the reason code
+	 * is not "close the session".
+	 */
+	uint16_t cid;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint16_t reserved3;
+
+	/// CmdSN.
+	uint32_t cmd_sn;
+
+	/// This is the last ExpStatSN value for the connection to be closed.
+	uint32_t exp_stat_sn;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint64_t reserved4[2];
 } iscsi_logout_req_packet;
 
 
@@ -6934,272 +5021,90 @@ typedef struct __attribute__((packed)) iscsi_logout_req_packet {
  * was session close).
  */
 typedef struct __attribute__((packed)) iscsi_logout_response_packet {
-    /// Always 0x26 according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Reserved for future usage (must be always 0x80 for now).
-    int8_t flags;
-
-    /// Response.
-    uint8_t response;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint8_t reserved;
-
-    /// TotalAHSLength (MUST be 0 for this PDU).
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength (MUST be 0 for this PDU).
-    uint8_t ds_len[3];
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved2;
-
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved3;
-
-    /// StatSN.
-    uint32_t stat_sn;
-
-    /// ExpCmdSN.
-    uint32_t exp_cmd_sn;
-
-    /// MaxCmdSN.
-    uint32_t max_cmd_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved4;
-
-    /**
-     * @brief Time2Wait.
-     *
-     * If the Logout response code is 0 and the operational
-     * ErrorRecoveryLevel is 2, this is the minimum amount of time, in
-     * seconds, to wait before attempting task reassignment. If the Logout
-     * response code is 0 and the operational ErrorRecoveryLevel is less
-     * than 2, this field is to be ignored.\n
-     * This field is invalid if the Logout response code is 1.\n
-     * If the Logout response code is 2 or 3, this field specifies the
-     * minimum time to wait before attempting a new implicit or explicit
-     * logout.\n
-     * If Time2Wait is 0, the reassignment or a new Logout may be attempted
-     * immediately.
-     */
-    uint16_t time_wait;
-
-    /**
-     * @brief Time2Retain.
-     *
-     * If the Logout response code is 0 and the operational
-     * ErrorRecoveryLevel is 2, this is the maximum amount of time, in
-     * seconds, after the initial wait (Time2Wait) that the target waits for
-     * the allegiance reassignment for any active task, after which the task
-     * state is discarded. If the Logout response code is 0 and the
-     * operational ErrorRecoveryLevel is less than 2, this field is to be
-     * ignored.\n
-     * This field is invalid if the Logout response code is 1.\n
-     * If the Logout response code is 2 or 3, this field specifies the
-     * maximum amount of time, in seconds, after the initial wait
-     * (Time2Wait) that the target waits for a new implicit or explicit
-     * logout.\n
-     * If it is the last connection of a session, the whole session state is
-     * discarded after Time2Retain.\n
-     * If Time2Retain is 0, the target has already discarded the connection
-     * (and possibly the session) state along with the task states. No
-     * reassignment or Logout is required in this case.
-     */
-    uint16_t time_retain;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved5;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
+	/// Always 0x26 according to iSCSI specification.
+	uint8_t opcode;
+
+	/// Reserved for future usage (must be always 0x80 for now).
+	int8_t flags;
+
+	/// Response.
+	uint8_t response;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint8_t reserved;
+
+	/// TotalAHSLength (MUST be 0 for this PDU).
+	uint8_t total_ahs_len;
+
+	/// DataSegmentLength (MUST be 0 for this PDU).
+	uint8_t ds_len[3];
+
+	/// Reserved for future usage, always MUST be 0.
+	uint64_t reserved2;
+
+	/// Initiator Task Tag (ITT).
+	uint32_t init_task_tag;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint32_t reserved3;
+
+	/// StatSN.
+	uint32_t stat_sn;
+
+	/// ExpCmdSN.
+	uint32_t exp_cmd_sn;
+
+	/// MaxCmdSN.
+	uint32_t max_cmd_sn;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint32_t reserved4;
+
+	/**
+	 * @brief Time2Wait.
+	 *
+	 * If the Logout response code is 0 and the operational
+	 * ErrorRecoveryLevel is 2, this is the minimum amount of time, in
+	 * seconds, to wait before attempting task reassignment. If the Logout
+	 * response code is 0 and the operational ErrorRecoveryLevel is less
+	 * than 2, this field is to be ignored.\n
+	 * This field is invalid if the Logout response code is 1.\n
+	 * If the Logout response code is 2 or 3, this field specifies the
+	 * minimum time to wait before attempting a new implicit or explicit
+	 * logout.\n
+	 * If Time2Wait is 0, the reassignment or a new Logout may be attempted
+	 * immediately.
+	 */
+	uint16_t time_wait;
+
+	/**
+	 * @brief Time2Retain.
+	 *
+	 * If the Logout response code is 0 and the operational
+	 * ErrorRecoveryLevel is 2, this is the maximum amount of time, in
+	 * seconds, after the initial wait (Time2Wait) that the target waits for
+	 * the allegiance reassignment for any active task, after which the task
+	 * state is discarded. If the Logout response code is 0 and the
+	 * operational ErrorRecoveryLevel is less than 2, this field is to be
+	 * ignored.\n
+	 * This field is invalid if the Logout response code is 1.\n
+	 * If the Logout response code is 2 or 3, this field specifies the
+	 * maximum amount of time, in seconds, after the initial wait
+	 * (Time2Wait) that the target waits for a new implicit or explicit
+	 * logout.\n
+	 * If it is the last connection of a session, the whole session state is
+	 * discarded after Time2Retain.\n
+	 * If Time2Retain is 0, the target has already discarded the connection
+	 * (and possibly the session) state along with the task states. No
+	 * reassignment or Logout is required in this case.
+	 */
+	uint16_t time_retain;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint32_t reserved5;
 } iscsi_logout_response_packet;
 
 
-/// Selective Negative / Sequence Number Acknowledgment (SNACK) request: Data/R2T SNACK: requesting retransmission of one or more Data-In or R2T PDUs.
-#define ISCSI_SNACK_REQ_TYPE_DATA_R2T_SNACK 0x00
-
-/// Selective Negative / Sequence Number Acknowledgment (SNACK) request:
-#define ISCSI_SNACK_REQ_TYPE_STATUS_SNACK   0x01 // Status SNACK: requesting retransmission of one or more
-                                                 // numbered responses
-
-/**
- * @brief Selective Negative / Sequence Number Acknowledgment (SNACK) request: DataACK: positively acknowledges Data-In PDUs.
- *
- * If an initiator operates at ErrorRecoveryLevel 1 or higher, it MUST
- * issue a SNACK of type DataACK after receiving a Data-In PDU with the
- * A bit set to 1. However, if the initiator has detected holes in the
- * input sequence, it MUST postpone issuing the SNACK of type DataACK
- * until the holes are filled. An initiator MAY ignore the A bit if it
- * deems that the bit is being set aggressively by the target (i.e.,
- * before the MaxBurstLength limit is reached).\n
- * The DataACK is used to free resources at the target and not to
- * request or imply data retransmission.\n
- * An initiator MUST NOT request retransmission for any data it had
- * already acknowledged
- */
-#define ISCSI_SNACK_REQ_TYPE_DATA_ACK       0x02
-
-/**
- * @brief Selective Negative / Sequence Number Acknowledgment (SNACK) request: R-Data SNACK: requesting retransmission of Data-In PDUs with possible resegmentation and status tagging.
- *
- * If the initiator MaxRecvDataSegmentLength changed between the
- * original transmission and the time the initiator requests
- * retransmission, the initiator MUST issue a R-Data SNACK.\n
- * With R-Data SNACK, the initiator indicates that it discards all the
- * unacknowledged data and expects the target to resend it. It also
- * expects resegmentation. In this case, the retransmitted Data-In PDUs
- * MAY be different from the ones originally sent in order to reflect
- * changes in MaxRecvDataSegmentLength. Their DataSN starts with the
- * BegRun of the last DataACK received by the target if any was received;
- * otherwise, it starts with 0 and is increased by 1 for each resent
- * Data-In PDU.\n
- * A target that has received a R-Data SNACK MUST return a SCSI Response
- * that contains a copy of the SNACK Tag field from the R-Data SNACK in
- * the SCSI Response SNACK Tag field as its last or only Response. For
- * example, if it has already sent a response containing another value
- * in the SNACK Tag field or had the status included in the last Data-In
- * PDU, it must send a new SCSI Response PDU. If a target sends more
- * than one SCSI Response PDU due to this rule, all SCSI Response PDUs
- * must carry the same StatSN. If an initiator attempts to recover a lost
- * SCSI Response when more than one response has been sent, the
- * target will send the SCSI Response with the latest content known to
- * the target, including the last SNACK Tag for the command.\n
- * For considerations in allegiance reassignment of a task to a
- * connection with a different MaxRecvDataSegmentLength.
- */
-#define ISCSI_SNACK_REQ_TYPE_R_DATA_SNACK   0x03
-
-
-/**
- * @brief iSCSI SNACK Request packet data.
- *
- * If the implementation supports ErrorRecoveryLevel greater than zero,
- * it MUST support all SNACK types.
- *
- * The SNACK is used by the initiator to request the retransmission of
- * numbered responses, data, or R2T PDUs from the target. The SNACK
- * Request indicates the numbered responses or data "runs" whose
- * retransmission is requested, where the run starts with the first
- * StatSN, DataSN, or R2TSN whose retransmission is requested and
- * indicates the number of Status, Data, or R2T PDUs requested,
- * including the first. 0 has special meaning when used as a starting
- * number and length:
- *
- *    - When used in RunLength, it means all PDUs starting with the
- *      initial.
- *
- *    - When used in both BegRun and RunLength, it means all
- *      unacknowledged PDUs.
- *
- * The numbered response(s) or R2T(s) requested by a SNACK MUST be
- * delivered as exact replicas of the ones that the target transmitted
- * originally, except for the fields ExpCmdSN, MaxCmdSN, and ExpDataSN,
- * which MUST carry the current values. R2T(s)requested by SNACK MUST
- * also carry the current value of the StatSN.
- *
- * The numbered Data-In PDUs requested by a Data SNACK MUST be delivered
- * as exact replicas of the ones that the target transmitted originally,
- * except for the fields ExpCmdSN and MaxCmdSN, which MUST carry the
- * current values; and except for resegmentation.
- *
- * Any SNACK that requests a numbered response, data, or R2T that was
- * not sent by the target or was already acknowledged by the initiator
- * MUST be rejected with a reason code of "Protocol Error".
- */
-typedef struct __attribute__((packed)) iscsi_snack_req_packet {
-    /// Always 0x10 according to iSCSI specification.
-    uint8_t opcode;
-
-    /**
-     * @brief Type.
-     *
-     * Data/R2T SNACK, Status SNACK, or R-Data SNACK for a command MUST
-     * precede status acknowledgment for the given command.
-     */
-    int8_t type;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint16_t reserved;
-
-    /// TotalAHSLength.
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength.
-    uint8_t ds_len[3];
-
-    /// LUN or Reserved.
-    uint64_t lun;
-
-    /**
-     * @brief Initiator Task Tag (ITT).
-     *
-     * For a Status SNACK and DataACK, the Initiator Task Tag MUST be set to
-     * the reserved value 0xFFFFFFFF. In all other cases, the Initiator
-     * Task Tag field MUST be set to the Initiator Task Tag of the
-     * referenced command.
-     */
-    uint32_t init_task_tag;
-
-    /**
-     * @brief Target Transfer Tag (TTT).
-     *
-     * For a R-Data SNACK, this field MUST contain a value that is different
-     * from 0 or 0xFFFFFFFF and is unique for the task (identified by the
-     * Initiator Task Tag). This value MUST be copied by the iSCSI target
-     * in the last or only SCSI Response PDU it issues for the command.\n
-     * For DataACK, the Target Transfer Tag MUST contain a copy of the
-     * Target Transfer Tag and LUN provided with the SCSI Data-In PDU with
-     * the A bit set to 1.\n
-     * In all other cases, the Target Transfer Tag field MUST be set to the
-     * reserved value 0xFFFFFFFF.
-     */
-    uint32_t target_xfer_snack_tag;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved2;
-
-    /// ExpStatSN.
-    uint32_t exp_stat_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved3;
-
-    /**
-     * @brief BegRun.
-     *
-     * This field indicates the DataSN, R2TSN, or StatSN of the first PDU
-     * whose retransmission is requested (Data/R2T and Status SNACK), or the
-     * next expected DataSN (DataACK SNACK).\n
-     * A BegRun of 0, when used in conjunction with a RunLength of 0, means
-     * "resend all unacknowledged Data-In, R2T or Response PDUs".
-     * BegRun MUST be 0 for a R-Data SNACK.
-     */
-    uint32_t beg_run;
-
-    /**
-     * @brief RunLength.
-     *
-     * This field indicates the number of PDUs whose retransmission is
-     * requested.\n
-     * A RunLength of 0 signals that all Data-In, R2T, or Response PDUs
-     * carrying the numbers equal to or greater than BegRun have to be
-     * resent.\n
-     * The RunLength MUST also be 0 for a DataACK SNACK in addition to a
-     * R-Data SNACK.
-     */
-    uint32_t run_len;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-} iscsi_snack_req_packet;
-
-
 /// iSCSI Reject packet data: Reserved, original PDU can't be resent.
 #define ISCSI_REJECT_REASON_RESERVED                    0x01
 
@@ -7266,100 +5171,91 @@ typedef struct __attribute__((packed)) iscsi_snack_req_packet {
  * packet was rejected or has been rejected for some reason.
  */
 typedef struct __attribute__((packed)) iscsi_reject_packet {
-    /// Always 0x3F according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Reserved for future usage (must be always 0x80 for now).
-    int8_t flags;
-
-    /**
-     * @brief Reject reason.
-     *
-     * In all the cases in which a pre-instantiated SCSI task is terminated
-     * because of the reject, the target MUST issue a proper SCSI command
-     * response with CHECK CONDITION. In these cases in which a status for
-     * the SCSI task was already sent before the reject, no additional
-     * status is required. If the error is detected while data from the
-     * initiator is still expected (i.e., the command PDU did not contain
-     * all the data and the target has not received a Data-Out PDU with the
-     * Final bit set to 1 for the unsolicited data, if any, and all
-     * outstanding R2Ts, if any), the target MUST wait until it receives
-     * the last expected Data-Out PDUs with the F bit set to 1 before
-     * sending the Response PDU.
-     */
-    uint8_t reason;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint8_t reserved;
-
-    /// TotalAHSLength.
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength.
-    uint8_t ds_len[3];
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved2;
-
-    /// Always 0xFFFFFFFF for now.
-    uint32_t tag;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved3;
-
-    /**
-     * @brief StatSN.
-     *
-     * This field carries its usual value and is not related to the
-     * rejected command. The StatSN is advanced after a Reject.
-     */
-    uint32_t stat_sn;
-
-    /**
-     * @brief ExpCmdSN.
-     *
-     * This field carries its usual value and is not related to the
-     * rejected command.
-     */
-    uint32_t exp_cmd_sn;
-
-    /**
-     * @brief MaxCmdSN.
-     *
-     * This field carries its usual value and is not related to the
-     * rejected command.
-     */
-    uint32_t max_cmd_sn;
-
-    /**
-     * @brief DataSN / Ready To Transfer Sequence Number (R2TSN) or Reserved.
-     *
-     * This field is only valid if the rejected PDU is a Data/R2T SNACK and
-     * the Reject reason code is "Protocol Error". The DataSN/R2TSN is the
-     * next Data/R2T sequence number that the target would send for the
-     * task, if any.
-     */
-    uint32_t data_r2t_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved4;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-
-    /**
-     * @brief Complete Header of Bad PDU.
-     *
-     * The target returns the header (not including the digest) of the
-     * PDU in error as the data of the response.
-     */
-    iscsi_bhs_packet bad_pdu_hdr;
-
-    /// Vendor-specific data (if any).
-    uint8_t vendor_data[0];
-
-    /// Optional data digest.
-    iscsi_data_digest data_digest;
+	/// Always 0x3F according to iSCSI specification.
+	uint8_t opcode;
+
+	/// Reserved for future usage (must be always 0x80 for now).
+	int8_t flags;
+
+	/**
+	 * @brief Reject reason.
+	 *
+	 * In all the cases in which a pre-instantiated SCSI task is terminated
+	 * because of the reject, the target MUST issue a proper SCSI command
+	 * response with CHECK CONDITION. In these cases in which a status for
+	 * the SCSI task was already sent before the reject, no additional
+	 * status is required. If the error is detected while data from the
+	 * initiator is still expected (i.e., the command PDU did not contain
+	 * all the data and the target has not received a Data-Out PDU with the
+	 * Final bit set to 1 for the unsolicited data, if any, and all
+	 * outstanding R2Ts, if any), the target MUST wait until it receives
+	 * the last expected Data-Out PDUs with the F bit set to 1 before
+	 * sending the Response PDU.
+	 */
+	uint8_t reason;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint8_t reserved;
+
+	/// TotalAHSLength.
+	uint8_t total_ahs_len;
+
+	/// DataSegmentLength.
+	uint8_t ds_len[3];
+
+	/// Reserved for future usage, always MUST be 0.
+	uint64_t reserved2;
+
+	/// Always 0xFFFFFFFF for now.
+	uint32_t tag;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint32_t reserved3;
+
+	/**
+	 * @brief StatSN.
+	 *
+	 * This field carries its usual value and is not related to the
+	 * rejected command. The StatSN is advanced after a Reject.
+	 */
+	uint32_t stat_sn;
+
+	/**
+	 * @brief ExpCmdSN.
+	 *
+	 * This field carries its usual value and is not related to the
+	 * rejected command.
+	 */
+	uint32_t exp_cmd_sn;
+
+	/**
+	 * @brief MaxCmdSN.
+	 *
+	 * This field carries its usual value and is not related to the
+	 * rejected command.
+	 */
+	uint32_t max_cmd_sn;
+
+	/**
+	 * @brief DataSN / Ready To Transfer Sequence Number (R2TSN) or Reserved.
+	 *
+	 * This field is only valid if the rejected PDU is a Data/R2T SNACK and
+	 * the Reject reason code is "Protocol Error". The DataSN/R2TSN is the
+	 * next Data/R2T sequence number that the target would send for the
+	 * task, if any.
+	 */
+	uint32_t data_r2t_sn;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint64_t reserved4;
+
+	/**
+	 * @brief Complete Header of Bad PDU.
+	 *
+	 * The target returns the header (not including the digest) of the
+	 * PDU in error as the data of the response.
+	 */
+	iscsi_bhs_packet bad_pdu_hdr;
 } iscsi_reject_packet;
 
 /**
@@ -7384,76 +5280,76 @@ typedef struct __attribute__((packed)) iscsi_reject_packet {
  * in response to each other.
  */
 typedef struct __attribute__((packed)) iscsi_nop_out_packet {
-    /// Always 0x00 according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Reserved for future usage (must be always 0x80 for now).
-    int8_t flags;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint16_t reserved;
-
-    /// TotalAHSLength.
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength.
-    uint8_t ds_len[3];
-
-    /// LUN or Reserved.
-    uint64_t lun;
-
-    /**
-     * @brief Initiator Task Tag (ITT).
-     *
-     * The NOP-Out MUST have the Initiator Task Tag set to a valid value
-     * only if a response in the form of a NOP-In is requested (i.e., the
-     * NOP-Out is used as a ping request). Otherwise, the Initiator Task
-     * Tag MUST be set to 0xFFFFFFFF.\n
-     * When a target receives the NOP-Out with a valid Initiator Task Tag,
-     * it MUST respond with a NOP-In Response.\n
-     * If the Initiator Task Tag contains 0xFFFFFFFF, the I bit MUST be set
-     * to 1, and the CmdSN is not advanced after this PDU is sent.
-     */
-    uint32_t init_task_tag;
-
-    /**
-     * @brief Target Transfer Tag (TTT).
-     *
-     * The Target Transfer Tag is a target-assigned identifier for the
-     * operation.\n
-     * The NOP-Out MUST only have the Target Transfer Tag set if it is
-     * issued in response to a NOP-In with a valid Target Transfer Tag. In
-     * this case, it copies the Target Transfer Tag from the NOP-In PDU.\n
-     * Otherwise, the Target Transfer Tag MUST be set to 0xFFFFFFFF.\n
-     * When the Target Transfer Tag is set to a value other than 0xFFFFFFFF,
-     * the LUN field MUST also be copied from the NOP-In.
-     */
-    uint32_t target_xfer_tag;
-
-    /// CmdSN.
-    uint32_t cmd_sn;
-
-    /// ExpStatSN.
-    uint32_t exp_stat_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved2[2];
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-
-    /**
-     * @brief DataSegment - Ping Data (optional).
-     *
-     * Ping data is reflected in the NOP-In Response. The length of the
-     * reflected data is limited to MaxRecvDataSegmentLength. The length of
-     * ping data is indicated by the DataSegmentLength. 0 is a valid value
-     * for the DataSegmentLength and indicates the absence of ping data.
-     */
-    iscsi_scsi_ds_cmd_data ds_ping_data;
-
-    /// Optional data digest.
-    iscsi_data_digest data_digest;
+	/// Always 0x00 according to iSCSI specification.
+	uint8_t opcode;
+
+	/// Reserved for future usage (must be always 0x80 for now).
+	int8_t flags;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint16_t reserved;
+
+	/// TotalAHSLength.
+	uint8_t total_ahs_len;
+
+	/// DataSegmentLength.
+	uint8_t ds_len[3];
+
+	/// LUN or Reserved.
+	uint64_t lun;
+
+	/**
+	 * @brief Initiator Task Tag (ITT).
+	 *
+	 * The NOP-Out MUST have the Initiator Task Tag set to a valid value
+	 * only if a response in the form of a NOP-In is requested (i.e., the
+	 * NOP-Out is used as a ping request). Otherwise, the Initiator Task
+	 * Tag MUST be set to 0xFFFFFFFF.\n
+	 * When a target receives the NOP-Out with a valid Initiator Task Tag,
+	 * it MUST respond with a NOP-In Response.\n
+	 * If the Initiator Task Tag contains 0xFFFFFFFF, the I bit MUST be set
+	 * to 1, and the CmdSN is not advanced after this PDU is sent.
+	 */
+	uint32_t init_task_tag;
+
+	/**
+	 * @brief Target Transfer Tag (TTT).
+	 *
+	 * The Target Transfer Tag is a target-assigned identifier for the
+	 * operation.\n
+	 * The NOP-Out MUST only have the Target Transfer Tag set if it is
+	 * issued in response to a NOP-In with a valid Target Transfer Tag. In
+	 * this case, it copies the Target Transfer Tag from the NOP-In PDU.\n
+	 * Otherwise, the Target Transfer Tag MUST be set to 0xFFFFFFFF.\n
+	 * When the Target Transfer Tag is set to a value other than 0xFFFFFFFF,
+	 * the LUN field MUST also be copied from the NOP-In.
+	 */
+	uint32_t target_xfer_tag;
+
+	/// CmdSN.
+	uint32_t cmd_sn;
+
+	/// ExpStatSN.
+	uint32_t exp_stat_sn;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint64_t reserved2[2];
+
+	/// Optional header digest.
+	uint32_t hdr_digest;
+
+	/**
+	 * @brief DataSegment - Ping Data (optional).
+	 *
+	 * Ping data is reflected in the NOP-In Response. The length of the
+	 * reflected data is limited to MaxRecvDataSegmentLength. The length of
+	 * ping data is indicated by the DataSegmentLength. 0 is a valid value
+	 * for the DataSegmentLength and indicates the absence of ping data.
+	 */
+	iscsi_scsi_ds_cmd_data ds_ping_data;
+
+	/// Optional data digest.
+	uint32_t data_digest;
 } iscsi_nop_out_packet;
 
 
@@ -7482,70 +5378,70 @@ typedef struct __attribute__((packed)) iscsi_nop_out_packet {
  * (DataSegmentLength MUST be 0).
  */
 typedef struct __attribute__((packed)) iscsi_nop_in_packet {
-    /// Always 0x20 according to iSCSI specification.
-    uint8_t opcode;
-
-    /// Reserved for future usage (must be always 0x80 for now).
-    int8_t flags;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint16_t reserved;
-
-    /// TotalAHSLength
-    uint8_t total_ahs_len;
-
-    /// DataSegmentLength.
-    uint8_t ds_len[3];
-
-    /// A LUN MUST be set to a correct value when the Target Transfer Tag is valid (not the reserved value 0xFFFFFFFF).
-    uint64_t lun;
-
-    /// Initiator Task Tag (ITT) or 0xFFFFFFFF.
-    uint32_t init_task_tag;
-
-    /**
-     * @brief Target Transfer Tag (TTT).
-     *
-     * If the target is responding to a NOP-Out, this field is set to the
-     * reserved value 0xFFFFFFFF.\n
-     * If the target is sending a NOP-In as a ping (intending to receive a
-     * corresponding NOP-Out), this field is set to a valid value (not the
-     * reserved value 0xFFFFFFFF).\n
-     * If the target is initiating a NOP-In without wanting to receive a
-     * corresponding NOP-Out, this field MUST hold the reserved value
-     * 0xFFFFFFFF.
-     */
-    uint32_t target_xfer_tag;
-
-    /**
-     * @brief StatSN.
-     *
-     * The StatSN field will always contain the next StatSN. However, when
-     * the Initiator Task Tag is set to 0xFFFFFFFF, the StatSN for the
-     * connection is not advanced after this PDU is sent.
-     */
-    uint32_t stat_sn;
-
-    /// ExpCmdSN.
-    uint32_t exp_cmd_sn; // ExpCmdSN
-
-    /// MaxCmdSN.
-    uint32_t max_cmd_sn;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint32_t reserved2;
-
-    /// Reserved for future usage, always MUST be 0.
-    uint64_t reserved3;
-
-    /// Optional header digest.
-    iscsi_header_digest hdr_digest;
-
-    /// DataSegment - Return Ping Data.
-    iscsi_scsi_ds_cmd_data ds_ping_data;
-
-    /// Optional data digest.
-    iscsi_data_digest data_digest;
+	/// Always 0x20 according to iSCSI specification.
+	uint8_t opcode;
+
+	/// Reserved for future usage (must be always 0x80 for now).
+	int8_t flags;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint16_t reserved;
+
+	/// TotalAHSLength
+	uint8_t total_ahs_len;
+
+	/// DataSegmentLength.
+	uint8_t ds_len[3];
+
+	/// A LUN MUST be set to a correct value when the Target Transfer Tag is valid (not the reserved value 0xFFFFFFFF).
+	uint64_t lun;
+
+	/// Initiator Task Tag (ITT) or 0xFFFFFFFF.
+	uint32_t init_task_tag;
+
+	/**
+	 * @brief Target Transfer Tag (TTT).
+	 *
+	 * If the target is responding to a NOP-Out, this field is set to the
+	 * reserved value 0xFFFFFFFF.\n
+	 * If the target is sending a NOP-In as a ping (intending to receive a
+	 * corresponding NOP-Out), this field is set to a valid value (not the
+	 * reserved value 0xFFFFFFFF).\n
+	 * If the target is initiating a NOP-In without wanting to receive a
+	 * corresponding NOP-Out, this field MUST hold the reserved value
+	 * 0xFFFFFFFF.
+	 */
+	uint32_t target_xfer_tag;
+
+	/**
+	 * @brief StatSN.
+	 *
+	 * The StatSN field will always contain the next StatSN. However, when
+	 * the Initiator Task Tag is set to 0xFFFFFFFF, the StatSN for the
+	 * connection is not advanced after this PDU is sent.
+	 */
+	uint32_t stat_sn;
+
+	/// ExpCmdSN.
+	uint32_t exp_cmd_sn; // ExpCmdSN
+
+	/// MaxCmdSN.
+	uint32_t max_cmd_sn;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint32_t reserved2;
+
+	/// Reserved for future usage, always MUST be 0.
+	uint64_t reserved3;
+
+	/// Optional header digest.
+	uint32_t hdr_digest;
+
+	/// DataSegment - Return Ping Data.
+	iscsi_scsi_ds_cmd_data ds_ping_data;
+
+	/// Optional data digest.
+	uint32_t data_digest;
 } iscsi_nop_in_packet;
 
 
@@ -7593,17 +5489,17 @@ typedef struct __attribute__((packed)) iscsi_nop_in_packet {
  * identifier data.
  */
 typedef struct __attribute__((packed)) iscsi_transport_id {
-    /// First 4 bits are protocol ID and last 2 bits are format.
-    uint8_t id;
+	/// First 4 bits are protocol ID and last 2 bits are format.
+	uint8_t id;
 
-    /// Reserved for future usage (always MUST be 0).
-    uint8_t reserved;
+	/// Reserved for future usage (always MUST be 0).
+	uint8_t reserved;
 
-    /// Additional length of name.
-    uint16_t add_len;
+	/// Additional length of name.
+	uint16_t add_len;
 
-    /// Name.
-    uint8_t name[0];
+	/// Name.
+	uint8_t name[0];
 } iscsi_transport_id;
 
 
@@ -7683,20 +5579,20 @@ typedef struct __attribute__((packed)) iscsi_transport_id {
  * and the iSCSI connection lookup table.
  */
 typedef struct iscsi_key_value_pair_lut_entry {
-    /// Name of key.
-    const uint8_t *key;
+	/// Name of key.
+	const uint8_t *key;
 
-    /// Default value of the key, always in string representation.
-    uint8_t *value;
+	/// Default value of the key, always in string representation.
+	uint8_t *value;
 
-    /// NUL separated list of allowed string values. If key type is numeric: NUL separated minimum and maximum integer range. End is marked with another NUL.
-    uint8_t *list_range;
+	/// NUL separated list of allowed string values. If key type is numeric: NUL separated minimum and maximum integer range. End is marked with another NUL.
+	uint8_t *list_range;
 
-    /// Type of key and value pair.
-    const int type;
+	/// Type of key and value pair.
+	const int type;
 
-    /// Flags indicating special key attributes.
-    const int flags;
+	/// Flags indicating special key attributes.
+	const int flags;
 } iscsi_key_value_pair_lut_entry;
 
 
@@ -7708,19 +5604,19 @@ typedef struct iscsi_key_value_pair_lut_entry {
  * Text or Login packet data.
  */
 typedef struct iscsi_key_value_pair {
-    /// Value of the key which is stored in the hash map.
+	/// Value of the key which is stored in the hash map.
 	uint8_t *value;
 
-    /// NUL separated list of allowed string values. If key type is numeric: NUL separated minimum and maximum integer range. End is marked with another NUL.
-    uint8_t *list_range;
+	/// NUL separated list of allowed string values. If key type is numeric: NUL separated minimum and maximum integer range. End is marked with another NUL.
+	uint8_t *list_range;
 
-    /// Type of key and value pair.
-    int type;
+	/// Type of key and value pair.
+	int type;
 
-    /// Flags indicating special key attributes.
-    int flags;
+	/// Flags indicating special key attributes.
+	int flags;
 
-    /// State bit mask.
+	/// State bit mask.
 	uint state_mask;
 } iscsi_key_value_pair;
 
@@ -7733,20 +5629,20 @@ typedef struct iscsi_connection iscsi_connection;
  * pairs for sending as DataSegment packet data to the client.
  */
 typedef struct iscsi_key_value_pair_packet {
-    /// Associated iSCSI connection.
-    iscsi_connection *conn;
+	/// Associated iSCSI connection.
+	iscsi_connection *conn;
 
-    /// Current text buffer containing multiple key=value + NUL terminator pairs.
-    uint8_t *buf;
+	/// Current text buffer containing multiple key=value + NUL terminator pairs.
+	uint8_t *buf;
 
-    /// Position of output buffer for next write.
-    uint32_t pos;
+	/// Position of output buffer for next write.
+	uint32_t pos;
 
-    /// Current length of buffer including final NUL terminator without iSCSI zero padding.
-    uint32_t len;
+	/// Current length of buffer including final NUL terminator without iSCSI zero padding.
+	uint32_t len;
 
-    /// Discovery mode.
-    int discovery;
+	/// Discovery mode.
+	int discovery;
 } iscsi_key_value_pair_packet;
 
 /// iSCSI main global data flags: Allow duplicate ISIDs.
@@ -7989,47 +5885,41 @@ typedef struct iscsi_scsi_lun iscsi_scsi_lun;
  * layer task management.
  */
 typedef struct iscsi_scsi_task {
-    /// Connection associated with this task.
-    iscsi_connection *connection;
-
-    /// SCSI Command Descriptor Block (CDB).
-    iscsi_scsi_cdb *cdb;
+	/// Connection associated with this task.
+	iscsi_connection *connection;
 
-    /// SCSI sense data.
-    iscsi_scsi_sense_data_packet *sense_data;
+	/// SCSI Command Descriptor Block (CDB).
+	iscsi_scsi_cdb *cdb;
 
-    /// Output buffer.
-    uint8_t *buf;
+	/// SCSI sense data.
+	iscsi_scsi_sense_data_packet *sense_data;
 
-    /// Position of buffer in bytes.
-    uint32_t pos;
+	/// Output buffer.
+	uint8_t *buf;
 
-    /// Length of buffer in bytes.
-    uint32_t len;
+	/// Position of buffer in bytes.
+	uint32_t pos;
 
-    /// Unique identifier for this task.
-    uint64_t id;
+	/// Length of buffer in bytes.
+	uint32_t len;
 
-    /// Flags.
-    int flags;
+	/// Unique identifier for this task.
+	uint64_t id;
 
-    /// Transfer position in bytes.
-    uint32_t xfer_pos;
+	/// Flags.
+	int flags;
 
-    /// Transfer length in bytes.
-    uint32_t xfer_len;
+	/// Transfer position in bytes.
+	uint32_t xfer_pos;
 
-    /// Sense data length.
-    uint8_t sense_data_len;
+	/// Transfer length in bytes.
+	uint32_t xfer_len;
 
-    /// iSCSI SCSI status code.
-    uint8_t status;
+	/// Sense data length.
+	uint8_t sense_data_len;
 
-    /// Task management function.
-    uint8_t task_mgmt_func;
-
-    /// Task management response code.
-	uint8_t task_mgmt_response;
+	/// iSCSI SCSI status code.
+	uint8_t status;
 
 	/// Uplink read mutex for sync
 	pthread_mutex_t uplink_mutex;
@@ -8039,18 +5929,14 @@ typedef struct iscsi_scsi_task {
 } iscsi_scsi_task;
 
 
-/// iSCSI SCSI emulation physical block size in bits.
-#define ISCSI_SCSI_EMU_PHYSICAL_BLOCK_SIZE_BITS 12UL
-
 /// iSCSI SCSI emulation physical block size in bytes.
-#define ISCSI_SCSI_EMU_PHYSICAL_BLOCK_SIZE      (1UL << ISCSI_SCSI_EMU_PHYSICAL_BLOCK_SIZE_BITS)
-
-
-/// iSCSI SCSI emulation logical block size in bits.
-#define ISCSI_SCSI_EMU_BLOCK_SIZE_BITS 9UL
+#define ISCSI_SCSI_EMU_PHYSICAL_BLOCK_SIZE      DNBD3_BLOCK_SIZE
 
 /// iSCSI SCSI emulation logical block size in bytes.
-#define ISCSI_SCSI_EMU_BLOCK_SIZE      (1UL << ISCSI_SCSI_EMU_BLOCK_SIZE_BITS)
+#define ISCSI_SCSI_EMU_BLOCK_SIZE      (512)
+
+/// Block shift difference between dnbd3 (4k) and iSCSI (512b)
+#define ISCSI_SCSI_EMU_BLOCK_DIFF_SHIFT     (3)
 
 /// iSCSI SCSI emulation I/O type: Removable.
 #define ISCSI_SCSI_EMU_IO_TYPE_REMOVABLE          (1 << 0)
@@ -8067,9 +5953,6 @@ typedef struct iscsi_scsi_task {
 /// iSCSI SCSI emulation I/O type: Device is (temporarily) write protected.
 #define ISCSI_SCSI_EMU_IO_TYPE_WRITE_PROTECT      (1 << 4)
 
-/// iSCSI SCSI emulation I/O type: Write cache available.
-#define ISCSI_SCSI_EMU_IO_TYPE_WRITE_CACHE        (1 << 5)
-
 
 /// iSCSI SCSI emulation block flags: Write operation.
 #define ISCSI_SCSI_EMU_BLOCK_FLAGS_WRITE  (1 << 0)
@@ -8086,51 +5969,6 @@ typedef struct iscsi_scsi_task {
 #define ISCSI_TARGET_NODE_MAX_NAME_LEN 223U
 
 
-/// iSCSI target node flags: CHAP authentication disabled.
-#define ISCSI_TARGET_NODE_FLAGS_CHAP_DISABLE  (1 << 0)
-
-/// iSCSI target node flags: CHAP authentication required.
-#define ISCSI_TARGET_NODE_FLAGS_CHAP_REQUIRE  (1 << 1)
-
-/// iSCSI target node flags: CHAP authentication mutual.
-#define ISCSI_TARGET_NODE_FLAGS_CHAP_MUTUAL   (1 << 2)
-
-/// iSCSI target node flags: Destroyed.
-#define ISCSI_TARGET_NODE_FLAGS_DESTROYED     (1 << 3)
-
-
-/// iSCSI session flags: Initial ready to transfer.
-#define ISCSI_SESSION_FLAGS_INIT_R2T          (1 << 0)
-
-/// iSCSI session flags: Data PDU in order.
-#define ISCSI_SESSION_FLAGS_DATA_PDU_IN_ORDER (1 << 2)
-
-/// iSCSI session flags: Data sequence in order.
-#define ISCSI_SESSION_FLAGS_DATA_SEQ_IN_ORDER (1 << 3)
-
-
-/// iSCSI session: Default maximum number of connections.
-#define ISCSI_SESSION_DEFAULT_MAX_CONNECTIONS     2UL
-
-/// iSCSI session: Default maximum number of outstanding ready to transfers.
-#define ISCSI_SESSION_DEFAULT_MAX_OUTSTANDING_R2T 1UL
-
-/// iSCSI session: Default time to wait in seconds.
-#define ISCSI_SESSION_DEFAULT_TIME_TO_WAIT        2UL
-
-/// iSCSI session: Default time to retain in seconds.
-#define ISCSI_SESSION_DEFAULT_TIME_TO_RETAIN      20UL
-
-/// iSCSI session: First burst length in bytes.
-#define ISCSI_SESSION_DEFAULT_FIRST_BURST_LEN     ISCSI_DEFAULT_RECV_DS_LEN
-
-/// iSCSI session: Maximum burst length in bytes.
-#define ISCSI_SESSION_DEFAULT_MAX_BURST_LEN       (ISCSI_DEFAULT_MAX_RECV_DS_LEN * ISCSI_DEFAULT_MAX_DATA_OUT_PER_CONNECTION)
-
-/// iSCSI session: Default error recovery level.
-#define ISCSI_SESSION_DEFAULT_ERR_RECOVERY_LEVEL  0UL
-
-
 /// iSCSI session type: Invalid.
 #define ISCSI_SESSION_TYPE_INVALID   0
 
@@ -8155,9 +5993,31 @@ typedef struct iscsi_login_kvp
 	// Maximum unsolicited burst length client can receive.
 	int FirstBurstLength;
 
-	/// Desired auth method
+	/// Maximum number of connections.
+	int MaxConnections;
+
+	/// Error recovery level.
+	int ErrorRecoveryLevel;
+
+	/// The session type (Discovery, Normal).
+	const char *SessionType;
+
+	/// Desired auth method.
 	const char *AuthMethod;
-} iscsi_login_kvp;
+
+	/// SendTargets command.
+	const char *SendTargets;
+
+	/// HeaderDigest requested by client.
+	const char *HeaderDigest;
+
+	/// DataDigest requested by client.
+	const char *DataDigest;
+
+	const char *InitiatorName;
+
+	const char *TargetName;
+} iscsi_negotiation_kvp;
 
 /**
  * Options/limits the client told us that
@@ -8183,29 +6043,29 @@ typedef struct iscsi_session_options
  * login phase.
  */
 typedef struct iscsi_session {
-    /// Initiator Session ID (ISID).
-    uint64_t isid;
+	/// Initiator Session ID (ISID).
+	uint64_t isid;
 
-    /// Target Session Identifying Handle (TSIH).
-    uint64_t tsih;
+	/// Target Session Identifying Handle (TSIH).
+	uint64_t tsih;
 
-    /// Flags (extracted from key and value pairs).
-    int flags;
+	/// Flags (extracted from key and value pairs).
+	int flags;
 
-    /// iSCSI session type.
-    int type;
+	/// iSCSI session type.
+	int type;
 
-    /// ExpCmdSN.
-    uint32_t exp_cmd_sn;
+	/// ExpCmdSN.
+	uint32_t exp_cmd_sn;
 
-    /// MaxCmdSN.
-    uint32_t max_cmd_sn;
+	/// MaxCmdSN.
+	uint32_t max_cmd_sn;
 
-    /// Current text Initiator Task Tag (ITT).
-    uint32_t current_text_init_task_tag;
+	/// Current text Initiator Task Tag (ITT).
+	uint32_t current_text_init_task_tag;
 
-    /// Session options client sent in login request.
-    iscsi_session_options opts;
+	/// Session options client sent in login request.
+	iscsi_session_options opts;
 } iscsi_session;
 
 
@@ -8298,83 +6158,56 @@ typedef struct iscsi_pdu iscsi_pdu;
  * and iSCSI portals.
  */
 typedef struct iscsi_connection {
-    /// iSCSI session associated with this connection.
-    iscsi_session *session;
-
-    /// Temporarily storage for partially received login parameter.
-    uint8_t *partial_pairs;
-
-    /// Temporarily storage for partially received text parameter.
-    uint8_t *text_partial_pairs;
+	/// iSCSI session associated with this connection.
+	iscsi_session *session;
 
 	/// Associated dnbd3 client
 	dnbd3_client_t *client;
 
-    /// Current PDU being processed.
-    iscsi_pdu *pdu_processing;
-
-    /// Login response PDU.
-    iscsi_pdu *login_response_pdu;
+	/// Current PDU being processed.
+	iscsi_pdu *pdu_processing;
 
-    /// iSCSI SendTargets total number of bytes completed.
-    uint target_send_total_size;
+	/// Login response PDU.
+	iscsi_pdu *login_response_pdu;
 
-    /// iSCSI SCSI Data In count.
-    uint scsi_data_in_cnt;
+	/// Internal connection identifier
+	int id;
 
-    /// iSCSI SCSI Data Out count.
-    uint scsi_data_out_cnt;
+	/// iSCSI connection receiving state.
+	int pdu_recv_state;
 
-    /// iSCSI tasks pending count.
-    uint task_cnt;
+	/// iSCSI connection flags.
+	int flags;
 
-    /// iSCSI connection contains a header digest (CRC32), always MUST be 0 or 4 for now.
-    int header_digest;
+	/// iSCSI connection state.
+	int state;
 
-    /// iSCSI connection contains a data digest (CRC32), always MUST be 0 or 4 for now.
-    int data_digest;
+	/// iSCSI connection login phase.
+	int login_phase;
 
-    /// Internal connection identifier (key of iSCSI global vector hash map).
-    int id;
+	/// Initiator Session ID (ISID).
+	iscsi_isid isid;
 
-    /// iSCSI connection receiving state.
-    int pdu_recv_state;
+	/// Target Session Identifying Handle (TSIH).
+	uint16_t tsih;
 
-    /// iSCSI connection flags.
-    int flags;
+	/// Connection ID (CID).
+	uint16_t cid;
 
-    /// iSCSI connection state.
-    int state;
+	/// Bit mask for connection state key negotiation.
+	uint16_t state_negotiated;
 
-    /// iSCSI connection login phase.
-    int login_phase;
+	/// Bit mask for session state key negotiation.
+	uint32_t session_state_negotiated;
 
-    /// Initiator Session ID (ISID).
-    iscsi_isid isid;
+	/// Initiator Task Tag (ITT).
+	uint32_t init_task_tag;
 
-    /// Target Session Identifying Handle (TSIH).
-    uint16_t tsih;
+	/// Targer Transfer Tag (TTT).
+	uint32_t target_xfer_tag;
 
-    /// Connection ID (CID).
-    uint16_t cid;
-
-    /// Bit mask for connection state key negotiation.
-    uint16_t state_negotiated;
-
-    /// Bit mask for session state key negotiation.
-    uint32_t session_state_negotiated;
-
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
-
-    /// Targer Transfer Tag (TTT).
-    uint32_t target_xfer_tag;
-
-    /// StatSN.
-    uint32_t stat_sn;
-
-    /// ExpStatSN.
-    uint32_t exp_stat_sn;
+	/// StatSN.
+	uint32_t stat_sn;
 } iscsi_connection;
 
 
@@ -8393,62 +6226,38 @@ typedef struct iscsi_task iscsi_task;
  * and filling the BHS, AHS and DS properly.
  */
 typedef struct iscsi_pdu {
-    /// iSCSI Basic Header Segment (BHS) packet data.
-    iscsi_bhs_packet *bhs_pkt;
-
-    /// iSCSI Advanced Header Segment (AHS) packet data for fast access and is straight after BHS packet in memory.
-    iscsi_ahs_packet *ahs_pkt;
-
-    /// Header digest (CRC32C) packet data for fast access and is straight after BHS and AHS packet in memory.
-    iscsi_header_digest *header_digest;
-
-    /// iSCSI DataSegment (DS) packet data for fast access and is straight after BHS, AHS and header digest packet in memory.
-    iscsi_scsi_ds_cmd_data *ds_cmd_data;
+	/// iSCSI Basic Header Segment (BHS) packet data.
+	iscsi_bhs_packet *bhs_pkt;
 
-    /// Data digest (CRC32C) packet data for fast access and is straight after BHS, AHS, header digest and DataSegment packet in memory.
-    iscsi_data_digest *data_digest;
+	/// iSCSI Advanced Header Segment (AHS) packet data for fast access and is straight after BHS packet in memory.
+	iscsi_ahs_packet *ahs_pkt;
 
-    /// iSCSI task handling this PDU.
-    iscsi_task *task;
+	/// iSCSI DataSegment (DS) packet data for fast access and is straight after BHS, AHS and header digest packet in memory.
+	iscsi_scsi_ds_cmd_data *ds_cmd_data;
 
-    /// Flags.
-    int flags;
+	/// iSCSI task handling this PDU.
+	iscsi_task *task;
 
-    /// Bytes of Basic Header Segment (BHS) already read.
-    uint bhs_pos;
+	/// Flags.
+	int flags;
 
-    /// Bytes of Advanced Header Segment (AHS) already read.
-    uint ahs_pos;
+	/// Bytes of Basic Header Segment (BHS) already read.
+	uint bhs_pos;
 
-    /// AHSLength.
-    uint ahs_len;
+	/// AHSLength.
+	uint ahs_len;
 
-    /// Bytes of header digest (CRC32C) already read.
-    uint header_digest_pos;
+	/// DataSegmentLength.
+	uint32_t ds_len;
 
-    /// Header digest size (always 0 or 4 for now).
-    int header_digest_size;
+	/// DS Buffer write pos when filling buffer for sending.
+	uint32_t ds_write_pos;
 
-    /// DataSegmentLength.
-    uint32_t ds_len;
+	/// Read position in AHS + DS buffer (recv).
+	uint32_t recv_pos;
 
-    /// Position of DataSegment buffer for next operation.
-    uint32_t pos;
-
-    /// Allocated DataSegment buffer length.
-    uint32_t len;
-
-    /// Bytes of data digest (CRC32C) already read.
-    uint data_digest_pos;
-
-    /// Data digest size (always 0 or 4 for now).
-    int data_digest_size;
-
-    /// Tasks referenced by this PDU counter.
-    uint task_ref_cnt;
-
-    /// CmdSN.
-    uint32_t cmd_sn;
+	/// CmdSN.
+	uint32_t cmd_sn;
 } iscsi_pdu;
 
 
@@ -8466,52 +6275,43 @@ typedef struct iscsi_pdu {
  * including the underlying SCSI layer.
  */
 typedef struct iscsi_task {
-    /// Underlying SCSI task structure.
-    iscsi_scsi_task scsi_task;
+	/// Underlying SCSI task structure.
+	iscsi_scsi_task scsi_task;
 
-    /// Associated iSCSI connection.
-    iscsi_connection *conn;
+	/// Associated iSCSI connection.
+	iscsi_connection *conn;
 
-    /// Buffer position in bytes.
-    uint32_t pos;
+	/// Buffer position in bytes.
+	uint32_t pos;
 
-    /// Buffer length in bytes.
-    uint32_t len;
+	/// Buffer length in bytes.
+	uint32_t len;
 
-    /// Unique identifier for this task.
-    uint64_t id;
+	/// Unique identifier for this task.
+	uint64_t id;
 
-    /// Flags.
-    int flags;
+	/// Flags.
+	int flags;
 
-    /// LUN identifier associated with this task (always MUST be between 0 and 7), used for hot removal tracking.
-    int lun_id;
+	/// LUN identifier associated with this task (always MUST be between 0 and 7), used for hot removal tracking.
+	int lun_id;
 
-    /// Initiator Task Tag (ITT).
-    uint32_t init_task_tag;
+	/// Initiator Task Tag (ITT).
+	uint32_t init_task_tag;
 
-    /// Target Transfer Tag (TTT).
-    uint32_t target_xfer_tag;
+	/// Target Transfer Tag (TTT).
+	uint32_t target_xfer_tag;
 
-    /// Desired number of bytes completed.
-    uint32_t des_data_xfer_pos;
+	/// Desired number of bytes completed.
+	uint32_t des_data_xfer_pos;
 
-    /// Desired data transfer length.
-    uint32_t des_data_xfer_len;
+	/// Desired data transfer length.
+	uint32_t des_data_xfer_len;
 
-    /// SCSI Data In Data Sequence Number (DataSN).
-    uint32_t data_sn;
-
-    /// SCSI Data Out count.
-    uint32_t scsi_data_out_cnt;
+	/// SCSI Data In Data Sequence Number (DataSN).
+	uint32_t data_sn;
 } iscsi_task;
 
-int iscsi_create(void); // Allocates and initializes the iSCSI global vector structure
-void iscsi_destroy(void); // Deallocates all resources acquired by iscsi_create
 void iscsi_connection_handle(dnbd3_client_t *client, const dnbd3_request_t *request, const int len); // Handles an iSCSI connection until connection is closed
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* DNBD3_ISCSI_H_ */