orthanc: Core/DicomNetworking/Internals/CommandDispatcher.cpp comparison

comparison Core/DicomNetworking/Internals/CommandDispatcher.cpp @ 3965:7f296ae25039

reviewed CommandDispatcher.cpp

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 22 May 2020 08:33:26 +0200
parents	821715370890
children	b3f09bc9734b

comparison

equal deleted inserted replaced

-:821715370890
+:7f296ae25039
 #include <dcmtk/dcmdata/dcuid.h>        /* for variable dcmAllStorageSOPClassUIDs */
 #include <dcmtk/dcmnet/dcasccfg.h>      /* for class DcmAssociationConfiguration */
 #include <boost/lexical_cast.hpp>
 static OFBool    opt_rejectWithoutImplementationUID = OFFalse;
 static DUL_PRESENTATIONCONTEXT *
 findPresentationContextID(LST_HEAD * head,
 T_ASC_Association *assoc;
 OFCondition cond;
 OFString sprofile;
 OFString temp_str;
 cond = ASC_receiveAssociation(net, &assoc,
 /*opt_maxPDU*/ ASC_DEFAULTMAXPDU,
 NULL, NULL,
 /*opt_secureConnection*/ OFFalse,
 DUL_NOBLOCK, 1);
 DIC_AE remoteIp_C;
 DIC_AE calledIP_C;
 if (
 #if DCMTK_VERSION_NUMBER >= 364
-	    ASC_getAPTitles(assoc->params, remoteAet_C, sizeof(remoteAet_C), calledAet_C, sizeof(calledAet_C), NULL, 0).bad() ||
+ASC_getAPTitles(assoc->params, remoteAet_C, sizeof(remoteAet_C), calledAet_C, sizeof(calledAet_C), NULL, 0).bad() ||
 ASC_getPresentationAddresses(assoc->params, remoteIp_C, sizeof(remoteIp_C), calledIP_C, sizeof(calledIP_C)).bad()
 #else
-	    ASC_getAPTitles(assoc->params, remoteAet_C, calledAet_C, NULL).bad() ||
+ASC_getAPTitles(assoc->params, remoteAet_C, calledAet_C, NULL).bad() ||
 ASC_getPresentationAddresses(assoc->params, remoteIp_C, calledIP_C).bad()
 #endif
-	    )
+)
 {
 T_ASC_RejectParameters rej =
 {
 ASC_RESULT_REJECTEDPERMANENT,
 ASC_SOURCE_SERVICEUSER,
 if (server.HasMoveRequestHandlerFactory())
 {
 knownAbstractSyntaxes.push_back(UID_MOVEStudyRootQueryRetrieveInformationModel);
 knownAbstractSyntaxes.push_back(UID_MOVEPatientRootQueryRetrieveInformationModel);
 }
 // For C-GET
 if (server.HasGetRequestHandlerFactory())
 {
 knownAbstractSyntaxes.push_back(UID_GETStudyRootQueryRetrieveInformationModel);
 knownAbstractSyntaxes.push_back(UID_GETPatientRootQueryRetrieveInformationModel);
 }
 cond = ASC_acceptContextsWithPreferredTransferSyntaxes(
 assoc->params,
 &knownAbstractSyntaxes[0], knownAbstractSyntaxes.size(),
 &genericTransferSyntaxes[0], genericTransferSyntaxes.size());
 // only published if DCMTK >= 3.6.2:
 // https://bitbucket.org/sjodogne/orthanc/issues/137
 assert(static_cast<int>(count) == numberOfDcmAllStorageSOPClassUIDs);
 #endif
-// now that C-GET SCP is always enabled, the first branch of this if is useless
+if (!server.HasGetRequestHandlerFactory())    // dcmqrsrv.cc line 828
-// TO BE ANALYZED by SJ
+{
-if (!server.HasGetRequestHandlerFactory())    // dcmqrsrv.cc line 828
+// This branch exactly corresponds to Orthanc <= 1.6.1 (in
-{
+// which C-GET SCP was not supported)
 cond = ASC_acceptContextsWithPreferredTransferSyntaxes(
-assoc->params,
+assoc->params, dcmAllStorageSOPClassUIDs, count,
-dcmAllStorageSOPClassUIDs, count,
+&storageTransferSyntaxes[0], storageTransferSyntaxes.size());
-&storageTransferSyntaxes[0], storageTransferSyntaxes.size());
+if (cond.bad())
-if (cond.bad())
-{
-LOG(INFO) << cond.text();
-AssociationCleanup(assoc);
-return NULL;
-}
-}
-else                                         // see dcmqrsrv.cc lines 839 - 876
-{
-/* accept storage syntaxes with proposed role */
-T_ASC_PresentationContext pc;
-T_ASC_SC_ROLE role;
-int npc = ASC_countPresentationContexts(assoc->params);
-for (int i = 0; i < npc; i++)
-{
-ASC_getPresentationContext(assoc->params, i, &pc);
-if (dcmIsaStorageSOPClassUID(pc.abstractSyntax))
 {
-/*
+LOG(INFO) << cond.text();
-** We are prepared to accept whatever role the caller proposes.
+AssociationCleanup(assoc);
-** Normally we can be the SCP of the Storage Service Class.
+return NULL;
-** When processing the C-GET operation we can be the SCU of the Storage Service Class.
+}
-*/
+}
-role = pc.proposedRole;
+else                                         // see dcmqrsrv.cc lines 839 - 876
+{
+/* accept storage syntaxes with proposed role */
+int npc = ASC_countPresentationContexts(assoc->params);
+for (int i = 0; i < npc; i++)
+{
+T_ASC_PresentationContext pc;
+ASC_getPresentationContext(assoc->params, i, &pc);
+if (dcmIsaStorageSOPClassUID(pc.abstractSyntax))
+{
+/**
+* We are prepared to accept whatever role the caller
+* proposes.  Normally we can be the SCP of the Storage
+* Service Class.  When processing the C-GET operation
+* we can be the SCU of the Storage Service Class.
+**/
+const T_ASC_SC_ROLE role = pc.proposedRole;
-/*
+/**
-** Accept in the order "least wanted" to "most wanted" transfer
+* Accept in the order "least wanted" to "most wanted"
-** syntax.  Accepting a transfer syntax will override previously
+* transfer syntax.  Accepting a transfer syntax will
-** accepted transfer syntaxes.
+* override previously accepted transfer syntaxes.
-*/
+**/
-for (int k = (int) storageTransferSyntaxes.size() - 1; k >= 0; k--)
+for (int k = static_cast<int>(storageTransferSyntaxes.size()) - 1; k >= 0; k--)
-{
-for (int j = 0; j < (int)pc.transferSyntaxCount; j++)
 {
-/* if the transfer syntax was proposed then we can accept it
+for (int j = 0; j < static_cast<int>(pc.transferSyntaxCount); j++)
-* appears in our supported list of transfer syntaxes
-*/
-if (strcmp(pc.proposedTransferSyntaxes[j], storageTransferSyntaxes[k]) == 0)
 {
-cond = ASC_acceptPresentationContext(
+/**
-assoc->params, pc.presentationContextID, storageTransferSyntaxes[k], role);
+* If the transfer syntax was proposed then we can accept it
-if (cond.bad())
+* appears in our supported list of transfer syntaxes
+**/
+if (strcmp(pc.proposedTransferSyntaxes[j], storageTransferSyntaxes[k]) == 0)
 {
-LOG(INFO) << cond.text();
+cond = ASC_acceptPresentationContext(
-AssociationCleanup(assoc);
+assoc->params, pc.presentationContextID, storageTransferSyntaxes[k], role);
-return NULL;
+if (cond.bad())
+{
+LOG(INFO) << cond.text();
+AssociationCleanup(assoc);
+return NULL;
+}
 }
 }
 }
 }
-}
+} /* for */
-} /* for */
+}
-}
 if (!server.HasApplicationEntityFilter() ||
 server.GetApplicationEntityFilter().IsUnknownSopClassAccepted(remoteIp, remoteAet, calledAet))
 {
 /*

Mercurial > hg > orthanc

comparison Core/DicomNetworking/Internals/CommandDispatcher.cpp @ 3965:7f296ae25039