Mercurial > hg > orthanc

changeset 5895:ed74c56db02f get-scu

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Alain Mazy <am@orthanc.team>
date Mon, 02 Dec 2024 15:49:03 +0100
parents 7f4fab033c87
children f622e5964cfa
files OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp OrthancServer/Resources/Configuration.json
diffstat 2 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp	Thu Nov 21 12:17:47 2024 +0100
+++ b/OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp	Mon Dec 02 15:49:03 2024 +0100
@@ -282,8 +282,7 @@
 
     CheckConnecting(parameters, ASC_initializeNetwork(NET_REQUESTOR, 0, /*opt_acse_timeout*/ acseTimeout, &net_));
 #if DCMTK_VERSION_NUMBER >= 368
-    Sint32 timeout = parameters.GetRemoteModality().GetTimeout();
-    CheckConnecting(parameters, ASC_createAssociationParameters(&params_, parameters.GetMaximumPduLength(), timeout));
+    CheckConnecting(parameters, ASC_createAssociationParameters(&params_, parameters.GetMaximumPduLength(), acseTimeout));
 #else
     // from 3.6.8, this version is obsolete
     CheckConnecting(parameters, ASC_createAssociationParameters(&params_, parameters.GetMaximumPduLength()));
--- a/OrthancServer/Resources/Configuration.json	Thu Nov 21 12:17:47 2024 +0100
+++ b/OrthancServer/Resources/Configuration.json	Mon Dec 02 15:49:03 2024 +0100
@@ -204,12 +204,12 @@
 
   // The list of accepted Storage SOP classes.
   // If empty or not defined, this list defaults
-  // to all DCMTK storage classes in case of C-STORE SCP
-  // and to a reduced list of 120 most standard storage
+  // to all storage classes defined in DCMTK in case of 
+  // C-STORE SCP and to a reduced list of 120 common storage
   // classes in case of C-GET SCU.
   // Each entry can contain wildcards ("?" or "*") to add
   // subsets of SOP classes that are defined in DCMTK.
-  // If you want to adda a SOP class that is not defined in
+  // If you want to add a a SOP class that is not defined in
   // DCMTK, you must add it explicitely.
   // (new in Orthanc 1.12.6)
   // "AcceptedSopClasses" : [
@@ -220,7 +220,7 @@
   // The list of rejected Storage SOP classes.
   // This configuration is only meaningful if
   // "AcceptedSopClasses" is using regular expressions
-  // or if it has the default value.
+  // or if it not defined.
   // Each entry can contain wildcards ("?" or "*").
   // (new in Orthanc 1.12.6)
   // "RejectedSopClasses" : [