Mercurial > hg > orthanc

diff OrthancFramework/Sources/DicomNetworking/DicomAssociationParameters.cpp @ 4518:cb8fcecf1b02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new option "Timeout" in "DicomModalities" to set DICOM SCU timeout on a per-modality basis
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 22 Feb 2021 16:32:11 +0100
parents f4dbdb2dcba6
children 82a314325351
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomNetworking/DicomAssociationParameters.cpp	Mon Feb 22 15:27:25 2021 +0100
+++ b/OrthancFramework/Sources/DicomNetworking/DicomAssociationParameters.cpp	Mon Feb 22 16:32:11 2021 +0100
@@ -78,8 +78,8 @@
     timeout_(0),  // Will be set by SetDefaultParameters()
     maximumPduLength_(0)  // Will be set by SetDefaultParameters()
   {
+    SetDefaultParameters();
     remote_.SetApplicationEntityTitle("ANY-SCP");
-    SetDefaultParameters();
   }
 
     
@@ -89,8 +89,8 @@
     timeout_(0),  // Will be set by SetDefaultParameters()
     maximumPduLength_(0)  // Will be set by SetDefaultParameters()
   {
+    SetDefaultParameters();
     SetRemoteModality(remote);
-    SetDefaultParameters();
   }
 
   const std::string &DicomAssociationParameters::GetLocalApplicationEntityTitle() const
@@ -113,6 +113,12 @@
   {
     CheckHost(remote.GetHost());
     remote_ = remote;
+
+    if (remote.HasTimeout())
+    {
+      timeout_ = remote.GetTimeout();
+      assert(timeout_ != 0);
+    }
   }
 
   void DicomAssociationParameters::SetRemoteApplicationEntityTitle(const std::string &aet)