Mercurial > hg > orthanc

diff OrthancFramework/Sources/DicomNetworking/Internals/FindScp.cpp @ 4482:8efeaba1b7f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new configuration options: "DicomAlwaysAllowFind" and "DicomAlwaysAllowGet"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 28 Jan 2021 15:54:30 +0100
parents d9473bd5ed43
children 7053502fbf97
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomNetworking/Internals/FindScp.cpp	Thu Jan 28 14:07:49 2021 +0100
+++ b/OrthancFramework/Sources/DicomNetworking/Internals/FindScp.cpp	Thu Jan 28 15:54:30 2021 +0100
@@ -129,7 +129,6 @@
   {  
     struct FindScpData
     {
-      DicomServer::IRemoteModalities* modalities_;
       IFindRequestHandler* findHandler_;
       IWorklistRequestHandler* worklistHandler_;
       DicomFindAnswers answers_;
@@ -139,7 +138,6 @@
       const std::string* calledAet_;
 
       FindScpData() :
-        modalities_(NULL),
         findHandler_(NULL),
         worklistHandler_(NULL),
         answers_(false),
@@ -227,15 +225,6 @@
            * Ensure that the remote modality is known to Orthanc for C-FIND requests.
            **/
 
-          assert(data.modalities_ != NULL);
-          if (!data.modalities_->LookupAETitle(modality, *data.remoteAet_))
-          {
-            throw OrthancException(ErrorCode_UnknownModality,
-                                   "Modality with AET \"" + (*data.remoteAet_) +
-                                   "\" is not defined in the \"DicomModalities\" configuration option");
-          }
-
-          
           if (sopClassUid == UID_FINDModalityWorklistInformationModel)
           {
             data.answers_.SetWorklist(true);
@@ -359,7 +348,6 @@
   OFCondition Internals::findScp(T_ASC_Association * assoc, 
                                  T_DIMSE_Message * msg, 
                                  T_ASC_PresentationContextID presID,
-                                 DicomServer::IRemoteModalities& modalities,
                                  IFindRequestHandler* findHandler,
                                  IWorklistRequestHandler* worklistHandler,
                                  const std::string& remoteIp,
@@ -368,7 +356,6 @@
                                  int timeout)
   {
     FindScpData data;
-    data.modalities_ = &modalities;
     data.findHandler_ = findHandler;
     data.worklistHandler_ = worklistHandler;
     data.lastRequest_ = NULL;