Skip to content

Refactor association establishment and fix #589 #677

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

Merged
Enet4 merged 6 commits into from
Oct 1, 2025
Merged

Refactor association establishment and fix #589 #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a979e56
MAIN: Refactor server and client establishment
naterichman Aug 21, 2025
6b4351f
MAIN: Finish refactor and add tests for #589 regression
naterichman Aug 22, 2025
debb800
MAIN: Fix errors introduced into other crates
naterichman Aug 22, 2025
fa837dd
MAIN: Resolve clippy warnings
naterichman Aug 25, 2025
8ca574e
Merge remote-tracking branch 'origin/master' into refactor-association
naterichman Sep 25, 2025
773a44e
MAIN: Remove example keys
naterichman Sep 25, 2025
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
2 changes: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion findscu/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ fn main() {
enum Error {
/// Could not initialize SCU
InitScu {
source: dicom_ul::association::client::Error,
source: dicom_ul::association::Error,
},

/// Could not construct DICOM command
Expand Down
12 changes: 6 additions & 6 deletions scpproxy/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use bytes::BytesMut;
use clap::{crate_version, value_parser, Arg, ArgAction, Command};
use dicom_ul::association::client::get_client_pdu;
use dicom_ul::association::read_pdu_from_wire;
use dicom_ul::pdu::writer::write_pdu;
use dicom_ul::pdu::Pdu;
use snafu::{Backtrace, OptionExt, Report, ResultExt, Snafu, Whatever};
Expand Down Expand Up @@ -65,7 +65,7 @@ pub enum ThreadMessage {
},
ReadErr {
from: ProviderType,
err: dicom_ul::association::client::Error,
err: dicom_ul::association::Error,
},
WriteErr {
from: ProviderType,
Expand Down Expand Up @@ -99,7 +99,7 @@ fn run(
let message_tx = message_tx.clone();
scu_reader_thread = thread::spawn(move || {
loop {
match get_client_pdu(&mut reader, &mut buf, max_pdu_length, strict) {
match read_pdu_from_wire(&mut reader, &mut buf, max_pdu_length, strict) {
Ok(pdu) => {
message_tx
.send(ThreadMessage::SendPdu {
Expand All @@ -108,7 +108,7 @@ fn run(
})
.context(SendMessageSnafu)?;
}
Err(dicom_ul::association::client::Error::ConnectionClosed) => {
Err(dicom_ul::association::Error::ConnectionClosed) => {
message_tx
.send(ThreadMessage::Shutdown {
initiator: ProviderType::Scu,
Expand Down Expand Up @@ -137,7 +137,7 @@ fn run(
let mut buf = BytesMut::with_capacity(max_pdu_length as usize);
scp_reader_thread = thread::spawn(move || {
loop {
match get_client_pdu(&mut reader, &mut buf, max_pdu_length, strict) {
match read_pdu_from_wire(&mut reader, &mut buf, max_pdu_length, strict) {
Ok(pdu) => {
message_tx
.send(ThreadMessage::SendPdu {
Expand All @@ -146,7 +146,7 @@ fn run(
})
.context(SendMessageSnafu)?;
}
Err(dicom_ul::association::client::Error::ConnectionClosed) => {
Err(dicom_ul::association::Error::ConnectionClosed) => {
message_tx
.send(ThreadMessage::Shutdown {
initiator: ProviderType::Scp,
Expand Down
2 changes: 1 addition & 1 deletion storescp/src/store_async.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ pub async fn run_store_async(
_ => {}
}
}
Err(err @ dicom_ul::association::server::Error::Receive { .. }) => {
Err(err @ dicom_ul::association::Error::ReceivePdu { .. }) => {
if verbose {
info!("{}", Report::from_error(err));
} else {
Expand Down
2 changes: 1 addition & 1 deletion storescp/src/store_sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ pub fn run_store_sync(scu_stream: TcpStream, args: &App) -> Result<(), Whatever>
_ => {}
}
}
Err(err @ dicom_ul::association::server::Error::Receive { .. }) => {
Err(err @ dicom_ul::association::Error::ReceivePdu { .. }) => {
if verbose {
info!("{}", Report::from_error(err));
} else {
Expand Down
2 changes: 1 addition & 1 deletion storescu/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ struct DicomFile {
enum Error {
/// Could not initialize SCU
Scu {
source: Box<dicom_ul::association::client::Error>,
source: Box<dicom_ul::association::Error>,
},

/// Could not construct DICOM command
Expand Down
2 changes: 2 additions & 0 deletions ul/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ dicom-dictionary-std = { path = "../dictionary-std" }
matches = "0.1.8"
rstest = "0.25"
tokio = { version = "^1.38", features = ["io-util", "macros", "net", "rt", "rt-multi-thread"] }
dicom-core = { path = '../core' }
dicom-object = { path = '../object' }

[features]
async = ["dep:tokio"]
Expand Down
Loading
Loading