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

Handle C-ECHO request in storeSCP CLI tool #338

Merged
merged 4 commits into from
Apr 11, 2023
Merged

Handle C-ECHO request in storeSCP CLI tool #338

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6c16a0
Handle C-ECHO request in storeSCP CLI tool
PierreBou91 Apr 4, 2023
aed763b
fmt and switching to from_iter() for InMemDicomObject
PierreBou91 Apr 6, 2023
5a6aa89
Update storescp/src/main.rs
PierreBou91 Apr 6, 2023
c7243ee
getting rid of the intermediate array
PierreBou91 Apr 6, 2023
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
69 changes: 69 additions & 0 deletions storescp/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,33 @@ fn run(scu_stream: TcpStream, args: &App) -> Result<(), Whatever> {

let obj = InMemDicomObject::read_dataset_with_ts(v.as_slice(), &ts)
.whatever_context("failed to read incoming DICOM command")?;
let command_field = obj
.element(tags::COMMAND_FIELD)
.whatever_context("Missing Command Field")?
.uint16()
.whatever_context("Command Field is not an integer")?;

if command_field == 0x0030 {
// Handle C-ECHO-RQ
let cecho_response = create_cecho_response(msgid);
let mut cecho_data = Vec::new();

cecho_response
.write_dataset_with_ts(&mut cecho_data, &ts)
.whatever_context("could not write C-ECHO response object")?;

let pdu_response = Pdu::PData {
data: vec![dicom_ul::pdu::PDataValue {
presentation_context_id: data[0].presentation_context_id,
value_type: PDataValueType::Command,
is_last: true,
data: cecho_data,
}],
};
association.send(&pdu_response).whatever_context(
"failed to send C-ECHO response object to SCU",
)?;
} else {
msgid = obj
.element(tags::MESSAGE_ID)
.whatever_context("Missing Message ID")?
Expand All @@ -135,6 +162,7 @@ fn run(scu_stream: TcpStream, args: &App) -> Result<(), Whatever> {
.to_str()
.whatever_context("could not retrieve Affected SOP Instance UID")?
.to_string();
}
instance_buffer.clear();
} else if data[0].value_type == PDataValueType::Data && data[0].is_last {
instance_buffer.append(&mut data[0].data);
Expand Down Expand Up @@ -300,6 +328,47 @@ fn create_cstore_response(
obj
}

fn create_cecho_response(message_id: u16) -> InMemDicomObject<StandardDataDictionary> {
let mut obj = InMemDicomObject::new_empty();

// group length
obj.put(DataElement::new(
tags::COMMAND_GROUP_LENGTH,
VR::UL,
PrimitiveValue::from(8 + 8 + 2 + 8 + 2 + 8 + 2),
));

// command field
obj.put(DataElement::new(
tags::COMMAND_FIELD,
VR::US,
dicom_value!(U16, [0x8030]),
));

// message ID being responded to
obj.put(DataElement::new(
tags::MESSAGE_ID_BEING_RESPONDED_TO,
VR::US,
dicom_value!(U16, [message_id]),
));

// data set type
obj.put(DataElement::new(
tags::COMMAND_DATA_SET_TYPE,
VR::US,
dicom_value!(U16, [0x0101]),
));

// status
obj.put(DataElement::new(
tags::STATUS,
VR::US,
dicom_value!(U16, [0x0000]),
));

obj
}

fn main() -> Result<(), Box<dyn std::error::Error>> {
let args = App::parse();

Expand Down
3 changes: 1 addition & 2 deletions storescp/src/transfer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ pub static ABSTRACT_SYNTAXES: &[&str] = &[
"1.2.840.10008.5.1.4.1.1.4.2",
"1.2.840.10008.5.1.4.1.1.4.3",
"1.2.840.10008.5.1.4.1.1.3",
"1.2.840.10008.5.1.4.1.1.2",
"1.2.840.10008.5.1.4.1.1.1",
"1.2.840.10008.5.1.4.1.1.1.1",
"1.2.840.10008.5.1.4.1.1.1.1.1",
Expand All @@ -30,12 +29,12 @@ pub static ABSTRACT_SYNTAXES: &[&str] = &[
"1.2.840.10008.5.1.4.1.1.481.1",
"1.2.840.10008.5.1.4.1.1.20",
"1.2.840.10008.5.1.4.1.1.3.1",
"1.2.840.10008.5.1.4.1.1.7",
"1.2.840.10008.5.1.4.1.1.7.1",
"1.2.840.10008.5.1.4.1.1.7.2",
"1.2.840.10008.5.1.4.1.1.7.3",
"1.2.840.10008.5.1.4.1.1.7.4",
"1.2.840.10008.5.1.4.1.1.88.11",
"1.2.840.10008.5.1.4.1.1.88.22",
"1.2.840.10008.5.1.4.1.1.88.33",
"1.2.840.10008.1.1",
];