admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

test_compareandwrite_invalid_dataout_size: Simplify this test

Browse Source 
Assign the NUMBER OF LOGICAL BLOCKS field in the COMPARE AND WRITE PDU
directly. Use the terminology from SBC-4, namely NUMBER OF LOGICAL BLOCKS
instead of TL.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
This commit is contained in:
Bart Van Assche
2020-05-15 09:09:19 -07:00
parent 9fcdce3101
commit b4d59cd29c
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test-tool/test_compareandwrite_invalid_dataout_size.c
View File

@@ -26,24 +26,14 @@
#include "iscsi-test-cu.h" #include "iscsi-test-cu.h"
static int new_tl; static int new_nlb = -1;
static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu) static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
{ {
if (pdu->outdata.data[0] != ISCSI_PDU_SCSI_REQUEST) { if (pdu->outdata.data[0] != ISCSI_PDU_SCSI_REQUEST && new_nlb >= 0) {
goto out; /* change NUMBER OF LOGICAL BLOCKS to new_nlb */
pdu->outdata.data[32 + 13] = new_nlb;
} }
switch (new_tl) {
case 1:
/* change TL to 1 */
pdu->outdata.data[32 + 13] = 1;
break;
case 2:
/* change TL to 3 */
pdu->outdata.data[32 + 13] = 3;
break;
}
out:
return orig_queue_pdu(iscsi, pdu); return orig_queue_pdu(iscsi, pdu);
} }
@@ -67,9 +57,9 @@ test_compareandwrite_invalid_dataout_size(void)
logging(LOG_VERBOSE, "Check too small DataOut"); logging(LOG_VERBOSE, "Check too small DataOut");
logging(LOG_VERBOSE, "COMPAREANDWRITE with DataOut==%zd (4 blocks) " logging(LOG_VERBOSE, "COMPAREANDWRITE with DataOut==%zd (4 blocks) "
"and TL == 1 ", 4 * block_size); "and NUMBER OF LOGICAL BLOCKS == 1 ", 4 * block_size);
new_tl = 1; new_nlb = 1;
COMPAREANDWRITE(sd, 0, COMPAREANDWRITE(sd, 0,
scratch, 4 * block_size, scratch, 4 * block_size,
block_size, 0, 0, 0, 0, block_size, 0, 0, 0, 0,
@@ -77,9 +67,9 @@ test_compareandwrite_invalid_dataout_size(void)
logging(LOG_VERBOSE, "Check too large DataOut"); logging(LOG_VERBOSE, "Check too large DataOut");
logging(LOG_VERBOSE, "COMPAREANDWRITE with DataOut==%zd (4 blocks) " logging(LOG_VERBOSE, "COMPAREANDWRITE with DataOut==%zd (4 blocks) "
"and TL == 3 ", 4 * block_size); "and NUMBER OF LOGICAL BLOCKS == 3 ", 4 * block_size);
new_tl = 2; new_nlb = 3;
COMPAREANDWRITE(sd, 0, COMPAREANDWRITE(sd, 0,
scratch, 4 * block_size, scratch, 4 * block_size,
block_size, 0, 0, 0, 0, block_size, 0, 0, 0, 0,