Corrected handling of unsolicited Data Out PDU when InitialR2T=No

ISCSI/ISCSI.Server/ConnectionParameters.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2012-2018 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,
@@ -39,6 +39,7 @@ namespace ISCSI.Server
 
         public uint StatSN = 0; // Initial StatSN, any number will do
         private Dictionary<uint, string> m_textSequences = new Dictionary<uint, string>();
+        private Dictionary<uint, uint> m_taskTagToTransferTag = new Dictionary<uint, uint>();
         // Dictionary of current transfers: <transfer-tag, TransferEntry>
         private Dictionary<uint, TransferEntry> m_transfers = new Dictionary<uint, TransferEntry>();
 
@@ -64,13 +65,24 @@ namespace ISCSI.Server
             m_textSequences.Remove(initiatorTaskTag);
         }
 
-        public TransferEntry AddTransfer(uint transferTag, SCSICommandPDU command, uint nextR2TSN, uint nextOffset, uint totalR2Ts)
+        public TransferEntry AddTransfer(uint initiatorTaskTag, uint transferTag, SCSICommandPDU command, uint nextR2TSN, uint nextOffset, uint totalR2Ts)
         {
+            m_taskTagToTransferTag.Add(initiatorTaskTag, transferTag);
             TransferEntry entry = new TransferEntry(command, nextR2TSN, nextOffset, totalR2Ts);
             m_transfers.Add(transferTag, entry);
             return entry;
         }
 
+        public TransferEntry GetTransferEntryUsingTaskTag(uint initiatorTaskTag)
+        {
+            uint transferTag;
+            if (m_taskTagToTransferTag.TryGetValue(initiatorTaskTag, out transferTag))
+            {
+                return GetTransferEntry(transferTag);
+            }
+            return null;
+        }
+
         public TransferEntry GetTransferEntry(uint transferTag)
         {
             TransferEntry result;
@@ -78,8 +90,9 @@ namespace ISCSI.Server
             return result;
         }
 
-        public void RemoveTransfer(uint transferTag)
+        public void RemoveTransfer(uint initiatorTaskTag, uint transferTag)
         {
+            m_taskTagToTransferTag.Remove(initiatorTaskTag);
             m_transfers.Remove(transferTag);
         }
 

ISCSI/ISCSI.Server/TargetResponseHelper.cs

@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2016 Tal Aloni <tal.aloni.il@gmail.com>. All rights reserved.
+/* Copyright (C) 2012-2018 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,
@@ -55,7 +55,7 @@ namespace ISCSI.Server
                     responseList.Add(response);
                     nextOffset += (uint)connection.TargetMaxRecvDataSegmentLength;
                 }
-                connection.AddTransfer(transferTag, command, (uint)outgoingR2Ts, nextOffset, (uint)totalR2Ts);
+                connection.AddTransfer(command.InitiatorTaskTag, transferTag, command, (uint)outgoingR2Ts, nextOffset, (uint)totalR2Ts);
                 session.CommandsInTransfer.Add(command.CmdSN);
                 return responseList;
             }
@@ -77,7 +77,16 @@ namespace ISCSI.Server
             commandsToExecute = new List<SCSICommandPDU>();
 
             ISCSISession session = connection.Session;
-            TransferEntry transfer = connection.GetTransferEntry(request.TargetTransferTag);
+            TransferEntry transfer = null;
+            if (request.TargetTransferTag != 0xFFFFFFFF) // 0xFFFFFFFF means Target Transfer Tag is not supplied
+            {
+                transfer = connection.GetTransferEntry(request.TargetTransferTag);
+            }
+            else if (!session.InitialR2T)
+            {
+                transfer = connection.GetTransferEntryUsingTaskTag(request.InitiatorTaskTag);
+            }
+
             if (transfer == null)
             {
                 throw new InvalidTargetTransferTagException(request.TargetTransferTag);
@@ -92,7 +101,7 @@ namespace ISCSI.Server
             if (offset + request.DataSegmentLength == totalLength)
             {
                 // Last Data-out PDU
-                connection.RemoveTransfer(request.TargetTransferTag);
+                connection.RemoveTransfer(request.InitiatorTaskTag, request.TargetTransferTag);
                 session.CommandsInTransfer.Remove(transfer.Command.CmdSN);
                 if (session.IsPrecedingCommandPending(transfer.Command.CmdSN))
                 {