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

TESTS: remove compiler warnings

Browse Source
This commit is contained in:
Ronnie Sahlberg
2012-08-31 15:26:23 -07:00
parent 09573068ad
commit c526b9e954
29 changed files with 18 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test-tool/0120_read6_simple.c
View File

@@ -26,7 +26,7 @@ int T0120_read6_simple(const char *initiator, const char *url, int data_loss _U_
struct scsi_task *task;
struct scsi_readcapacity10 *rc10;
int ret, i, lun;
uint32_t block_size, num_blocks;
uint32_t block_size;
printf("0120_read6_simple:\n");
printf("===================\n");
@@ -64,7 +64,6 @@ int T0120_read6_simple(const char *initiator, const char *url, int data_loss _U_
goto finished;
}
block_size = rc10->block_size;
num_blocks = rc10->lba;
scsi_free_scsi_task(task);

3
test-tool/0170_unmap_simple.c
View File

@@ -26,7 +26,7 @@ int T0170_unmap_simple(const char *initiator, const char *url, int data_loss, in
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
uint32_t block_size, num_blocks;
uint32_t num_blocks;
printf("0170_unmap_simple:\n");
printf("==================\n");
@@ -72,7 +72,6 @@ int T0170_unmap_simple(const char *initiator, const char *url, int data_loss, in
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);

3
test-tool/0171_unmap_zero.c
View File

@@ -26,7 +26,7 @@ int T0171_unmap_zero(const char *initiator, const char *url, int data_loss, int
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
uint32_t block_size, num_blocks;
uint32_t num_blocks;
printf("0171_unmap_zero:\n");
printf("================\n");
@@ -74,7 +74,6 @@ int T0171_unmap_zero(const char *initiator, const char *url, int data_loss, int
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);

16
test-tool/0180_writesame10_unmap.c
View File

@@ -28,7 +28,7 @@ int T0180_writesame10_unmap(const char *initiator, const char *url, int data_los
int full_size;
struct scsi_inquiry_logical_block_provisioning *inq_lbp;
int ret, i, lun;
uint32_t block_size, num_blocks;
uint32_t num_blocks;
int lbppb;
int lbpme;
int lbpws10 = 0;
@@ -73,24 +73,14 @@ int T0180_writesame10_unmap(const char *initiator, const char *url, int data_los
scsi_free_scsi_task(task);
goto finished;
}
if (rc16->lbpme == 0){
printf("Logical unit is fully provisioned. All commands should fail with check condition.\n");
scsi_free_scsi_task(task);
goto test2;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
lbppb = 1 << rc16->lbppbe;
lbpme = rc16->lbpme;
scsi_free_scsi_task(task);
if (lbpme == 0) {
printf("LBPME not set. Skip test for CPD page 0xB2 (logical block provisioning)\n");
if (lbpme == 0){
printf("Logical unit is fully provisioned. All commands should fail with check condition.\n");
goto test2;
}

3
test-tool/0181_writesame10_unmap_unaligned.c
View File

@@ -26,7 +26,6 @@ int T0181_writesame10_unmap_unaligned(const char *initiator, const char *url, in
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
uint32_t block_size, num_blocks;
int lbppb;
printf("0181_writesame10_unmap_unaligned:\n");
@@ -72,8 +71,6 @@ int T0181_writesame10_unmap_unaligned(const char *initiator, const char *url, in
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
lbppb = 1 << rc16->lbppbe;
scsi_free_scsi_task(task);

2
test-tool/0183_writesame10_wrprotect.c
View File

@@ -27,7 +27,6 @@ int T0183_writesame10_wrprotect(const char *initiator, const char *url, int data
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
uint32_t block_size;
uint64_t num_blocks;
unsigned char buf[512];
printf("0183_writesame10_wrptotect:\n");
@@ -66,7 +65,6 @@ int T0183_writesame10_wrprotect(const char *initiator, const char *url, int data
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
if (!data_loss) {

11
test-tool/0190_writesame16_unmap.c
View File

@@ -28,7 +28,7 @@ int T0190_writesame16_unmap(const char *initiator, const char *url, int data_los
int full_size;
struct scsi_inquiry_logical_block_provisioning *inq_lbp;
int ret, i, lun;
uint32_t block_size, num_blocks;
uint32_t num_blocks;
int lbppb;
int lbpme;
int lbpws = 0;
@@ -74,21 +74,12 @@ int T0190_writesame16_unmap(const char *initiator, const char *url, int data_los
goto finished;
}
if (rc16->lbpme == 0){
printf("Logical unit is fully provisioned. All commands should fail with check condition.\n");
scsi_free_scsi_task(task);
goto test2;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
lbppb = 1 << rc16->lbppbe;
lbpme = rc16->lbpme;
scsi_free_scsi_task(task);
if (lbpme == 0) {
printf("LBPME not set. Skip test for CPD page 0xB2 (logical block provisioning)\n");
goto test2;

3
test-tool/0191_writesame16_unmap_unaligned.c
View File

@@ -26,7 +26,6 @@ int T0191_writesame16_unmap_unaligned(const char *initiator, const char *url, in
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
uint32_t block_size, num_blocks;
int lbppb;
printf("0191_writesame16_unmap_unaligned:\n");
@@ -72,8 +71,6 @@ int T0191_writesame16_unmap_unaligned(const char *initiator, const char *url, in
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
lbppb = 1 << rc16->lbppbe;
scsi_free_scsi_task(task);

2
test-tool/0193_writesame16_wrprotect.c
View File

@@ -27,7 +27,6 @@ int T0193_writesame16_wrprotect(const char *initiator, const char *url, int data
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
uint32_t block_size;
uint64_t num_blocks;
unsigned char buf[512];
printf("0193_writesame16_wrptotect:\n");
@@ -66,7 +65,6 @@ int T0193_writesame16_wrprotect(const char *initiator, const char *url, int data
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
if (!data_loss) {

2
test-tool/0240_prefetch10_simple.c
View File

@@ -26,7 +26,6 @@ int T0240_prefetch10_simple(const char *initiator, const char *url, int data_los
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
uint32_t block_size;
uint64_t num_blocks;
printf("0240_prefetch10_simple:\n");
@@ -65,7 +64,6 @@ int T0240_prefetch10_simple(const char *initiator, const char *url, int data_los
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);

2
test-tool/0250_prefetch16_simple.c
View File

@@ -26,7 +26,6 @@ int T0250_prefetch16_simple(const char *initiator, const char *url, int data_los
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
uint32_t block_size;
uint64_t num_blocks;
printf("0250_prefetch16_simple:\n");
@@ -65,7 +64,6 @@ int T0250_prefetch16_simple(const char *initiator, const char *url, int data_los
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);

2
test-tool/0260_get_lba_status_simple.c
View File

@@ -26,7 +26,6 @@ int T0260_get_lba_status_simple(const char *initiator, const char *url, int data
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, lun;
uint32_t block_size;
uint64_t num_blocks;
printf("0260_get_lba_status_simple:\n");
@@ -73,7 +72,6 @@ int T0260_get_lba_status_simple(const char *initiator, const char *url, int data
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);

2
test-tool/0264_get_lba_status_beyondeol.c
View File

@@ -26,7 +26,6 @@ int T0264_get_lba_status_beyondeol(const char *initiator, const char *url, int d
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, lun;
uint32_t block_size;
uint64_t num_blocks;
printf("0264_get_lba_status_beyondeol:\n");
@@ -72,7 +71,6 @@ int T0264_get_lba_status_beyondeol(const char *initiator, const char *url, int d
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);

2
test-tool/0300_readonly.c
View File

@@ -29,7 +29,6 @@ int T0300_readonly(const char *initiator, const char *url, int data_loss, int sh
struct scsi_mode_sense *ms;
int ret, lun;
uint32_t block_size;
uint32_t num_blocks;
unsigned char data[258 * 512];
int full_size;
int lbpme;
@@ -82,7 +81,6 @@ int T0300_readonly(const char *initiator, const char *url, int data_loss, int sh
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
lbpme = rc16->lbpme;
scsi_free_scsi_task(task);

27
test-tool/0360_startstopunit_simple.c
View File

@@ -25,11 +25,8 @@ int T0360_startstopunit_simple(const char *initiator, const char *url, int data_
{
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
struct scsi_inquiry_standard *inq;
int ret, lun, removable;
uint32_t block_size;
uint64_t num_blocks;
int full_size;
printf("0360_startstopunit_simple:\n");
@@ -48,30 +45,6 @@ int T0360_startstopunit_simple(const char *initiator, const char *url, int data_
return -1;
}
/* find the size of the LUN */
task = iscsi_readcapacity16_sync(iscsi, lun);
if (task == NULL) {
printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
rc16 = scsi_datain_unmarshall(task);
if (rc16 == NULL) {
printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
/* See how big this inquiry data is */
task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64);
if (task == NULL || task->status != SCSI_STATUS_GOOD) {

27
test-tool/0361_startstopunit_pwrcnd.c
View File

@@ -25,11 +25,8 @@ int T0361_startstopunit_pwrcnd(const char *initiator, const char *url, int data_
{
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
struct scsi_inquiry_standard *inq;
int ret, i, lun, removable;
uint32_t block_size;
uint64_t num_blocks;
int full_size;
printf("0361_startstopunit_pwrcnd:\n");
@@ -48,30 +45,6 @@ int T0361_startstopunit_pwrcnd(const char *initiator, const char *url, int data_
return -1;
}
/* find the size of the LUN */
task = iscsi_readcapacity16_sync(iscsi, lun);
if (task == NULL) {
printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
rc16 = scsi_datain_unmarshall(task);
if (rc16 == NULL) {
printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
/* See how big this inquiry data is */
task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64);
if (task == NULL || task->status != SCSI_STATUS_GOOD) {

2
test-tool/0370_nomedia.c
View File

@@ -29,7 +29,6 @@ int T0370_nomedia(const char *initiator, const char *url, int data_loss, int sho
struct scsi_inquiry_standard *inq;
int ret, lun, removable;
uint32_t block_size;
uint64_t num_blocks;
int full_size;
unsigned char buf[2048];
@@ -97,7 +96,6 @@ int T0370_nomedia(const char *initiator, const char *url, int data_loss, int sho
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
/* See how big this inquiry data is */

27
test-tool/0380_preventallow_simple.c
View File

@@ -25,11 +25,8 @@ int T0380_preventallow_simple(const char *initiator, const char *url, int data_l
{
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
struct scsi_inquiry_standard *inq;
int ret, lun, removable;
uint32_t block_size;
uint64_t num_blocks;
int full_size;
printf("0380_preventallow_simple:\n");
@@ -48,30 +45,6 @@ int T0380_preventallow_simple(const char *initiator, const char *url, int data_l
return -1;
}
/* find the size of the LUN */
task = iscsi_readcapacity16_sync(iscsi, lun);
if (task == NULL) {
printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
rc16 = scsi_datain_unmarshall(task);
if (rc16 == NULL) {
printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
/* See how big this inquiry data is */
task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64);
if (task == NULL || task->status != SCSI_STATUS_GOOD) {

27
test-tool/0381_preventallow_eject.c
View File

@@ -25,11 +25,8 @@ int T0381_preventallow_eject(const char *initiator, const char *url, int data_lo
{
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
struct scsi_inquiry_standard *inq;
int ret, lun, removable;
uint32_t block_size;
uint64_t num_blocks;
int full_size;
printf("0381_preventallow_eject:\n");
@@ -50,30 +47,6 @@ int T0381_preventallow_eject(const char *initiator, const char *url, int data_lo
return -1;
}
/* find the size of the LUN */
task = iscsi_readcapacity16_sync(iscsi, lun);
if (task == NULL) {
printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
rc16 = scsi_datain_unmarshall(task);
if (rc16 == NULL) {
printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
/* See how big this inquiry data is */
task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64);
if (task == NULL || task->status != SCSI_STATUS_GOOD) {

27
test-tool/0382_preventallow_itnexus_loss.c
View File

@@ -25,11 +25,8 @@ int T0382_preventallow_itnexus_loss(const char *initiator, const char *url, int
{
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
struct scsi_inquiry_standard *inq;
int ret, lun, removable;
uint32_t block_size;
uint64_t num_blocks;
int full_size;
printf("0382_preventallow_itnexus_loss:\n");
@@ -52,30 +49,6 @@ int T0382_preventallow_itnexus_loss(const char *initiator, const char *url, int
return -1;
}
/* find the size of the LUN */
task = iscsi_readcapacity16_sync(iscsi, lun);
if (task == NULL) {
printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
rc16 = scsi_datain_unmarshall(task);
if (rc16 == NULL) {
printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
/* See how big this inquiry data is */
task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64);
if (task == NULL || task->status != SCSI_STATUS_GOOD) {

27
test-tool/0383_preventallow_target_warm_reset.c
View File

@@ -41,11 +41,8 @@ int T0383_preventallow_target_warm_reset(const char *initiator, const char *url,
{
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
struct scsi_inquiry_standard *inq;
int ret, lun, removable;
uint32_t block_size;
uint64_t num_blocks;
int full_size;
struct mgmt_task mgmt_task = {0, 0};
struct pollfd pfd;
@@ -70,30 +67,6 @@ int T0383_preventallow_target_warm_reset(const char *initiator, const char *url,
return -1;
}
/* find the size of the LUN */
task = iscsi_readcapacity16_sync(iscsi, lun);
if (task == NULL) {
printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
rc16 = scsi_datain_unmarshall(task);
if (rc16 == NULL) {
printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
/* See how big this inquiry data is */
task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64);
if (task == NULL || task->status != SCSI_STATUS_GOOD) {

27
test-tool/0384_preventallow_target_cold_reset.c
View File

@@ -41,11 +41,8 @@ int T0384_preventallow_target_cold_reset(const char *initiator, const char *url,
{
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
struct scsi_inquiry_standard *inq;
int ret, lun, removable;
uint32_t block_size;
uint64_t num_blocks;
int full_size;
struct mgmt_task mgmt_task = {0, 0};
struct pollfd pfd;
@@ -70,30 +67,6 @@ int T0384_preventallow_target_cold_reset(const char *initiator, const char *url,
return -1;
}
/* find the size of the LUN */
task = iscsi_readcapacity16_sync(iscsi, lun);
if (task == NULL) {
printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
rc16 = scsi_datain_unmarshall(task);
if (rc16 == NULL) {
printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
/* See how big this inquiry data is */
task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64);
if (task == NULL || task->status != SCSI_STATUS_GOOD) {

27
test-tool/0385_preventallow_lun_reset.c
View File

@@ -41,11 +41,8 @@ int T0385_preventallow_lun_reset(const char *initiator, const char *url, int dat
{
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
struct scsi_inquiry_standard *inq;
int ret, lun, removable;
uint32_t block_size;
uint64_t num_blocks;
int full_size;
struct mgmt_task mgmt_task = {0, 0};
struct pollfd pfd;
@@ -70,30 +67,6 @@ int T0385_preventallow_lun_reset(const char *initiator, const char *url, int dat
return -1;
}
/* find the size of the LUN */
task = iscsi_readcapacity16_sync(iscsi, lun);
if (task == NULL) {
printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
rc16 = scsi_datain_unmarshall(task);
if (rc16 == NULL) {
printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
/* See how big this inquiry data is */
task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64);
if (task == NULL || task->status != SCSI_STATUS_GOOD) {

27
test-tool/0386_preventallow_2_it_nexuses.c
View File

@@ -26,11 +26,8 @@ int T0386_preventallow_2_itl_nexuses(const char *initiator, const char *url, int
struct iscsi_context *iscsi;
struct iscsi_context *iscsi2 = NULL;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
struct scsi_inquiry_standard *inq;
int ret, lun, removable;
uint32_t block_size;
uint64_t num_blocks;
int full_size;
printf("0386_preventallow_2_itl_nexuses:\n");
@@ -53,30 +50,6 @@ int T0386_preventallow_2_itl_nexuses(const char *initiator, const char *url, int
return -1;
}
/* find the size of the LUN */
task = iscsi_readcapacity16_sync(iscsi, lun);
if (task == NULL) {
printf("Failed to send READCAPACITY16 command: %s\n", iscsi_get_error(iscsi));
ret = -1;
goto finished;
}
if (task->status != SCSI_STATUS_GOOD) {
printf("READCAPACITY16 command: failed with sense. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
rc16 = scsi_datain_unmarshall(task);
if (rc16 == NULL) {
printf("failed to unmarshall READCAPACITY16 data. %s\n", iscsi_get_error(iscsi));
ret = -1;
scsi_free_scsi_task(task);
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
/* See how big this inquiry data is */
task = iscsi_inquiry_sync(iscsi, lun, 0, 0, 64);
if (task == NULL || task->status != SCSI_STATUS_GOOD) {

2
test-tool/0390_mandatory_opcodes_sbc.c
View File

@@ -30,7 +30,6 @@ int T0390_mandatory_opcodes_sbc(const char *initiator, const char *url, int data
int ret = 0, lun, sccs, encserv, lbpme;
unsigned char data[2048];
uint32_t block_size;
uint64_t num_blocks;
int full_size;
printf("0390_mandatory_opcodes_sbc:\n");
@@ -88,7 +87,6 @@ int T0390_mandatory_opcodes_sbc(const char *initiator, const char *url, int data
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
lbpme = rc16->lbpme;
scsi_free_scsi_task(task);

5
test-tool/1000_cmdsn_invalid.c
View File

@@ -38,6 +38,7 @@ static int my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu
}
change_cmdsn = 0;
return 0;
}
static void test_cb(struct iscsi_context *iscsi _U_, int status,
@@ -60,9 +61,8 @@ int T1000_cmdsn_invalid(const char *initiator, const char *url, int data_loss, i
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
int ret, lun;
uint32_t block_size;
uint32_t num_blocks;
unsigned char data[512 * 256];
struct iscsi_async_state test_state;
@@ -104,7 +104,6 @@ int T1000_cmdsn_invalid(const char *initiator, const char *url, int data_loss, i
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);

9
test-tool/1010_datasn_invalid.c
View File

@@ -24,10 +24,10 @@
static int clamp_datasn;
static void my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu)
{
if (pdu->outdata.data[0] != ISCSI_PDU_DATA_OUT) {
return;
return 0;
}
switch (clamp_datasn) {
case 1:
@@ -47,6 +47,7 @@ static void my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pd
*(uint32_t *)&pdu->outdata.data[36] = htonl(1 - ntohl(*(uint32_t *)&pdu->outdata.data[36]));
break;
}
return 0;
}
static void test_cb(struct iscsi_context *iscsi _U_, int status,
@@ -69,9 +70,8 @@ int T1010_datasn_invalid(const char *initiator, const char *url, int data_loss,
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
int ret, lun;
uint32_t block_size;
uint32_t num_blocks;
unsigned char data[512 * 256];
struct iscsi_async_state test_state;
@@ -114,7 +114,6 @@ int T1010_datasn_invalid(const char *initiator, const char *url, int data_loss,
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);

56
test-tool/1020_bufferoffset_invalid.c
View File

@@ -24,10 +24,10 @@
static int change_bufferoffset;
static void my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
static int my_iscsi_queue_pdu(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu)
{
if (pdu->outdata.data[0] != ISCSI_PDU_DATA_OUT) {
return;
return 0;
}
switch (change_bufferoffset) {
case 1:
@@ -39,6 +39,7 @@ static void my_iscsi_queue_pdu(struct iscsi_context *iscsi, struct iscsi_pdu *pd
*(uint32_t *)&pdu->outdata.data[40] = htonl(ntohl(*(uint32_t *)&pdu->outdata.data[40]) - 512);
break;
}
return 0;
}
static void test_cb(struct iscsi_context *iscsi _U_, int status,
@@ -61,9 +62,8 @@ int T1020_bufferoffset_invalid(const char *initiator, const char *url, int data_
struct iscsi_context *iscsi;
struct scsi_task *task;
struct scsi_readcapacity16 *rc16;
int ret, i, lun;
int ret, lun;
uint32_t block_size;
uint32_t num_blocks;
unsigned char data[512 * 256];
struct iscsi_async_state test_state;
@@ -73,7 +73,6 @@ int T1020_bufferoffset_invalid(const char *initiator, const char *url, int data_
printf("Test sending commands with invalid bufferoffset values.\n");
printf("We negotiate both DataPDUInOrder and DataSequenceInOrder so BufferOffset must be in sequence both within and across multiple sequences\n");
printf("1, Test that BufferOffset==1M too high is an error\n");
printf("2, Test that BufferOffset==-512 is an error\n");
printf("\n");
return 0;
}
@@ -105,7 +104,6 @@ int T1020_bufferoffset_invalid(const char *initiator, const char *url, int data_
goto finished;
}
block_size = rc16->block_length;
num_blocks = rc16->returned_lba;
scsi_free_scsi_task(task);
@@ -153,54 +151,8 @@ int T1020_bufferoffset_invalid(const char *initiator, const char *url, int data_
scsi_free_scsi_task(task);
printf("[OK]\n");
test2:
/* in case the previous test failed the session */
iscsi_set_noautoreconnect(iscsi, 0);
iscsi->use_immediate_data = ISCSI_IMMEDIATE_DATA_NO;
iscsi->target_max_recv_data_segment_length = 512;
printf("Write 2 DATA-IN with BUFFEROFFSET==-512 ... ");
/* we dont want autoreconnect since some targets will drop the
* on this condition.
*/
iscsi_set_noautoreconnect(iscsi, 1);
task = iscsi_write10_task(iscsi, lun, 0, data, 2 * block_size, block_size,
0, 0, 0, 0, 0,
test_cb, &test_state);
if (task == NULL) {
printf("[FAILED]\n");
printf("Failed to send WRITE10 command: %s\n", iscsi_get_error(iscsi));
ret++;
goto test3;
}
change_bufferoffset = 2;
test_state.task = task;
test_state.finished = 0;
test_state.status = 0;
wait_until_test_finished(iscsi, &test_state);
change_bufferoffset = 0;
if (task->status == SCSI_STATUS_GOOD) {
printf("[FAILED]\n");
printf("WRITE10 command successful. Should have failed with error\n");
ret++;
scsi_free_scsi_task(task);
goto test3;
}
scsi_free_scsi_task(task);
printf("[OK]\n");
test3:
/* in case the previous test failed the session */
iscsi_set_noautoreconnect(iscsi, 0);
iscsi->use_immediate_data = ISCSI_IMMEDIATE_DATA_NO;
iscsi->target_max_recv_data_segment_length = 512;
finished:
local_iscsi_queue_pdu = NULL;
iscsi_logout_sync(iscsi);
iscsi_destroy_context(iscsi);
return ret;
}

2
test-tool/iscsi-test.h
View File

@@ -27,7 +27,7 @@ struct iscsi_async_state {
void wait_until_test_finished(struct iscsi_context *iscsi, struct iscsi_async_state *test_state);
struct iscsi_pdu;
void (*local_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
int (*local_iscsi_queue_pdu)(struct iscsi_context *iscsi, struct iscsi_pdu *pdu);
int T0100_read10_simple(const char *initiator, const char *url, int data_loss, int show_info);
int T0101_read10_beyond_eol(const char *initiator, const char *url, int data_loss, int show_info);