Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple fixes for ModeSelect #1405

Merged
merged 25 commits into from
Jan 7, 2024
Merged

Multiple fixes for ModeSelect #1405

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8135dcd
Update revision for release
Aug 1, 2022
9d10347
Merge tag 'v22.08.01'
Aug 28, 2022
7ba85c5
Create sonarcloud.yml
akuker Sep 3, 2022
a31476d
Update sonarcloud.yml
akuker Sep 3, 2022
27845d7
Update sonarcloud.yml
akuker Sep 3, 2022
5cb3bb5
Update sonarcloud.yml
akuker Sep 3, 2022
a33a256
Update sonarcloud.yml
akuker Sep 3, 2022
1582ece
Delete sonarcloud.yml
akuker Sep 3, 2022
39d36cf
Merge tag 'v22.10.01'
Oct 23, 2022
c7f7f55
Update revision number for release
Dec 23, 2022
ef49663
Merge tag 'v22.12.01'
Dec 23, 2022
3c7e2cd
Merge tag 'v23.02.01'
Feb 11, 2023
3ad668c
Remove SonarCloud cache setup as it is now offered by default (#1135)
mpaladin Apr 7, 2023
92d9fe5
Revert "Remove SonarCloud cache setup as it is now offered by default…
akuker Apr 10, 2023
57fa874
Merge tag 'v23.04.01'
Apr 23, 2023
cd4d630
Update revision number for release 20231101
rdmark Nov 11, 2023
796869d
Merge tag 'v23.11.01'
rdmark Nov 11, 2023
c332c49
Allow 'empty' ModeSelect6
kkaempf Dec 24, 2023
4194e7c
Allow ModeSelect with page code 1
kkaempf Dec 25, 2023
9794ef3
Fix page length computation in ModeSelect
kkaempf Dec 25, 2023
91dbbfb
drop failing test
kkaempf Jan 4, 2024
db7f215
Test support of page 1
kkaempf Jan 4, 2024
ccaa729
Add length computation test for ModeSelect6
kkaempf Jan 4, 2024
e004c1d
Check for 'empty' ModeSelect
kkaempf Jan 5, 2024
de803bd
Merge branch 'develop' into issue-1402
rdmark Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions cpp/devices/scsi_command_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ string scsi_command_util::ModeSelect(scsi_command cmd, cdb_t cdb, span<const uin
}
length -= offset;

bool has_valid_page_code = false;
// treat zero length as valid
bool has_valid_page_code = (length == 0);

// Parse the pages
while (length > 0) {
Expand All @@ -62,6 +63,10 @@ string scsi_command_util::ModeSelect(scsi_command cmd, cdb_t cdb, span<const uin

has_valid_page_code = true;
}
else if (page == 0x01) {
// OpenVMS Alpha 7.3 uses this
has_valid_page_code = true;
}
else {
stringstream s;
s << "Unknown MODE SELECT page code: $" << setfill('0') << setw(2) << hex << page;
Expand All @@ -71,7 +76,7 @@ string scsi_command_util::ModeSelect(scsi_command cmd, cdb_t cdb, span<const uin
// Advance to the next page
const int size = buf[offset + 1] + 2;

length -= size;
length -= size + 1;
offset += size;
}

Expand Down
4 changes: 2 additions & 2 deletions cpp/shared/piscsi_version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

// The following should be updated for each release
const int piscsi_major_version = 23; // Last two digits of year
const int piscsi_minor_version = 10; // Month
const int piscsi_patch_version = -1; // Patch number - increment for each update
const int piscsi_minor_version = 11; // Month
const int piscsi_patch_version = 1; // Patch number - increment for each update

using namespace std;

Expand Down
27 changes: 24 additions & 3 deletions cpp/test/scsi_command_util_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ TEST(ScsiCommandUtilTest, ModeSelect6)
Property(&scsi_exception::get_asc, asc::invalid_field_in_parameter_list))))
<< "Unsupported page 0 was not rejected";

// Page 1
buf[12] = 0x01;
EXPECT_NO_THROW(ModeSelect(scsi_command::eCmdModeSelect6, cdb, buf, LENGTH, 512))
<< "Page 1 is supported";

// Page 3 (Format Device Page)
buf[12] = 0x03;
EXPECT_THAT([&] { ModeSelect(scsi_command::eCmdModeSelect6, cdb, buf, LENGTH, 512); },
Expand All @@ -62,7 +67,25 @@ TEST(ScsiCommandUtilTest, ModeSelect6)
Property(&scsi_exception::get_asc, asc::invalid_field_in_parameter_list))))
<< "Not enough command parameters";

EXPECT_FALSE(ModeSelect(scsi_command::eCmdModeSelect6, cdb, buf, LENGTH, 512).empty());
// check length computation
buf[3] = 8;
buf[10] = 2;
buf[12] = 1;
buf[13] = 10;
buf[14] = 0x24;
buf[24] = 0;
EXPECT_NO_THROW(ModeSelect(scsi_command::eCmdModeSelect6, cdb, buf, LENGTH, 512))
<< "Multi-page length computation";

// check length computation
buf[3] = 8;
buf[10] = 12;
buf[12] = 0;
buf[13] = 0;
buf[14] = 0;
buf[24] = 0;
EXPECT_NO_THROW(ModeSelect(scsi_command::eCmdModeSelect6, cdb, buf, 12, 512))
<< "Empty ModeSelect6";
}

TEST(ScsiCommandUtilTest, ModeSelect10)
Expand Down Expand Up @@ -111,8 +134,6 @@ TEST(ScsiCommandUtilTest, ModeSelect10)
Property(&scsi_exception::get_sense_key, sense_key::illegal_request),
Property(&scsi_exception::get_asc, asc::invalid_field_in_parameter_list))))
<< "Not enough command parameters";

EXPECT_FALSE(ModeSelect(scsi_command::eCmdModeSelect10, cdb, buf, LENGTH, 512).empty());
}

TEST(ScsiCommandUtilTest, EnrichFormatPage)
Expand Down
Loading