orthanc: OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp annotate

annotate OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp @ 5185:0ea402b4d901

upgrade to year 2023

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sat, 25 Mar 2023 12:27:21 +0100
parents	43e613a7756b
children	8686476e9d12

rev	line source
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
5185 0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4870 diff changeset	6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	9 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	10 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	11 * the License, or (at your option) any later version.
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 *
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * This program is distributed in the hope that it will be useful, but
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	16 * Lesser General Public License for more details.
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	18 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	19 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	20 * <http://www.gnu.org/licenses/>.
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "../PrecompiledHeaders.h"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 #include "DicomAssociation.h"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 #if !defined(DCMTK_VERSION_NUMBER)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 # error The macro DCMTK_VERSION_NUMBER must be defined
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 #endif
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30
3828 3d1bb2193832 fix build on os x Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	31 #include "../Compatibility.h"
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32 #include "../Logging.h"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33 #include "../OrthancException.h"
3828 3d1bb2193832 fix build on os x Sebastien Jodogne <s.jodogne@gmail.com> parents: 3825 diff changeset	34 #include "NetworkingCompatibility.h"
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #include <dcmtk/dcmnet/diutil.h> // For dcmConnectionTimeout()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #include <dcmtk/dcmdata/dcdeftag.h>
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 namespace Orthanc
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 static void FillSopSequence(DcmDataset& dataset,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 const DcmTagKey& tag,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 const std::vector<std::string>& sopClassUids,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 const std::vector<std::string>& sopInstanceUids,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 const std::vector<StorageCommitmentFailureReason>& failureReasons,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 bool hasFailureReasons)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 assert(sopClassUids.size() == sopInstanceUids.size() &&
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 (hasFailureReasons ?
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 failureReasons.size() == sopClassUids.size() :
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 failureReasons.empty()));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 if (sopInstanceUids.empty())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 // Add an empty sequence
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 if (!dataset.insertEmptyElement(tag).good())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 throw OrthancException(ErrorCode_InternalError);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 for (size_t i = 0; i < sopClassUids.size(); i++)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 std::unique_ptr<DcmItem> item(new DcmItem);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 if (!item->putAndInsertString(DCM_ReferencedSOPClassUID, sopClassUids[i].c_str()).good() \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 !item->putAndInsertString(DCM_ReferencedSOPInstanceUID, sopInstanceUids[i].c_str()).good() \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 (hasFailureReasons &&
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 !item->putAndInsertUint16(DCM_FailureReason, failureReasons[i]).good()) \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 !dataset.insertSequenceItem(tag, item.release()).good())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 throw OrthancException(ErrorCode_InternalError);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 void DicomAssociation::CheckConnecting(const DicomAssociationParameters& parameters,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 const OFCondition& cond)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 try
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 {
4281 d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	84 if (cond.bad() &&
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	85 cond == DUL_ASSOCIATIONREJECTED)
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	86 {
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	87 T_ASC_RejectParameters rej;
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	88 ASC_getRejectParameters(params_, &rej);
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	89
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	90 OFString str;
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	91 CLOG(TRACE, DICOM) << "Association Rejected:" << std::endl
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	92 << ASC_printRejectParameters(str, &rej);
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	93 }
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	94
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 CheckCondition(cond, parameters, "connecting");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97 catch (OrthancException&)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99 CloseInternal();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 throw;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105 void DicomAssociation::CloseInternal()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 {
4432 fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	107 #if ORTHANC_ENABLE_SSL == 1
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	108 tls_.reset(NULL); // Transport layer must be destroyed before the association itself
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	109 #endif
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	110
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 if (assoc_ != NULL)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	113 ASC_releaseAssociation(assoc_);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114 ASC_destroyAssociation(&assoc_);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	115 assoc_ = NULL;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 params_ = NULL;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	119 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 if (params_ != NULL)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 ASC_destroyAssociationParameters(&params_);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 params_ = NULL;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	126
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 if (net_ != NULL)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129 ASC_dropNetwork(&net_);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 net_ = NULL;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133 accepted_.clear();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 isOpen_ = false;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 void DicomAssociation::AddAccepted(const std::string& abstractSyntax,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 DicomTransferSyntax syntax,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 uint8_t presentationContextId)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 AcceptedPresentationContexts::iterator found = accepted_.find(abstractSyntax);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 if (found == accepted_.end())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 std::map<DicomTransferSyntax, uint8_t> syntaxes;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 syntaxes[syntax] = presentationContextId;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 accepted_[abstractSyntax] = syntaxes;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152 if (found->second.find(syntax) != found->second.end())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	154 CLOG(WARNING, DICOM) << "The same transfer syntax ("
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	155 << GetTransferSyntaxUid(syntax)
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	156 << ") was accepted twice for the same abstract syntax UID ("
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	157 << abstractSyntax << ")";
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161 found->second[syntax] = presentationContextId;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166
4656 82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	167 DicomAssociation::DicomAssociation()
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	168 {
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	169 role_ = DicomAssociationRole_Default;
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	170 isOpen_ = false;
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	171 net_ = NULL;
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	172 params_ = NULL;
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	173 assoc_ = NULL;
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	174
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	175 // Must be after "isOpen_ = false"
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	176 ClearPresentationContexts();
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	177 }
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	178
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	179
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180 DicomAssociation::~DicomAssociation()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	181 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182 try
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184 Close();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	185 }
3843 138d0dde41b5 end of replacements of DicomUserConnection by DicomControlUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3830 diff changeset	186 catch (OrthancException& e)
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	187 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188 // Don't throw exception in destructors
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	189 CLOG(ERROR, DICOM) << "Error while destroying a DICOM association: " << e.What();
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	190 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	193
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194 void DicomAssociation::SetRole(DicomAssociationRole role)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	195 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	196 if (role_ != role)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 Close();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 role_ = role;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 void DicomAssociation::ClearPresentationContexts()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206 Close();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 proposed_.clear();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 proposed_.reserve(MAX_PROPOSED_PRESENTATIONS);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212 void DicomAssociation::Open(const DicomAssociationParameters& parameters)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 if (isOpen_)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 return; // Already open
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 }
3830 447880856ce8 removing deprecated DicomUserControl from OrthancRestModalities.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3828 diff changeset	218
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219 // Timeout used during association negociation and ASC_releaseAssociation()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 uint32_t acseTimeout = parameters.GetTimeout();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221 if (acseTimeout == 0)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224 * Timeout is disabled. Global timeout (seconds) for
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 * connecting to remote hosts. Default value is -1 which
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 * selects infinite timeout, i.e. blocking connect().
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228 dcmConnectionTimeout.set(-1);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 acseTimeout = 10;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 dcmConnectionTimeout.set(acseTimeout);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 T_ASC_SC_ROLE dcmtkRole;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 switch (role_)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 case DicomAssociationRole_Default:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 dcmtkRole = ASC_SC_ROLE_DEFAULT;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 break;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 case DicomAssociationRole_Scu:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 dcmtkRole = ASC_SC_ROLE_SCU;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 break;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 case DicomAssociationRole_Scp:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 dcmtkRole = ASC_SC_ROLE_SCP;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 break;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 default:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 throw OrthancException(ErrorCode_ParameterOutOfRange);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 assert(net_ == NULL &&
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256 params_ == NULL &&
4433 4f92f2b3a3ae fix build if OpenSSL is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 4432 diff changeset	257 assoc_ == NULL);
4f92f2b3a3ae fix build if OpenSSL is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 4432 diff changeset	258
4f92f2b3a3ae fix build if OpenSSL is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 4432 diff changeset	259 #if ORTHANC_ENABLE_SSL == 1
4f92f2b3a3ae fix build if OpenSSL is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 4432 diff changeset	260 assert(tls_.get() == NULL);
4f92f2b3a3ae fix build if OpenSSL is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 4432 diff changeset	261 #endif
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263 if (proposed_.empty())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265 throw OrthancException(ErrorCode_BadSequenceOfCalls,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 "No presentation context was proposed");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4451 diff changeset	269 std::string localAet = parameters.GetLocalApplicationEntityTitle();
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4451 diff changeset	270 if (parameters.GetRemoteModality().HasLocalAet())
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4451 diff changeset	271 {
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4451 diff changeset	272 localAet = parameters.GetRemoteModality().GetLocalAet();
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4451 diff changeset	273 }
522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4451 diff changeset	274
4439 5209a9ff6e38 configuration options for DICOM TLS in Orthanc SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	275 CLOG(INFO, DICOM) << "Opening a DICOM SCU connection "
5209a9ff6e38 configuration options for DICOM TLS in Orthanc SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4438 diff changeset	276 << (parameters.GetRemoteModality().IsDicomTlsEnabled() ? "using DICOM TLS" : "without DICOM TLS")
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4451 diff changeset	277 << " from AET \"" << localAet
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	278 << "\" to AET \"" << parameters.GetRemoteModality().GetApplicationEntityTitle()
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	279 << "\" on host " << parameters.GetRemoteModality().GetHost()
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	280 << ":" << parameters.GetRemoteModality().GetPortNumber()
4517 c494ee5d0101 Added "Timeout" parameter everywhere in "/modalities/.../" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	281 << " (manufacturer: " << EnumerationToString(parameters.GetRemoteModality().GetManufacturer())
c494ee5d0101 Added "Timeout" parameter everywhere in "/modalities/.../" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	282 << ", " << (parameters.HasTimeout() ?
c494ee5d0101 Added "Timeout" parameter everywhere in "/modalities/.../" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	283 "timeout: " + boost::lexical_cast<std::string>(parameters.GetTimeout()) + "s" :
c494ee5d0101 Added "Timeout" parameter everywhere in "/modalities/.../" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4463 diff changeset	284 "no timeout") << ")";
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286 CheckConnecting(parameters, ASC_initializeNetwork(NET_REQUESTOR, 0, /opt_acse_timeout/ acseTimeout, &net_));
4451 f4dbdb2dcba6 new configuration option "MaximumPduLength" to tune the maximum PDU length Sebastien Jodogne <s.jodogne@gmail.com> parents: 4439 diff changeset	287 CheckConnecting(parameters, ASC_createAssociationParameters(&params_, parameters.GetMaximumPduLength()));
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288
4432 fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	289 #if ORTHANC_ENABLE_SSL == 1
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	290 if (parameters.GetRemoteModality().IsDicomTlsEnabled())
4432 fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	291 {
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	292 try
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	293 {
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	294 assert(net_ != NULL &&
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	295 params_ != NULL);
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	296
4438 4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	297 tls_.reset(Internals::InitializeDicomTls(net_, NET_REQUESTOR, parameters.GetOwnPrivateKeyPath(),
4a4e33c9082d configuration options for DICOM TLS in Orthanc SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	298 parameters.GetOwnCertificatePath(),
4656 82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	299 parameters.GetTrustedCertificatesPath(),
82a314325351 New configuration option: "DicomTlsRemoteCertificateRequired" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4517 diff changeset	300 parameters.IsRemoteCertificateRequired()));
4432 fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	301 }
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	302 catch (OrthancException&)
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	303 {
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	304 CloseInternal();
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	305 throw;
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	306 }
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	307 }
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	308 #endif
fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	309
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310 // Set this application's title and the called application's title in the params
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 CheckConnecting(parameters, ASC_setAPTitles(
4463 522e13a60cfc "LocalAet" in "DicomModalities" to overwrite global "DicomAet" for SCU on a per-modality basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 4451 diff changeset	312 params_, localAet.c_str(),
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	313 parameters.GetRemoteModality().GetApplicationEntityTitle().c_str(), NULL));
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 // Set the network addresses of the local and remote entities
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316 char localHost[HOST_NAME_MAX];
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 gethostname(localHost, HOST_NAME_MAX - 1);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319 char remoteHostAndPort[HOST_NAME_MAX];
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321 #ifdef _MSC_VER
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322 _snprintf
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 #else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 snprintf
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 #endif
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 (remoteHostAndPort, HOST_NAME_MAX - 1, "%s:%d",
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	327 parameters.GetRemoteModality().GetHost().c_str(),
ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	328 parameters.GetRemoteModality().GetPortNumber());
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 CheckConnecting(parameters, ASC_setPresentationAddresses(params_, localHost, remoteHostAndPort));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 // Set various options
4433 4f92f2b3a3ae fix build if OpenSSL is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 4432 diff changeset	333 #if ORTHANC_ENABLE_SSL == 1
4432 fcbac3e8ac1c dicom tls for scu Sebastien Jodogne <s.jodogne@gmail.com> parents: 4288 diff changeset	334 CheckConnecting(parameters, ASC_setTransportLayerType(params_, (tls_.get() != NULL) /opt_secureConnection/));
4433 4f92f2b3a3ae fix build if OpenSSL is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 4432 diff changeset	335 #else
4f92f2b3a3ae fix build if OpenSSL is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 4432 diff changeset	336 CheckConnecting(parameters, ASC_setTransportLayerType(params_, false /opt_secureConnection/));
4f92f2b3a3ae fix build if OpenSSL is disabled Sebastien Jodogne <s.jodogne@gmail.com> parents: 4432 diff changeset	337 #endif
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339 // Setup the list of proposed presentation contexts
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340 unsigned int presentationContextId = 1;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341 for (size_t i = 0; i < proposed_.size(); i++)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 assert(presentationContextId <= 255);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 const char* abstractSyntax = proposed_[i].abstractSyntax_.c_str();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 const std::set<DicomTransferSyntax>& source = proposed_[i].transferSyntaxes_;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348 std::vector<const char*> transferSyntaxes;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 transferSyntaxes.reserve(source.size());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 for (std::set<DicomTransferSyntax>::const_iterator
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 it = source.begin(); it != source.end(); ++it)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 transferSyntaxes.push_back(GetTransferSyntaxUid(*it));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 assert(!transferSyntaxes.empty());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 CheckConnecting(parameters, ASC_addPresentationContext(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 params_, presentationContextId, abstractSyntax,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 &transferSyntaxes[0], transferSyntaxes.size(), dcmtkRole));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 presentationContextId += 2;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364
4281 d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	365 {
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	366 OFString str;
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	367 CLOG(TRACE, DICOM) << "Request Parameters:" << std::endl
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	368 << ASC_dumpParameters(str, params_, ASC_ASSOC_RQ);
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	369 }
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	370
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	371 // Do the association
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372 CheckConnecting(parameters, ASC_requestAssociation(net_, params_, &assoc_));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 isOpen_ = true;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374
4281 d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	375 {
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	376 OFString str;
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	377 CLOG(TRACE, DICOM) << "Connection Parameters: "
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	378 << ASC_dumpConnectionParameters(str, assoc_);
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	379 CLOG(TRACE, DICOM) << "Association Parameters Negotiated:" << std::endl
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	380 << ASC_dumpParameters(str, params_, ASC_ASSOC_AC);
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	381 }
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	382
d2f79a475b51 debug log for DCMTK SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	383
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 // Inspect the accepted transfer syntaxes
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 LST_HEAD **l = &params_->DULparams.acceptedPresentationContext;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 if (*l != NULL)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388 DUL_PRESENTATIONCONTEXT* pc = (DUL_PRESENTATIONCONTEXT*) LST_Head(l);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389 LST_Position(l, (LST_NODE*)pc);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 while (pc)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 if (pc->result == ASC_P_ACCEPTANCE)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 DicomTransferSyntax transferSyntax;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 if (LookupTransferSyntax(transferSyntax, pc->acceptedTransferSyntax))
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 AddAccepted(pc->abstractSyntax, transferSyntax, pc->presentationContextID);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	401 CLOG(WARNING, DICOM) << "Unknown transfer syntax received from AET \""
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	402 << parameters.GetRemoteModality().GetApplicationEntityTitle()
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	403 << "\": " << pc->acceptedTransferSyntax;
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407 pc = (DUL_PRESENTATIONCONTEXT*) LST_Next(l);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 if (accepted_.empty())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 throw OrthancException(ErrorCode_NoPresentationContext,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414 "Unable to negotiate a presentation context with AET \"" +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	415 parameters.GetRemoteModality().GetApplicationEntityTitle() + "\"");
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	417 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419 void DicomAssociation::Close()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	421 if (isOpen_)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	423 CloseInternal();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	424 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	425 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	426
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	427
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	428 bool DicomAssociation::LookupAcceptedPresentationContext(std::map<DicomTransferSyntax, uint8_t>& target,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	429 const std::string& abstractSyntax) const
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	430 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431 if (!IsOpen())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433 throw OrthancException(ErrorCode_BadSequenceOfCalls, "Connection not opened");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436 AcceptedPresentationContexts::const_iterator found = accepted_.find(abstractSyntax);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	437
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438 if (found == accepted_.end())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	439 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440 return false;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	442 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	443 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444 target = found->second;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445 return true;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450 void DicomAssociation::ProposeGenericPresentationContext(const std::string& abstractSyntax)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452 std::set<DicomTransferSyntax> ts;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453 ts.insert(DicomTransferSyntax_LittleEndianImplicit);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	454 ts.insert(DicomTransferSyntax_LittleEndianExplicit);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	455 ts.insert(DicomTransferSyntax_BigEndianExplicit); // Retired
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456 ProposePresentationContext(abstractSyntax, ts);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	460 void DicomAssociation::ProposePresentationContext(const std::string& abstractSyntax,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461 DicomTransferSyntax transferSyntax)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 std::set<DicomTransferSyntax> ts;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 ts.insert(transferSyntax);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465 ProposePresentationContext(abstractSyntax, ts);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	467
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	468
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	469 size_t DicomAssociation::GetRemainingPropositions() const
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	470 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	471 assert(proposed_.size() <= MAX_PROPOSED_PRESENTATIONS);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	472 return MAX_PROPOSED_PRESENTATIONS - proposed_.size();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	473 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	474
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	476 void DicomAssociation::ProposePresentationContext(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 const std::string& abstractSyntax,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478 const std::set<DicomTransferSyntax>& transferSyntaxes)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480 if (transferSyntaxes.empty())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482 throw OrthancException(ErrorCode_ParameterOutOfRange,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 "No transfer syntax provided");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	485
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	486 if (proposed_.size() >= MAX_PROPOSED_PRESENTATIONS)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	487 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488 throw OrthancException(ErrorCode_ParameterOutOfRange,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489 "Too many proposed presentation contexts");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	490 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	491
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	492 if (IsOpen())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	493 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	494 Close();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	496
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 ProposedPresentationContext context;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 context.abstractSyntax_ = abstractSyntax;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499 context.transferSyntaxes_ = transferSyntaxes;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 proposed_.push_back(context);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	502 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	503
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	504
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505 T_ASC_Association& DicomAssociation::GetDcmtkAssociation() const
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	507 if (isOpen_)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	508 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	509 assert(assoc_ != NULL);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	510 return *assoc_;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	511 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	512 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 throw OrthancException(ErrorCode_BadSequenceOfCalls,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	515 "The connection is not open");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	517 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	518
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	519
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520 T_ASC_Network& DicomAssociation::GetDcmtkNetwork() const
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	521 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	522 if (isOpen_)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	523 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524 assert(net_ != NULL);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	525 return *net_;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	526 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	527 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	528 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	529 throw OrthancException(ErrorCode_BadSequenceOfCalls,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	530 "The connection is not open");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	531 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	532 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	533
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	535 void DicomAssociation::CheckCondition(const OFCondition& cond,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536 const DicomAssociationParameters& parameters,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	537 const std::string& command)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	538 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	539 if (cond.bad())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541 // Reformat the error message from DCMTK by turning multiline
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542 // errors into a single line
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	543
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544 std::string s(cond.text());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	545 std::string info;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546 info.reserve(s.size());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	548 bool isMultiline = false;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	549 for (size_t i = 0; i < s.size(); i++)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	550 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551 if (s[i] == '\r')
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	553 // Ignore
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 else if (s[i] == '\n')
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	557 if (isMultiline)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	559 info += "; ";
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	560 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	561 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	562 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	563 info += " (";
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	564 isMultiline = true;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	565 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	566 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	567 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	568 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	569 info.push_back(s[i]);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	570 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	571 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	572
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	573 if (isMultiline)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	575 info += ")";
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	576 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	577
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	578 throw OrthancException(ErrorCode_NetworkProtocol,
3843 138d0dde41b5 end of replacements of DicomUserConnection by DicomControlUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3830 diff changeset	579 "DicomAssociation - " + command + " to AET \"" +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	580 parameters.GetRemoteModality().GetApplicationEntityTitle() +
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	581 "\": " + info);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	582 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	584
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	585
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 void DicomAssociation::ReportStorageCommitment(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587 const DicomAssociationParameters& parameters,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	588 const std::string& transactionUid,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589 const std::vector<std::string>& sopClassUids,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590 const std::vector<std::string>& sopInstanceUids,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591 const std::vector<StorageCommitmentFailureReason>& failureReasons)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	592 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 if (sopClassUids.size() != sopInstanceUids.size() \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 sopClassUids.size() != failureReasons.size())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	596 throw OrthancException(ErrorCode_ParameterOutOfRange);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	598
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	599
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	600 std::vector<std::string> successSopClassUids, successSopInstanceUids, failedSopClassUids, failedSopInstanceUids;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601 std::vector<StorageCommitmentFailureReason> failedReasons;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	602
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 successSopClassUids.reserve(sopClassUids.size());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604 successSopInstanceUids.reserve(sopClassUids.size());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	605 failedSopClassUids.reserve(sopClassUids.size());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	606 failedSopInstanceUids.reserve(sopClassUids.size());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607 failedReasons.reserve(sopClassUids.size());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	608
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	609 for (size_t i = 0; i < sopClassUids.size(); i++)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	610 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611 switch (failureReasons[i])
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	613 case StorageCommitmentFailureReason_Success:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	614 successSopClassUids.push_back(sopClassUids[i]);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	615 successSopInstanceUids.push_back(sopInstanceUids[i]);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616 break;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	617
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	618 case StorageCommitmentFailureReason_ProcessingFailure:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619 case StorageCommitmentFailureReason_NoSuchObjectInstance:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620 case StorageCommitmentFailureReason_ResourceLimitation:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	621 case StorageCommitmentFailureReason_ReferencedSOPClassNotSupported:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	622 case StorageCommitmentFailureReason_ClassInstanceConflict:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	623 case StorageCommitmentFailureReason_DuplicateTransactionUID:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	624 failedSopClassUids.push_back(sopClassUids[i]);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	625 failedSopInstanceUids.push_back(sopInstanceUids[i]);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	626 failedReasons.push_back(failureReasons[i]);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	627 break;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	629 default:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	630 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	631 char buf[16];
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	632 sprintf(buf, "%04xH", failureReasons[i]);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	633 throw OrthancException(ErrorCode_ParameterOutOfRange,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	634 "Unsupported failure reason for storage commitment: " + std::string(buf));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	636 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	638
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639 DicomAssociation association;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	641 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	642 std::set<DicomTransferSyntax> transferSyntaxes;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	643 transferSyntaxes.insert(DicomTransferSyntax_LittleEndianExplicit);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	644 transferSyntaxes.insert(DicomTransferSyntax_LittleEndianImplicit);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	645
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	646 association.SetRole(DicomAssociationRole_Scp);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 association.ProposePresentationContext(UID_StorageCommitmentPushModelSOPClass,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 transferSyntaxes);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	651 association.Open(parameters);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	652
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	654 * N-EVENT-REPORT
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part04/sect_J.3.3.html
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#table_10.1-1
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	657 *
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	658 * Status code:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	659 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#sect_10.1.1.1.8
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	660 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	661
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663 * Send the "EVENT_REPORT_RQ" request
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	665
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	666 CLOG(INFO, DICOM) << "Reporting modality \""
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	667 << parameters.GetRemoteModality().GetApplicationEntityTitle()
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	668 << "\" about storage commitment transaction: " << transactionUid
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	669 << " (" << successSopClassUids.size() << " successes, "
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	670 << failedSopClassUids.size() << " failures)";
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	671 const DIC_US messageId = association.GetDcmtkAssociation().nextMsgID++;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	672
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	673 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	674 T_DIMSE_Message message;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	675 memset(&message, 0, sizeof(message));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	676 message.CommandField = DIMSE_N_EVENT_REPORT_RQ;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	678 T_DIMSE_N_EventReportRQ& content = message.msg.NEventReportRQ;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	679 content.MessageID = messageId;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	680 strncpy(content.AffectedSOPClassUID, UID_StorageCommitmentPushModelSOPClass, DIC_UI_LEN);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	681 strncpy(content.AffectedSOPInstanceUID, UID_StorageCommitmentPushModelSOPInstance, DIC_UI_LEN);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	682 content.DataSetType = DIMSE_DATASET_PRESENT;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	683
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684 DcmDataset dataset;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685 if (!dataset.putAndInsertString(DCM_TransactionUID, transactionUid.c_str()).good())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	686 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	687 throw OrthancException(ErrorCode_InternalError);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	688 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	689
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	690 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	691 std::vector<StorageCommitmentFailureReason> empty;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 FillSopSequence(dataset, DCM_ReferencedSOPSequence, successSopClassUids,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	693 successSopInstanceUids, empty, false);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	694 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	695
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	696 // http://dicom.nema.org/medical/dicom/2019a/output/chtml/part04/sect_J.3.3.html
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	697 if (failedSopClassUids.empty())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	698 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	699 content.EventTypeID = 1; // "Storage Commitment Request Successful"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	700 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	701 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	702 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	703 content.EventTypeID = 2; // "Storage Commitment Request Complete - Failures Exist"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	704
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	705 // Failure reason
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	706 // http://dicom.nema.org/medical/dicom/2019a/output/chtml/part03/sect_C.14.html#sect_C.14.1.1
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	707 FillSopSequence(dataset, DCM_FailedSOPSequence, failedSopClassUids,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	708 failedSopInstanceUids, failedReasons, true);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	709 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	710
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	711 int presID = ASC_findAcceptedPresentationContextID(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	712 &association.GetDcmtkAssociation(), UID_StorageCommitmentPushModelSOPClass);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	713 if (presID == 0)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	714 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	715 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	716 "Unable to send N-EVENT-REPORT request to AET: " +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	717 parameters.GetRemoteModality().GetApplicationEntityTitle());
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	718 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	719
4282 65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	720 {
4288 5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4285 diff changeset	721 std::stringstream s; // DcmObject::PrintHelper cannot be used with VS2008
5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4285 diff changeset	722 dataset.print(s);
4285 544120b34c09 fix for VS2008, debug logs for C-FIND SCP and for storage commitment SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	723
4282 65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	724 OFString str;
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	725 CLOG(TRACE, DICOM) << "Sending Storage Commitment Report:" << std::endl
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	726 << DIMSE_dumpMessage(str, message, DIMSE_OUTGOING) << std::endl
4285 544120b34c09 fix for VS2008, debug logs for C-FIND SCP and for storage commitment SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	727 << s.str();
4282 65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	728 }
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	729
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	730 if (!DIMSE_sendMessageUsingMemoryData(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	731 &association.GetDcmtkAssociation(), presID, &message, NULL /* status detail */,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	732 &dataset, NULL /* callback /, NULL / callback context */,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	733 NULL /* commandSet */).good())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	734 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	735 throw OrthancException(ErrorCode_NetworkProtocol);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	737 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 * Read the "EVENT_REPORT_RSP" response
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	741 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	743 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	744 T_ASC_PresentationContextID presID = 0;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	745 T_DIMSE_Message message;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	746
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	747 if (!DIMSE_receiveCommand(&association.GetDcmtkAssociation(),
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	748 (parameters.HasTimeout() ? DIMSE_NONBLOCKING : DIMSE_BLOCKING),
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	749 parameters.GetTimeout(), &presID, &message,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	750 NULL /* no statusDetail */).good() \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	751 message.CommandField != DIMSE_N_EVENT_REPORT_RSP)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	752 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	753 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	754 "Unable to read N-EVENT-REPORT response from AET: " +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	755 parameters.GetRemoteModality().GetApplicationEntityTitle());
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	756 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	757
4282 65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	758 {
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	759 OFString str;
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	760 CLOG(TRACE, DICOM) << "Received Storage Commitment Report Response:" << std::endl
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	761 << DIMSE_dumpMessage(str, message, DIMSE_INCOMING, NULL, presID);
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	762 }
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	763
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	764 const T_DIMSE_N_EventReportRSP& content = message.msg.NEventReportRSP;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	765 if (content.MessageIDBeingRespondedTo != messageId \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	766 !(content.opts & O_NEVENTREPORT_AFFECTEDSOPCLASSUID) \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	767 !(content.opts & O_NEVENTREPORT_AFFECTEDSOPINSTANCEUID) \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	768 //(content.opts & O_NEVENTREPORT_EVENTTYPEID) \|\| // Pedantic test - The "content.EventTypeID" is not used by Orthanc
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	769 std::string(content.AffectedSOPClassUID) != UID_StorageCommitmentPushModelSOPClass \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	770 std::string(content.AffectedSOPInstanceUID) != UID_StorageCommitmentPushModelSOPInstance \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	771 content.DataSetType != DIMSE_DATASET_NULL)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	772 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	773 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	774 "Badly formatted N-EVENT-REPORT response from AET: " +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	775 parameters.GetRemoteModality().GetApplicationEntityTitle());
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	776 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	777
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	778 if (content.DimseStatus != 0 /* success */)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	779 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	780 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	781 "The request cannot be handled by remote AET: " +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	782 parameters.GetRemoteModality().GetApplicationEntityTitle());
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	783 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	784 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	785
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	786 association.Close();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	787 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	788
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	789
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	790 void DicomAssociation::RequestStorageCommitment(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	791 const DicomAssociationParameters& parameters,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	792 const std::string& transactionUid,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	793 const std::vector<std::string>& sopClassUids,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	794 const std::vector<std::string>& sopInstanceUids)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	795 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	796 if (sopClassUids.size() != sopInstanceUids.size())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	797 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	798 throw OrthancException(ErrorCode_ParameterOutOfRange);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	799 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	800
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	801 for (size_t i = 0; i < sopClassUids.size(); i++)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	802 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	803 if (sopClassUids[i].empty() \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804 sopInstanceUids[i].empty())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	805 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	806 throw OrthancException(ErrorCode_ParameterOutOfRange,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	807 "The SOP class/instance UIDs cannot be empty, found: \"" +
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	808 sopClassUids[i] + "\" / \"" + sopInstanceUids[i] + "\"");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	809 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	810 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	811
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	812 if (transactionUid.size() < 5 \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	813 transactionUid.substr(0, 5) != "2.25.")
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	814 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	815 throw OrthancException(ErrorCode_ParameterOutOfRange);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	816 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	817
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	818 DicomAssociation association;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	819
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	820 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	821 std::set<DicomTransferSyntax> transferSyntaxes;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	822 transferSyntaxes.insert(DicomTransferSyntax_LittleEndianExplicit);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	823 transferSyntaxes.insert(DicomTransferSyntax_LittleEndianImplicit);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	824
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	825 association.SetRole(DicomAssociationRole_Default);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	826 association.ProposePresentationContext(UID_StorageCommitmentPushModelSOPClass,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	827 transferSyntaxes);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	828 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	829
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830 association.Open(parameters);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	831
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	832 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833 * N-ACTION
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	834 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part04/sect_J.3.2.html
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#table_10.1-4
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	836 *
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	837 * Status code:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	838 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#sect_10.1.1.1.8
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	839 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	840
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	841 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	842 * Send the "N_ACTION_RQ" request
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	843 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	844
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	845 CLOG(INFO, DICOM) << "Request to modality \""
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	846 << parameters.GetRemoteModality().GetApplicationEntityTitle()
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	847 << "\" about storage commitment for " << sopClassUids.size()
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4282 diff changeset	848 << " instances, with transaction UID: " << transactionUid;
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	849 const DIC_US messageId = association.GetDcmtkAssociation().nextMsgID++;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	850
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	851 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	852 T_DIMSE_Message message;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	853 memset(&message, 0, sizeof(message));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	854 message.CommandField = DIMSE_N_ACTION_RQ;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	855
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	856 T_DIMSE_N_ActionRQ& content = message.msg.NActionRQ;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857 content.MessageID = messageId;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	858 strncpy(content.RequestedSOPClassUID, UID_StorageCommitmentPushModelSOPClass, DIC_UI_LEN);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	859 strncpy(content.RequestedSOPInstanceUID, UID_StorageCommitmentPushModelSOPInstance, DIC_UI_LEN);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	860 content.ActionTypeID = 1; // "Request Storage Commitment"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	861 content.DataSetType = DIMSE_DATASET_PRESENT;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	862
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863 DcmDataset dataset;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	864 if (!dataset.putAndInsertString(DCM_TransactionUID, transactionUid.c_str()).good())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	865 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	866 throw OrthancException(ErrorCode_InternalError);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	868
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	869 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	870 std::vector<StorageCommitmentFailureReason> empty;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	871 FillSopSequence(dataset, DCM_ReferencedSOPSequence, sopClassUids, sopInstanceUids, empty, false);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	872 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	873
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	874 int presID = ASC_findAcceptedPresentationContextID(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	875 &association.GetDcmtkAssociation(), UID_StorageCommitmentPushModelSOPClass);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876 if (presID == 0)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	877 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	878 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	879 "Unable to send N-ACTION request to AET: " +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	880 parameters.GetRemoteModality().GetApplicationEntityTitle());
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	881 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	882
4282 65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	883 {
4288 5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4285 diff changeset	884 std::stringstream s; // DcmObject::PrintHelper cannot be used with VS2008
5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4285 diff changeset	885 dataset.print(s);
4285 544120b34c09 fix for VS2008, debug logs for C-FIND SCP and for storage commitment SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	886
4282 65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	887 OFString str;
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	888 CLOG(TRACE, DICOM) << "Sending Storage Commitment Request:" << std::endl
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	889 << DIMSE_dumpMessage(str, message, DIMSE_OUTGOING) << std::endl
4285 544120b34c09 fix for VS2008, debug logs for C-FIND SCP and for storage commitment SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4284 diff changeset	890 << s.str();
4282 65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	891 }
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	892
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	893 if (!DIMSE_sendMessageUsingMemoryData(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	894 &association.GetDcmtkAssociation(), presID, &message, NULL /* status detail */,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	895 &dataset, NULL /* callback /, NULL / callback context */,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	896 NULL /* commandSet */).good())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	897 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	898 throw OrthancException(ErrorCode_NetworkProtocol);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	899 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	900 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	901
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	902 /**
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	903 * Read the "N_ACTION_RSP" response
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	904 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	905
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	906 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	907 T_ASC_PresentationContextID presID = 0;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	908 T_DIMSE_Message message;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	909
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910 if (!DIMSE_receiveCommand(&association.GetDcmtkAssociation(),
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	911 (parameters.HasTimeout() ? DIMSE_NONBLOCKING : DIMSE_BLOCKING),
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	912 parameters.GetTimeout(), &presID, &message,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	913 NULL /* no statusDetail */).good() \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	914 message.CommandField != DIMSE_N_ACTION_RSP)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	915 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	916 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	917 "Unable to read N-ACTION response from AET: " +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	918 parameters.GetRemoteModality().GetApplicationEntityTitle());
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	919 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	920
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	921 const T_DIMSE_N_ActionRSP& content = message.msg.NActionRSP;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	922 if (content.MessageIDBeingRespondedTo != messageId \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	923 !(content.opts & O_NACTION_AFFECTEDSOPCLASSUID) \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	924 !(content.opts & O_NACTION_AFFECTEDSOPINSTANCEUID) \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	925 //(content.opts & O_NACTION_ACTIONTYPEID) \|\| // Pedantic test - The "content.ActionTypeID" is not used by Orthanc
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	926 std::string(content.AffectedSOPClassUID) != UID_StorageCommitmentPushModelSOPClass \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	927 std::string(content.AffectedSOPInstanceUID) != UID_StorageCommitmentPushModelSOPInstance \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	928 content.DataSetType != DIMSE_DATASET_NULL)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	929 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	930 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	931 "Badly formatted N-ACTION response from AET: " +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	932 parameters.GetRemoteModality().GetApplicationEntityTitle());
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	933 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	934
4282 65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	935 {
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	936 OFString str;
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	937 CLOG(TRACE, DICOM) << "Received Storage Commitment Request Response:" << std::endl
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	938 << DIMSE_dumpMessage(str, message, DIMSE_INCOMING, NULL, presID);
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	939 }
65086904ec45 debug logs for storage commitment SCU Sebastien Jodogne <s.jodogne@gmail.com> parents: 4281 diff changeset	940
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941 if (content.DimseStatus != 0 /* success */)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	942 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	943 throw OrthancException(ErrorCode_NetworkProtocol, "Storage commitment - "
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	944 "The request cannot be handled by remote AET: " +
3875 ea1d32861cfc moving timeout from DicomAssocation to DicomAssociationParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 3843 diff changeset	945 parameters.GetRemoteModality().GetApplicationEntityTitle());
3825 4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	946 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	949 association.Close();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	950 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	951 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomNetworking/DicomAssociation.cpp @ 5185:0ea402b4d901