Mercurial > hg > orthanc

changeset 3918:dba48c162b7b c-get

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
C-Get SCP always enabled; no more server config
author Alain Mazy <alain@mazy.be>
date Tue, 12 May 2020 07:50:38 +0200
parents 7a7d18875985
children 82e88ff003d7
files OrthancServer/main.cpp Resources/Configuration.json
diffstat 2 files changed, 1 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/main.cpp	Mon Apr 27 18:36:19 2020 +0200
+++ b/OrthancServer/main.cpp	Tue May 12 07:50:38 2020 +0200
@@ -1042,12 +1042,10 @@
                              OrthancPlugins* plugins)
 {
   bool dicomServerEnabled;
-  bool dicomCGetEnabled;
 
   {
     OrthancConfiguration::ReaderLock lock;
     dicomServerEnabled = lock.GetConfiguration().GetBooleanParameter("DicomServerEnabled", true);
-    dicomCGetEnabled = lock.GetConfiguration().GetBooleanParameter("DicomEnableCGet", false);
   }
 
   if (!dicomServerEnabled)
@@ -1066,10 +1064,7 @@
     dicomServer.SetRemoteModalities(modalities);
     dicomServer.SetStoreRequestHandlerFactory(serverFactory);
     dicomServer.SetMoveRequestHandlerFactory(serverFactory);
-    if (dicomCGetEnabled)
-    {
-      dicomServer.SetGetRequestHandlerFactory(serverFactory);
-    }
+    dicomServer.SetGetRequestHandlerFactory(serverFactory);
     dicomServer.SetFindRequestHandlerFactory(serverFactory);
     dicomServer.SetStorageCommitmentRequestHandlerFactory(serverFactory);
 
--- a/Resources/Configuration.json	Mon Apr 27 18:36:19 2020 +0200
+++ b/Resources/Configuration.json	Tue May 12 07:50:38 2020 +0200
@@ -96,9 +96,6 @@
   // receive files or to do query/retrieve through the DICOM protocol.
   "DicomServerEnabled" : true,
 
-   // Enable DICOM server handling of incoming C-Get requests.
-  "DicomEnableCGet" : true,
-
   // The DICOM Application Entity Title (cannot be longer than 16
   // characters)
   "DicomAet" : "ORTHANC",
@@ -215,8 +212,6 @@
      * below. The "AllowEcho" (resp.  "AllowStore") option only has an
      * effect respectively if global option "DicomAlwaysAllowEcho"
      * (resp. "DicomAlwaysAllowStore") is set to false.
-     * The "AllowGet" option only has an effect if the global option
-     * DicomEnableCGet is set to true.
      **/
     //"untrusted" : {
     //  "AET" : "ORTHANC",