Merge pull request #552 from naterichman/presentation-context-id

BUG: Use only odd presentation context IDs
Enet4 · Aug 6, 2024 · 334273d · 334273d
2 parents 45c9ccd + 4c32e4b
commit 334273d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/ul/src/association/client.rs b/ul/src/association/client.rs
@@ -511,7 +511,7 @@ impl<'a> ClientAssociationOptions<'a> {
             .into_iter()
             .enumerate()
             .map(|(i, presentation_context)| PresentationContextProposed {
-                id: (i + 1) as u8,
+                id: (2 * i + 1) as u8,
                 abstract_syntax: presentation_context.0.to_string(),
                 transfer_syntaxes: presentation_context
                     .1

diff --git a/ul/tests/association_echo.rs b/ul/tests/association_echo.rs
@@ -42,7 +42,7 @@ fn spawn_scp() -> Result<(JoinHandle<Result<()>>, SocketAddr)> {
                     transfer_syntax: IMPLICIT_VR_LE.to_string(),
                 },
                 PresentationContextResult {
-                    id: 2,
+                    id: 3,
                     reason: PresentationContextResultReason::AbstractSyntaxNotSupported,
                     transfer_syntax: IMPLICIT_VR_LE.to_string(),
                 }

diff --git a/ul/tests/association_store.rs b/ul/tests/association_store.rs
@@ -46,7 +46,7 @@ fn spawn_scp() -> Result<(JoinHandle<Result<()>>, SocketAddr)> {
                     transfer_syntax: IMPLICIT_VR_LE.to_string(),
                 },
                 PresentationContextResult {
-                    id: 2,
+                    id: 3,
                     reason: PresentationContextResultReason::Acceptance,
                     transfer_syntax: JPEG_BASELINE.to_string(),
                 }
@@ -85,7 +85,7 @@ fn scu_scp_association_test() {
                 // guaranteed to be MR image storage
                 assert_eq!(pc.transfer_syntax, IMPLICIT_VR_LE);
             }
-            2 => {
+            3 => {
                 // guaranteed to be MG image storage
                 assert_eq!(pc.transfer_syntax, JPEG_BASELINE);
             }

diff --git a/ul/tests/association_store_uncompressed.rs b/ul/tests/association_store_uncompressed.rs
@@ -54,7 +54,7 @@ fn spawn_scp() -> Result<(JoinHandle<Result<()>>, SocketAddr)> {
                 // should always pick Explicit VR LE
                 // because JPEG baseline was not explicitly enabled in SCP
                 PresentationContextResult {
-                    id: 2,
+                    id: 3,
                     reason: PresentationContextResultReason::Acceptance,
                     transfer_syntax: EXPLICIT_VR_LE.to_string(),
                 }
@@ -98,7 +98,7 @@ fn scu_scp_association_uncompressed() {
                 assert_eq!(pc.transfer_syntax, IMPLICIT_VR_LE);
             }
             // guaranteed to be MG image storage
-            2 => {
+            3 => {
                 // server picked this one because it did not accept JPEG baseline
                 assert_eq!(pc.transfer_syntax, EXPLICIT_VR_LE);
             }