Minor code refactoring

ISCSI/ISCSI.PDU/ISCSIPDU.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2012-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -64,9 +64,7 @@ namespace ISCSI
                 buffer[1] |= 0x80;
             }
             buffer[4] = TotalAHSLength;
-            buffer[5] = (byte)((DataSegmentLength >> 16) & 0xFF);
-            buffer[6] = (byte)((DataSegmentLength >> 8) & 0xFF);
-            buffer[7] = (byte)((DataSegmentLength >> 0) & 0xFF);
+            BigEndianWriter.WriteUInt24(buffer, 5, DataSegmentLength);
             Array.Copy(LUNOrOpCodeSpecific, 0, buffer, 8, 8);
             BigEndianWriter.WriteUInt32(buffer, 16, InitiatorTaskTag);
             Array.Copy(OpCodeSpecific, 0, buffer, 20, 28);

ISCSI/SCSI/SCSICommandDescriptorBlock/SCSICommandDescriptorBlock6.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2012-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -26,7 +26,7 @@ namespace SCSI
             OpCode = (SCSIOpCodeName)buffer[offset + 0];
             MiscellaneousCDBInformationHeader = (byte)((buffer[offset + 1] & 0xE0) >> 5);
 
-            uint temp = ReadUInt24(buffer, offset + 1);
+            uint temp = BigEndianReader.ReadUInt24(buffer, offset + 1);
             LogicalBlockAddress = temp & 0x1FFFFF;
             TransferLength = buffer[offset + 4];
             Control = buffer[offset + 5];
@@ -44,10 +44,5 @@ namespace SCSI
             buffer[5] = Control;
             return buffer;
         }
-
-        public static uint ReadUInt24(byte[] buffer, int offset)
-        {
-            return (uint)((buffer[offset + 0] << 16) | (buffer[offset + 1] << 8) | (buffer[offset + 2] << 0));
-        }
     }
 }

ISCSI/SCSI/SCSIReturnParameters/ModePages/ModeParameterHeader6.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2012-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -13,6 +13,8 @@ namespace SCSI
 {
     public class ModeParameterHeader6
     {
+        public const int Length = 4;
+
         public byte ModeDataLength; // excluding this byte
         public byte MediumType;
         public bool WP;     // Write Protect, indicates that the medium is write-protected
@@ -35,7 +37,7 @@ namespace SCSI
 
         public byte[] GetBytes()
         {
-            byte[] buffer = new byte[4];
+            byte[] buffer = new byte[Length];
             buffer[0] = ModeDataLength;
             buffer[1] = MediumType;
             if (WP)
@@ -49,13 +51,5 @@ namespace SCSI
             buffer[3] = BlockDescriptorLength;
             return buffer;
         }
-
-        public int Length
-        {
-            get
-            {
-                return 4;
-            }
-        }
     }
 }

ISCSI/SCSI/SCSIReturnParameters/ModePages/ShortLBAModeParameterBlockDescriptor.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2012-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -13,32 +13,30 @@ namespace SCSI
 {
     public class ShortLBAModeParameterBlockDescriptor
     {
-        public uint LogicalBlockLength;
+        public const int Length = 8;
+
+        public uint NumberOfBlocks;
+        public byte Reserved;
+        public uint LogicalBlockLength; // 3 bytes
 
         public ShortLBAModeParameterBlockDescriptor()
         { 
         }
 
         public ShortLBAModeParameterBlockDescriptor(byte[] buffer, int offset)
-        { 
-            byte[] temp = new byte[4];
-            Array.Copy(buffer, offset + 5, temp, 1, 3);
-            LogicalBlockLength = BigEndianConverter.ToUInt32(temp, 0);
+        {
+            NumberOfBlocks = BigEndianConverter.ToUInt32(buffer, offset + 0);
+            Reserved = ByteReader.ReadByte(buffer, offset + 4);
+            LogicalBlockLength = BigEndianReader.ReadUInt24(buffer, offset + 5);
         }
 
         public byte[] GetBytes()
-        { 
-            byte[] buffer = new byte[8];
-            Array.Copy(BigEndianConverter.GetBytes(LogicalBlockLength), 1, buffer, 5, 3);
-            return buffer;
-        }
-
-        public int Length
         {
-            get
-            {
-                return 4;
-            }
+            byte[] buffer = new byte[Length];
+            BigEndianWriter.WriteUInt32(buffer, 0, NumberOfBlocks);
+            ByteWriter.WriteByte(buffer, 4, Reserved);
+            BigEndianWriter.WriteUInt24(buffer, 5, LogicalBlockLength);
+            return buffer;
         }
     }
 }

ISCSI/SCSI/SCSIReturnParameters/VPDPages/IdentificationDescriptor.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2012-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -111,7 +111,7 @@ namespace SCSI
         public static IdentificationDescriptor GetEUI64Identifier(uint oui, uint vendorSpecific)
         {
             byte[] eui64 = new byte[8];
-            WriteUInt24(eui64, 0, oui);
+            BigEndianWriter.WriteUInt24(eui64, 0, oui);
             // we leave byte 3 zeroed-out
             BigEndianWriter.WriteUInt32(eui64, 4, vendorSpecific);
             return new IdentificationDescriptor(IdentifierTypeName.EUI64, eui64);
@@ -122,8 +122,8 @@ namespace SCSI
         {
             byte[] identifier = new byte[8];
             identifier[0] = 0x02 << 4;
-            WriteUInt24(identifier, 2, oui);
-            WriteUInt24(identifier, 5, vendorSpecific);
+            BigEndianWriter.WriteUInt24(identifier, 2, oui);
+            BigEndianWriter.WriteUInt24(identifier, 5, vendorSpecific);
             return new IdentificationDescriptor(IdentifierTypeName.NAA, identifier);
         }
 
@@ -134,11 +134,5 @@ namespace SCSI
             result.ProtocolIdentifier = ProtocolName.ISCSI;
             return result;
         }
-
-        public static void WriteUInt24(byte[] buffer, int offset, uint value)
-        {
-            byte[] bytes = BigEndianConverter.GetBytes(value);
-            Array.Copy(bytes, 1, buffer, offset, 3);
-        }
     }
 }

ISCSI/SCSITarget/VirtualSCSITarget.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2012-2017 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
  * 
  * You can redistribute this program and/or modify it under the terms of
  * the GNU Lesser Public License as published by the Free Software Foundation,
@@ -307,9 +307,9 @@ namespace SCSI
             header.ModeDataLength += (byte)(descriptorBytes.Length + pageData.Length);
 
             response = new byte[1 + header.ModeDataLength];
-            Array.Copy(header.GetBytes(), 0, response, 0, header.Length);
-            Array.Copy(descriptorBytes, 0, response, header.Length, descriptorBytes.Length);
-            Array.Copy(pageData, 0, response, header.Length + descriptorBytes.Length, pageData.Length);
+            Array.Copy(header.GetBytes(), 0, response, 0, ModeParameterHeader6.Length);
+            Array.Copy(descriptorBytes, 0, response, ModeParameterHeader6.Length, descriptorBytes.Length);
+            Array.Copy(pageData, 0, response, ModeParameterHeader6.Length + descriptorBytes.Length, pageData.Length);
 
             // we must not return more bytes than ModeSense6Command.AllocationLength
             if (response.Length > command.AllocationLength)