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

test-tool/Compare&Write: override driver queue_pdu() callback

Browse Source 
In preparation for removing the test-tool iscsi_queue_pdu() dlsym
overload hack, convert the Compare&Write InvalidDataOutSize test to use
the regular transport driver callback for this purpose.

Signed-off-by: David Disseldorp <ddiss@suse.de>
This commit is contained in:
David Disseldorp
2019-09-16 14:46:28 +02:00
parent 60a5856f00
commit 310e9ace02
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-tool/test_compareandwrite_invalid_dataout_size.c
+11 -5
View File
@@ -27,11 +27,12 @@
static int new_tl; static int new_tl;
static struct iscsi_transport iscsi_drv_orig;
static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu _U_) 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) {
return 0; goto out;
} }
switch (new_tl) { switch (new_tl) {
case 1: case 1:
@@ -43,7 +44,8 @@ static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu
pdu->outdata.data[32 + 13] = 3; pdu->outdata.data[32 + 13] = 3;
break; break;
} }
return 0; out:
return iscsi_drv_orig.queue_pdu(iscsi, pdu);
} }
void void
@@ -61,8 +63,10 @@ test_compareandwrite_invalid_dataout_size(void)
return; return;
} }
local_iscsi_queue_pdu = my_iscsi_queue_pdu; /* override transport queue_pdu callback for PDU manipulation */
iscsi_drv_orig = *sd->iscsi_ctx->drv;
sd->iscsi_ctx->drv->queue_pdu = my_iscsi_queue_pdu;
logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, LOG_BLANK_LINE);
logging(LOG_VERBOSE, "Test that COMPAREANDWRITE fails for invalid " logging(LOG_VERBOSE, "Test that COMPAREANDWRITE fails for invalid "
"(too small/too large) DataOut sizes."); "(too small/too large) DataOut sizes.");
@@ -89,4 +93,6 @@ test_compareandwrite_invalid_dataout_size(void)
block_size, 0, 0, 0, 0, block_size, 0, 0, 0, 0,
EXPECT_STATUS_GENERIC_BAD); EXPECT_STATUS_GENERIC_BAD);
/* restore transport callbacks */
*(sd->iscsi_ctx->drv) = iscsi_drv_orig;
} }