Changeset 21839 in vbox

Timestamp:

Jul 28, 2009 1:27:38 PM (15 years ago)

Author:

vboxsync

Message:

Storage/iSCSI: fix parameter negotiation inconsistency

File:

• trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/Storage/ISCSIHDDCore.cpp

@@ -108 +108 @@
 
 
+/** Maximum PDU payload size we can handle in one piece. */
+#define ISCSI_PDU_SIZE_MAX _256K
+
 /** Maximum PDU size we can handle in one piece. */
-#define ISCSI_RECV_PDU_BUFFER_SIZE (65536 + ISCSI_BHS_SIZE)
+#define ISCSI_RECV_PDU_BUFFER_SIZE (ISCSI_PDU_SIZE_MAX + ISCSI_BHS_SIZE)
 
 
@@ -888 +891 @@
                 break;
             case 0x0100:    /* login operational negotiation, step 0: set parameters. */
+                char szMaxPDU[16];
+                RTStrPrintf(szMaxPDU, sizeof(szMaxPDU), "%u", ISCSI_PDU_SIZE_MAX);
                 rc = iscsiTextAddKeyValue(bBuf, sizeof(bBuf), &cbBuf, "HeaderDigest", "None", 0);
                 if (RT_FAILURE(rc))
@@ -903 +908 @@
                 if (RT_FAILURE(rc))
                     goto out;
-                rc = iscsiTextAddKeyValue(bBuf, sizeof(bBuf), &cbBuf, "MaxRecvDataSegmentLength", "65536", 0);
+                rc = iscsiTextAddKeyValue(bBuf, sizeof(bBuf), &cbBuf, "MaxRecvDataSegmentLength", szMaxPDU, 0);
                 if (RT_FAILURE(rc))
                     goto out;
-                rc = iscsiTextAddKeyValue(bBuf, sizeof(bBuf), &cbBuf, "MaxBurstLength", "262144", 0);
+                rc = iscsiTextAddKeyValue(bBuf, sizeof(bBuf), &cbBuf, "MaxBurstLength", szMaxPDU, 0);
                 if (RT_FAILURE(rc))
                     goto out;
-                rc = iscsiTextAddKeyValue(bBuf, sizeof(bBuf), &cbBuf, "FirstBurstLength", "65536", 0);
+                rc = iscsiTextAddKeyValue(bBuf, sizeof(bBuf), &cbBuf, "FirstBurstLength", szMaxPDU, 0);
                 if (RT_FAILURE(rc))
                     goto out;
@@ -2761 +2766 @@
      * Clip read size to a value which is supported by many targets.
      */
-    cbToRead = RT_MIN(cbToRead, _256K);
+    cbToRead = RT_MIN(cbToRead, ISCSI_PDU_SIZE_MAX);
 
     lba = uOffset / pImage->cbSector;
@@ -2835 +2840 @@
      * Clip write size to a value which is supported by many targets.
      */
-    cbToWrite = RT_MIN(cbToWrite, _256K);
+    cbToWrite = RT_MIN(cbToWrite, ISCSI_PDU_SIZE_MAX);
 
     lba = uOffset / pImage->cbSector;