orthanc: Core/DicomNetworking/DicomAssociation.cpp annotate

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 10 Apr 2020 16:04:54 +0200
parents
children	3d1bb2193832

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
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
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 * 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	25 * 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	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "../PrecompiledHeaders.h"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "DicomAssociation.h"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #if !defined(DCMTK_VERSION_NUMBER)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 # 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	39 #endif
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 #include "../Logging.h"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 #include "../OrthancException.h"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 #include <dcmtk/dcmnet/diutil.h> // For dcmConnectionTimeout()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 #include <dcmtk/dcmdata/dcdeftag.h>
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 namespace Orthanc
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 static void FillSopSequence(DcmDataset& dataset,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 const DcmTagKey& tag,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 const std::vector<std::string>& sopClassUids,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52 const std::vector<std::string>& sopInstanceUids,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 const std::vector<StorageCommitmentFailureReason>& failureReasons,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 bool hasFailureReasons)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 assert(sopClassUids.size() == sopInstanceUids.size() &&
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 (hasFailureReasons ?
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 failureReasons.size() == sopClassUids.size() :
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 failureReasons.empty()));
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 if (sopInstanceUids.empty())
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 // Add an empty sequence
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 if (!dataset.insertEmptyElement(tag).good())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 throw OrthancException(ErrorCode_InternalError);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 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	72 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 std::unique_ptr<DcmItem> item(new DcmItem);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 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	75 !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	76 (hasFailureReasons &&
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 !item->putAndInsertUint16(DCM_FailureReason, failureReasons[i]).good()) \|\|
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 !dataset.insertSequenceItem(tag, item.release()).good())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 throw OrthancException(ErrorCode_InternalError);
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 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 void DicomAssociation::Initialize()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 role_ = DicomAssociationRole_Default;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 isOpen_ = false;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 net_ = NULL;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 params_ = NULL;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 assoc_ = NULL;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 // Must be after "isOpen_ = false"
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96 ClearPresentationContexts();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97 }
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
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 void DicomAssociation::CheckConnecting(const DicomAssociationParameters& parameters,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101 const OFCondition& cond)
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 try
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 CheckCondition(cond, parameters, "connecting");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107 catch (OrthancException&)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109 CloseInternal();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110 throw;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 }
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
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	115 void DicomAssociation::CloseInternal()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117 if (assoc_ != NULL)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	119 ASC_releaseAssociation(assoc_);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 ASC_destroyAssociation(&assoc_);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 assoc_ = NULL;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 params_ = NULL;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124 else
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 if (params_ != NULL)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 ASC_destroyAssociationParameters(&params_);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129 params_ = NULL;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 }
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 if (net_ != NULL)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 ASC_dropNetwork(&net_);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 net_ = NULL;
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
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 accepted_.clear();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 isOpen_ = false;
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
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 void DicomAssociation::AddAccepted(const std::string& abstractSyntax,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 DicomTransferSyntax syntax,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 uint8_t presentationContextId)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 AcceptedPresentationContexts::iterator found = accepted_.find(abstractSyntax);
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 if (found == accepted_.end())
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 std::map<DicomTransferSyntax, uint8_t> syntaxes;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 syntaxes[syntax] = presentationContextId;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154 accepted_[abstractSyntax] = syntaxes;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 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	159 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160 LOG(WARNING) << "The same transfer syntax ("
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161 << GetTransferSyntaxUid(syntax)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 << ") was accepted twice for the same abstract syntax UID ("
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 << abstractSyntax << ")";
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 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 found->second[syntax] = presentationContextId;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 DicomAssociation::~DicomAssociation()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 try
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 Close();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179 catch (OrthancException&)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	181 // Don't throw exception in destructors
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182 }
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
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	185
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186 void DicomAssociation::SetRole(DicomAssociationRole role)
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 if (role_ != role)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	190 Close();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 role_ = role;
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
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 void DicomAssociation::ClearPresentationContexts()
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 proposed_.clear();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200 proposed_.reserve(MAX_PROPOSED_PRESENTATIONS);
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::Open(const DicomAssociationParameters& parameters)
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 if (isOpen_)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 return; // Already open
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 // 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	212 uint32_t acseTimeout = parameters.GetTimeout();
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213 if (acseTimeout == 0)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 {
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 * Timeout is disabled. Global timeout (seconds) for
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 * 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	218 * selects infinite timeout, i.e. blocking connect().
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219 **/
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 dcmConnectionTimeout.set(-1);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221 acseTimeout = 10;
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 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 dcmConnectionTimeout.set(acseTimeout);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 }
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 T_ASC_SC_ROLE dcmtkRole;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 switch (role_)
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 case DicomAssociationRole_Default:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 dcmtkRole = ASC_SC_ROLE_DEFAULT;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 break;
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 case DicomAssociationRole_Scu:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 dcmtkRole = ASC_SC_ROLE_SCU;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 break;
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_Scp:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 dcmtkRole = ASC_SC_ROLE_SCP;
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 default:
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 throw OrthancException(ErrorCode_ParameterOutOfRange);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 }
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 assert(net_ == NULL &&
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 params_ == NULL &&
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 assoc_ == NULL);
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 if (proposed_.empty())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 throw OrthancException(ErrorCode_BadSequenceOfCalls,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 "No presentation context was proposed");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 LOG(INFO) << "Opening a DICOM SCU connection from AET \""
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 << parameters.GetLocalApplicationEntityTitle()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 << "\" to AET \"" << parameters.GetRemoteApplicationEntityTitle()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260 << "\" on host " << parameters.GetRemoteHost()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261 << ":" << parameters.GetRemotePort()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262 << " (manufacturer: " << EnumerationToString(parameters.GetRemoteManufacturer()) << ")";
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264 CheckConnecting(parameters, ASC_initializeNetwork(NET_REQUESTOR, 0, /opt_acse_timeout/ acseTimeout, &net_));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265 CheckConnecting(parameters, ASC_createAssociationParameters(&params_, /opt_maxReceivePDULength/ ASC_DEFAULTMAXPDU));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 // 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	268 CheckConnecting(parameters, ASC_setAPTitles(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269 params_, parameters.GetLocalApplicationEntityTitle().c_str(),
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 parameters.GetRemoteApplicationEntityTitle().c_str(), NULL));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272 // 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	273 char localHost[HOST_NAME_MAX];
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 gethostname(localHost, HOST_NAME_MAX - 1);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276 char remoteHostAndPort[HOST_NAME_MAX];
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 #ifdef _MSC_VER
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 _snprintf
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280 #else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281 snprintf
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282 #endif
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283 (remoteHostAndPort, HOST_NAME_MAX - 1, "%s:%d",
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284 parameters.GetRemoteHost().c_str(), parameters.GetRemotePort());
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_setPresentationAddresses(params_, localHost, remoteHostAndPort));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	287
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288 // Set various options
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289 CheckConnecting(parameters, ASC_setTransportLayerType(params_, /opt_secureConnection/ false));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 // Setup the list of proposed presentation contexts
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292 unsigned int presentationContextId = 1;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293 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	294 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 assert(presentationContextId <= 255);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 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	297
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298 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	299
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 std::vector<const char*> transferSyntaxes;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 transferSyntaxes.reserve(source.size());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 for (std::set<DicomTransferSyntax>::const_iterator
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304 it = source.begin(); it != source.end(); ++it)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 transferSyntaxes.push_back(GetTransferSyntaxUid(*it));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 assert(!transferSyntaxes.empty());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310 CheckConnecting(parameters, ASC_addPresentationContext(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 params_, presentationContextId, abstractSyntax,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 &transferSyntaxes[0], transferSyntaxes.size(), dcmtkRole));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 presentationContextId += 2;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 // Do the association
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318 CheckConnecting(parameters, ASC_requestAssociation(net_, params_, &assoc_));
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319 isOpen_ = true;
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 // Inspect the accepted transfer syntaxes
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322 LST_HEAD **l = &params_->DULparams.acceptedPresentationContext;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 if (*l != NULL)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 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	326 LST_Position(l, (LST_NODE*)pc);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 while (pc)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 if (pc->result == ASC_P_ACCEPTANCE)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331 DicomTransferSyntax transferSyntax;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 if (LookupTransferSyntax(transferSyntax, pc->acceptedTransferSyntax))
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 AddAccepted(pc->abstractSyntax, transferSyntax, pc->presentationContextID);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338 LOG(WARNING) << "Unknown transfer syntax received from AET \""
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339 << parameters.GetRemoteApplicationEntityTitle()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340 << "\": " << pc->acceptedTransferSyntax;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341 }
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
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 pc = (DUL_PRESENTATIONCONTEXT*) LST_Next(l);
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 }
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 if (accepted_.empty())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 throw OrthancException(ErrorCode_NoPresentationContext,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 "Unable to negotiate a presentation context with AET \"" +
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 parameters.GetRemoteApplicationEntityTitle() + "\"");
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 }
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 void DicomAssociation::Close()
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 if (isOpen_)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 CloseInternal();
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 }
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
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 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	366 const std::string& abstractSyntax) const
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 if (!IsOpen())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370 throw OrthancException(ErrorCode_BadSequenceOfCalls, "Connection not opened");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	371 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 AcceptedPresentationContexts::const_iterator found = accepted_.find(abstractSyntax);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	375 if (found == accepted_.end())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	376 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377 return false;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	379 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 target = found->second;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	382 return true;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 void DicomAssociation::ProposeGenericPresentationContext(const std::string& abstractSyntax)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389 std::set<DicomTransferSyntax> ts;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 ts.insert(DicomTransferSyntax_LittleEndianImplicit);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 ts.insert(DicomTransferSyntax_LittleEndianExplicit);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 ts.insert(DicomTransferSyntax_BigEndianExplicit); // Retired
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 ProposePresentationContext(abstractSyntax, ts);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395
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 void DicomAssociation::ProposePresentationContext(const std::string& abstractSyntax,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 DicomTransferSyntax transferSyntax)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 std::set<DicomTransferSyntax> ts;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 ts.insert(transferSyntax);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402 ProposePresentationContext(abstractSyntax, ts);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 }
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 size_t DicomAssociation::GetRemainingPropositions() const
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408 assert(proposed_.size() <= MAX_PROPOSED_PRESENTATIONS);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 return MAX_PROPOSED_PRESENTATIONS - proposed_.size();
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
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 void DicomAssociation::ProposePresentationContext(
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414 const std::string& abstractSyntax,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415 const std::set<DicomTransferSyntax>& transferSyntaxes)
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 if (transferSyntaxes.empty())
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 throw OrthancException(ErrorCode_ParameterOutOfRange,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 "No transfer syntax provided");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	421 }
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 if (proposed_.size() >= MAX_PROPOSED_PRESENTATIONS)
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 throw OrthancException(ErrorCode_ParameterOutOfRange,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	426 "Too many proposed presentation contexts");
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
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	429 if (IsOpen())
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 Close();
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
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 ProposedPresentationContext context;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435 context.abstractSyntax_ = abstractSyntax;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436 context.transferSyntaxes_ = transferSyntaxes;
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 proposed_.push_back(context);
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
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 T_ASC_Association& DicomAssociation::GetDcmtkAssociation() const
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 if (isOpen_)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 assert(assoc_ != NULL);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447 return *assoc_;
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 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 throw OrthancException(ErrorCode_BadSequenceOfCalls,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452 "The connection is not open");
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	454 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	455
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 T_ASC_Network& DicomAssociation::GetDcmtkNetwork() const
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 if (isOpen_)
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	460 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461 assert(net_ != NULL);
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462 return *net_;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466 throw OrthancException(ErrorCode_BadSequenceOfCalls,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	467 "The connection is not open");
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 }
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
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	472 void DicomAssociation::CheckCondition(const OFCondition& cond,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	473 const DicomAssociationParameters& parameters,
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	474 const std::string& command)
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 if (cond.bad())
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478 // 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	479 // errors into a single line
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 std::string s(cond.text());
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482 std::string info;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 info.reserve(s.size());
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 bool isMultiline = false;
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	486 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	487 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488 if (s[i] == '\r')
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	490 // Ignore
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 else if (s[i] == '\n')
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 if (isMultiline)
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 info += "; ";
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 }
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 else
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499 {
4570c57668a8 refactoring DicomUserConnection as Dicom[Control\|Store]UserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 info += " (";

3825

4570c57668a8 refactoring DicomUserConnection as Dicom[Control|Store]UserConnection