# HG changeset patch # User Alain Mazy # Date 1589262638 -7200 # Node ID dba48c162b7b978a164374b9185b873dfc2ed5fa # Parent 7a7d1887598581540fb74d004d642da6346d83dd C-Get SCP always enabled; no more server config diff -r 7a7d18875985 -r dba48c162b7b OrthancServer/main.cpp --- 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); diff -r 7a7d18875985 -r dba48c162b7b Resources/Configuration.json --- 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",