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

test-tool/iSCSICmdSnTooLow: override driver queue_pdu() callback

Browse Source 
In preparation for removing the test-tool iscsi_queue_pdu() dlsym
overload hack, convert this 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 310e9ace02
commit c067eef9c1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test-tool/test_iscsi_cmdsn_toolow.c
View File

@@ -25,6 +25,7 @@
#include "iscsi-test-cu.h" #include "iscsi-test-cu.h"
static int change_cmdsn; static int change_cmdsn;
static struct iscsi_transport iscsi_drv_orig;
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)
{ {
@@ -40,7 +41,7 @@ static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu
} }
change_cmdsn = 0; change_cmdsn = 0;
return 0; return iscsi_drv_orig.queue_pdu(iscsi, pdu);
} }
void test_iscsi_cmdsn_toolow(void) void test_iscsi_cmdsn_toolow(void)
@@ -64,7 +65,9 @@ void test_iscsi_cmdsn_toolow(void)
sd->iscsi_ctx->use_immediate_data = ISCSI_IMMEDIATE_DATA_NO; sd->iscsi_ctx->use_immediate_data = ISCSI_IMMEDIATE_DATA_NO;
sd->iscsi_ctx->target_max_recv_data_segment_length = block_size; sd->iscsi_ctx->target_max_recv_data_segment_length = block_size;
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;
change_cmdsn = 1; change_cmdsn = 1;
/* we don't want autoreconnect since some targets will incorrectly /* we don't want autoreconnect since some targets will incorrectly
* drop the connection on this condition. * drop the connection on this condition.
@@ -81,10 +84,11 @@ void test_iscsi_cmdsn_toolow(void)
logging(LOG_VERBOSE, "[FAILURE] We got a response from the target but SMDSN was outside of the window."); logging(LOG_VERBOSE, "[FAILURE] We got a response from the target but SMDSN was outside of the window.");
} }
iscsi_set_noautoreconnect(sd->iscsi_ctx, 0); iscsi_set_noautoreconnect(sd->iscsi_ctx, 0);
logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again"); logging(LOG_VERBOSE, "Send a TESTUNITREADY with CMDSN == EXPCMDSN. should work again");
TESTUNITREADY(sd, TESTUNITREADY(sd,
EXPECT_STATUS_GOOD); EXPECT_STATUS_GOOD);
/* restore transport callbacks */
*(sd->iscsi_ctx->drv) = iscsi_drv_orig;
} }