Merge pull request #627 from Enet4/imp/tools/max-pdu-length-check

[findscu][scpproxy][storescp][storescu] Pre-validate max PDU length option
Enet4 · Jan 11, 2025 · 17e26a0 · 17e26a0
2 parents 4a6567c + 17f68a9
commit 17e26a0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/findscu/src/main.rs b/findscu/src/main.rs
@@ -45,7 +45,11 @@ struct App {
     #[arg(long = "called-ae-title")]
     called_ae_title: Option<String>,
     /// the maximum PDU length
-    #[arg(long = "max-pdu-length", default_value = "16384")]
+    #[arg(
+        long = "max-pdu-length",
+        default_value = "16384",
+        value_parser(clap::value_parser!(u32).range(4096..=131_072))
+    )]
     max_pdu_length: u32,
 
     /// use patient root information model

diff --git a/scpproxy/src/main.rs b/scpproxy/src/main.rs
@@ -277,7 +277,7 @@ fn command() -> Command {
                 .help("Maximum PDU length")
                 .short('m')
                 .long("max-pdu-length")
-                .value_parser(value_parser!(u32).range(4096..))
+                .value_parser(value_parser!(u32).range(4096..=131_072))
                 .default_value("16384"),
         )
 }

diff --git a/storescp/src/main.rs b/storescp/src/main.rs
@@ -36,7 +36,12 @@ struct App {
     #[arg(long)]
     promiscuous: bool,
     /// Maximum PDU length
-    #[arg(short = 'm', long = "max-pdu-length", default_value = "16384")]
+    #[arg(
+        short = 'm',
+        long = "max-pdu-length",
+        default_value = "16384",
+        value_parser(clap::value_parser!(u32).range(4096..=131_072))
+    )]
     max_pdu_length: u32,
     /// Output directory for incoming objects
     #[arg(short = 'o', default_value = ".")]

diff --git a/storescu/src/main.rs b/storescu/src/main.rs
@@ -46,7 +46,11 @@ struct App {
     #[arg(long = "called-ae-title")]
     called_ae_title: Option<String>,
     /// the maximum PDU length accepted by the SCU
-    #[arg(long = "max-pdu-length", default_value = "16384")]
+    #[arg(
+        long = "max-pdu-length",
+        default_value = "16384",
+        value_parser(clap::value_parser!(u32).range(4096..=131_072))
+    )]
     max_pdu_length: u32,
     /// fail if not all DICOM files can be transferred
     #[arg(long = "fail-first")]