orthanc: OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp annotate

annotate OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp @ 4288:5b254bd435d3

fix for VS2008

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 04 Nov 2020 18:26:44 +0100
parents	544120b34c09
children	f5d44e30b429

rev	line source
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1806 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1164 diff changeset	4 * Department, University Hospital of Liege, Belgium
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * 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	8 * 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	9 * 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	10 * the License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 102 diff changeset	11 *
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * 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	15 * Lesser General Public License for more details.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 *
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	17 * 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	18 * 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	19 * <http://www.gnu.org/licenses/>.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
766 0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	23
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	24
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	25 /*=========================================================================
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	26
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	27 This file is based on portions of the following project:
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	28
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	29 Program: DCMTK 3.6.0
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	30 Module: http://dicom.offis.de/dcmtk.php.en
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	31
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	32 Copyright (C) 1994-2011, OFFIS e.V.
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	33 All rights reserved.
766 0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	34
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	35 This software and supporting documentation were developed by
766 0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	36
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	37 OFFIS e.V.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	38 R&D Division Health
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	39 Escherweg 2
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	40 26121 Oldenburg, Germany
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	41
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	42 Redistribution and use in source and binary forms, with or without
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	43 modification, are permitted provided that the following conditions
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	44 are met:
766 0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	45
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	46 - Redistributions of source code must retain the above copyright
766 0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	47 notice, this list of conditions and the following disclaimer.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	48
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	49 - Redistributions in binary form must reproduce the above copyright
766 0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	50 notice, this list of conditions and the following disclaimer in the
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	51 documentation and/or other materials provided with the distribution.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	52
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	53 - Neither the name of OFFIS nor the names of its contributors may be
766 0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	54 used to endorse or promote products derived from this software
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	55 without specific prior written permission.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	56
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	57 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	58 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	59 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	60 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	61 HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	62 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	63 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	64 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	65 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	66 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	67 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
766 0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	68
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	69 =========================================================================*/
766 0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	70
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 690 diff changeset	71
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	72 #include "../../PrecompiledHeaders.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 #include "CommandDispatcher.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74
3118 8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	75 #if !defined(DCMTK_VERSION_NUMBER)
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	76 # error The macro DCMTK_VERSION_NUMBER must be defined
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	77 #endif
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	78
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 #include "FindScp.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 #include "StoreScp.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 #include "MoveScp.h"
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	82 #include "GetScp.h"
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3704 diff changeset	83 #include "../../Compatibility.h"
2382 7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	84 #include "../../Toolbox.h"
7284093111b0 big reorganization to cleanly separate framework vs. server Sebastien Jodogne <s.jodogne@gmail.com> parents: 2381 diff changeset	85 #include "../../Logging.h"
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	86 #include "../../OrthancException.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	88 #include <dcmtk/dcmdata/dcdeftag.h> /* for storage commitment */
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	89 #include <dcmtk/dcmdata/dcsequen.h> /* for class DcmSequenceOfItems */
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	90 #include <dcmtk/dcmdata/dcuid.h> /* for variable dcmAllStorageSOPClassUIDs */
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 #include <dcmtk/dcmnet/dcasccfg.h> /* for class DcmAssociationConfiguration */
3343 6e42d676401c Fix issue #137 (C-STORE fails for unknown SOP Class although server is configured to accept any) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3249 diff changeset	92
101 428784e59dcd trying to use log4cplus jodogne parents: 62 diff changeset	93 #include <boost/lexical_cast.hpp>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	95 static OFBool opt_rejectWithoutImplementationUID = OFFalse;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97
503 273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	98
1806 cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	99 static DUL_PRESENTATIONCONTEXT *
503 273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	100 findPresentationContextID(LST_HEAD * head,
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	101 T_ASC_PresentationContextID presentationContextID)
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	102 {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	103 DUL_PRESENTATIONCONTEXT *pc;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	104 LST_HEAD **l;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	105 OFBool found = OFFalse;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	106
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	107 if (head == NULL)
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	108 return NULL;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	109
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	110 l = &head;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	111 if (*l == NULL)
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	112 return NULL;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	113
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	114 pc = OFstatic_cast(DUL_PRESENTATIONCONTEXT *, LST_Head(l));
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	115 (void)LST_Position(l, OFstatic_cast(LST_NODE *, pc));
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	116
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	117 while (pc && !found) {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	118 if (pc->presentationContextID == presentationContextID) {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	119 found = OFTrue;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	120 } else {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	121 pc = OFstatic_cast(DUL_PRESENTATIONCONTEXT *, LST_Next(l));
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	122 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	123 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	124 return pc;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	125 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	126
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	127
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	128 /** accept all presenstation contexts for unknown SOP classes,
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	129 * i.e. UIDs appearing in the list of abstract syntaxes
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	130 * where no corresponding name is defined in the UID dictionary.
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	131 * @param params pointer to association parameters structure
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	132 * @param transferSyntax transfer syntax to accept
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	133 * @param acceptedRole SCU/SCP role to accept
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	134 */
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	135 static OFCondition acceptUnknownContextsWithTransferSyntax(
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	136 T_ASC_Parameters * params,
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	137 const char* transferSyntax,
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	138 T_ASC_SC_ROLE acceptedRole)
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	139 {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	140 int n, i, k;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	141 DUL_PRESENTATIONCONTEXT *dpc;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	142 T_ASC_PresentationContext pc;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	143
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	144 n = ASC_countPresentationContexts(params);
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	145 for (i = 0; i < n; i++)
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	146 {
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	147 OFCondition cond = ASC_getPresentationContext(params, i, &pc);
503 273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	148 if (cond.bad()) return cond;
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	149 OFBool abstractOK = OFFalse;
fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	150 OFBool accepted = OFFalse;
503 273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	151
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	152 if (dcmFindNameOfUID(pc.abstractSyntax) == NULL)
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	153 {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	154 abstractOK = OFTrue;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	155
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	156 /* check the transfer syntax */
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	157 for (k = 0; (k < OFstatic_cast(int, pc.transferSyntaxCount)) && !accepted; k++)
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	158 {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	159 if (strcmp(pc.proposedTransferSyntaxes[k], transferSyntax) == 0)
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	160 {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	161 accepted = OFTrue;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	162 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	163 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	164 }
3343 6e42d676401c Fix issue #137 (C-STORE fails for unknown SOP Class although server is configured to accept any) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3249 diff changeset	165
503 273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	166 if (accepted)
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	167 {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	168 cond = ASC_acceptPresentationContext(
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	169 params, pc.presentationContextID,
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	170 transferSyntax, acceptedRole);
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	171 if (cond.bad()) return cond;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	172 } else {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	173 T_ASC_P_ResultReason reason;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	174
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	175 /* do not refuse if already accepted */
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	176 dpc = findPresentationContextID(params->DULparams.acceptedPresentationContext,
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	177 pc.presentationContextID);
4199 fbc49a65340a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	178 if (dpc == NULL \|\| dpc->result != ASC_P_ACCEPTANCE)
503 273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	179 {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	180
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	181 if (abstractOK) {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	182 reason = ASC_P_TRANSFERSYNTAXESNOTSUPPORTED;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	183 } else {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	184 reason = ASC_P_ABSTRACTSYNTAXNOTSUPPORTED;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	185 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	186 /*
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	187 * If previously this presentation context was refused
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	188 * because of bad transfer syntax let it stay that way.
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	189 */
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	190 if ((dpc != NULL) && (dpc->result == ASC_P_TRANSFERSYNTAXESNOTSUPPORTED))
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	191 reason = ASC_P_TRANSFERSYNTAXESNOTSUPPORTED;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	192
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	193 cond = ASC_refusePresentationContext(params, pc.presentationContextID, reason);
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	194 if (cond.bad()) return cond;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	195 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	196 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	197 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	198 return EC_Normal;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	199 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	200
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	201
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	202 /** accept all presenstation contexts for unknown SOP classes,
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	203 * i.e. UIDs appearing in the list of abstract syntaxes
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	204 * where no corresponding name is defined in the UID dictionary.
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	205 * This method is passed a list of "preferred" transfer syntaxes.
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	206 * @param params pointer to association parameters structure
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	207 * @param transferSyntax transfer syntax to accept
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	208 * @param acceptedRole SCU/SCP role to accept
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	209 */
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	210 static OFCondition acceptUnknownContextsWithPreferredTransferSyntaxes(
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	211 T_ASC_Parameters * params,
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	212 const char* transferSyntaxes[], int transferSyntaxCount,
3343 6e42d676401c Fix issue #137 (C-STORE fails for unknown SOP Class although server is configured to accept any) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3249 diff changeset	213 T_ASC_SC_ROLE acceptedRole)
503 273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	214 {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	215 OFCondition cond = EC_Normal;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	216 /*
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	217 ** Accept in the order "least wanted" to "most wanted" transfer
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	218 ** syntax. Accepting a transfer syntax will override previously
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	219 ** accepted transfer syntaxes.
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	220 */
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	221 for (int i = transferSyntaxCount - 1; i >= 0; i--)
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	222 {
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	223 cond = acceptUnknownContextsWithTransferSyntax(params, transferSyntaxes[i], acceptedRole);
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	224 if (cond.bad()) return cond;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	225 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	226 return cond;
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	227 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	228
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	229
1073 01414536c930 complete DICOM conformance Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	230
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	231 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 namespace Internals
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 OFCondition AssociationCleanup(T_ASC_Association *assoc)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 OFCondition cond = ASC_dropSCPAssociation(assoc);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 if (cond.bad())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	240 CLOG(ERROR, DICOM) << cond.text();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 return cond;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 cond = ASC_destroyAssociation(&assoc);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 if (cond.bad())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	247 CLOG(ERROR, DICOM) << cond.text();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 return cond;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 return cond;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256 CommandDispatcher* AcceptAssociation(const DicomServer& server, T_ASC_Network *net)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 DcmAssociationConfiguration asccfg;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 char buf[BUFSIZ];
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260 T_ASC_Association *assoc;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261 OFCondition cond;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262 OFString sprofile;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263 OFString temp_str;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265 cond = ASC_receiveAssociation(net, &assoc,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 /opt_maxPDU/ ASC_DEFAULTMAXPDU,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 NULL, NULL,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 /opt_secureConnection/ OFFalse,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269 DUL_NOBLOCK, 1);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 if (cond == DUL_NOASSOCIATIONREQUEST)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273 // Timeout
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 AssociationCleanup(assoc);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275 return NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 // if some kind of error occured, take care of it
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 if (cond.bad())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	281 CLOG(ERROR, DICOM) << "Receiving Association failed: " << cond.text();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282 // no matter what kind of error occurred, we need to do a cleanup
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283 AssociationCleanup(assoc);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284 return NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286
4283 6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	287 {
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	288 OFString str;
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	289 CLOG(TRACE, DICOM) << "Received Association Parameters:" << std::endl
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	290 << ASC_dumpParameters(str, assoc->params, ASC_ASSOC_RQ);
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	291 }
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	292
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	293 // Retrieve the AET and the IP address of the remote modality
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1786 diff changeset	294 std::string remoteAet;
4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1786 diff changeset	295 std::string remoteIp;
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	296 std::string calledAet;
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	297
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	298 {
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1786 diff changeset	299 DIC_AE remoteAet_C;
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	300 DIC_AE calledAet_C;
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1786 diff changeset	301 DIC_AE remoteIp_C;
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	302 DIC_AE calledIP_C;
3118 8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	303
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	304 if (
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	305 #if DCMTK_VERSION_NUMBER >= 364
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	306 ASC_getAPTitles(assoc->params, remoteAet_C, sizeof(remoteAet_C), calledAet_C, sizeof(calledAet_C), NULL, 0).bad() \|\|
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	307 ASC_getPresentationAddresses(assoc->params, remoteIp_C, sizeof(remoteIp_C), calledIP_C, sizeof(calledIP_C)).bad()
3118 8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	308 #else
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	309 ASC_getAPTitles(assoc->params, remoteAet_C, calledAet_C, NULL).bad() \|\|
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	310 ASC_getPresentationAddresses(assoc->params, remoteIp_C, calledIP_C).bad()
3118 8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	311 #endif
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	312 )
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	313 {
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	314 T_ASC_RejectParameters rej =
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	315 {
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	316 ASC_RESULT_REJECTEDPERMANENT,
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	317 ASC_SOURCE_SERVICEUSER,
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	318 ASC_REASON_SU_NOREASON
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	319 };
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	320 ASC_rejectAssociation(assoc, &rej);
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	321 AssociationCleanup(assoc);
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	322 return NULL;
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	323 }
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	324
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1786 diff changeset	325 remoteIp = std::string(/OFSTRING_GUARD/(remoteIp_C));
4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1786 diff changeset	326 remoteAet = std::string(/OFSTRING_GUARD/(remoteAet_C));
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	327 calledAet = (/OFSTRING_GUARD/(calledAet_C));
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	328 }
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	329
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	330 CLOG(INFO, DICOM) << "Association Received from AET " << remoteAet
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	331 << " on IP " << remoteIp;
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	332
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	334 {
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	335 /* accept the abstract syntaxes for C-ECHO, C-FIND, C-MOVE,
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	336 and storage commitment, if presented */
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	337
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	338 std::vector<const char*> genericTransferSyntaxes;
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	339 genericTransferSyntaxes.push_back(UID_LittleEndianExplicitTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	340 genericTransferSyntaxes.push_back(UID_BigEndianExplicitTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	341 genericTransferSyntaxes.push_back(UID_LittleEndianImplicitTransferSyntax);
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	342
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	343 std::vector<const char*> knownAbstractSyntaxes;
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	344
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	345 // For C-ECHO (always enabled since Orthanc 1.6.0; in earlier
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	346 // versions, only enabled if C-STORE was also enabled)
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	347 knownAbstractSyntaxes.push_back(UID_VerificationSOPClass);
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	348
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	349 // For C-FIND
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	350 if (server.HasFindRequestHandlerFactory())
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	351 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	352 knownAbstractSyntaxes.push_back(UID_FINDPatientRootQueryRetrieveInformationModel);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	353 knownAbstractSyntaxes.push_back(UID_FINDStudyRootQueryRetrieveInformationModel);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	354 }
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	355
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	356 if (server.HasWorklistRequestHandlerFactory())
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	357 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	358 knownAbstractSyntaxes.push_back(UID_FINDModalityWorklistInformationModel);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	359 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	361 // For C-MOVE
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	362 if (server.HasMoveRequestHandlerFactory())
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	363 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	364 knownAbstractSyntaxes.push_back(UID_MOVEStudyRootQueryRetrieveInformationModel);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	365 knownAbstractSyntaxes.push_back(UID_MOVEPatientRootQueryRetrieveInformationModel);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	366 }
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	367
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	368 // For C-GET
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	369 if (server.HasGetRequestHandlerFactory())
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	370 {
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	371 knownAbstractSyntaxes.push_back(UID_GETStudyRootQueryRetrieveInformationModel);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	372 knownAbstractSyntaxes.push_back(UID_GETPatientRootQueryRetrieveInformationModel);
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	373 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	374
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	375 cond = ASC_acceptContextsWithPreferredTransferSyntaxes(
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	376 assoc->params,
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	377 &knownAbstractSyntaxes[0], knownAbstractSyntaxes.size(),
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	378 &genericTransferSyntaxes[0], genericTransferSyntaxes.size());
1806 cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	379 if (cond.bad())
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	380 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	381 CLOG(INFO, DICOM) << cond.text();
1806 cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	382 AssociationCleanup(assoc);
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	383 return NULL;
cd213ebcaefd UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 1800 diff changeset	384 }
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	385
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	386
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	387 /* storage commitment support, new in Orthanc 1.6.0 */
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	388 if (server.HasStorageCommitmentRequestHandlerFactory())
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	389 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	390 /**
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	391 * "ASC_SC_ROLE_SCUSCP": The "SCU" role is needed to accept
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	392 * remote storage commitment requests, and the "SCP" role is
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	393 * needed to receive storage commitments answers.
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	394 **/
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	395 const char* as[1] = { UID_StorageCommitmentPushModelSOPClass };
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	396 cond = ASC_acceptContextsWithPreferredTransferSyntaxes(
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	397 assoc->params, as, 1,
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	398 &genericTransferSyntaxes[0], genericTransferSyntaxes.size(), ASC_SC_ROLE_SCUSCP);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	399 if (cond.bad())
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	400 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	401 CLOG(INFO, DICOM) << cond.text();
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	402 AssociationCleanup(assoc);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	403 return NULL;
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	404 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	405 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	406 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	407
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	408
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	409 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	410 /* accept the abstract syntaxes for C-STORE, if presented */
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	411
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	412 std::vector<const char*> storageTransferSyntaxes;
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	413
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	414 // This is the list of the transfer syntaxes that were supported up to Orthanc 0.7.1
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	415 storageTransferSyntaxes.push_back(UID_LittleEndianExplicitTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	416 storageTransferSyntaxes.push_back(UID_BigEndianExplicitTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	417 storageTransferSyntaxes.push_back(UID_LittleEndianImplicitTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	418
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	419 // New transfer syntaxes supported since Orthanc 0.7.2
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	420 if (!server.HasApplicationEntityFilter() \|\|
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	421 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Deflated))
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	422 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	423 storageTransferSyntaxes.push_back(UID_DeflatedExplicitVRLittleEndianTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	424 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	425
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	426 if (!server.HasApplicationEntityFilter() \|\|
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	427 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Jpeg))
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	428 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	429 storageTransferSyntaxes.push_back(UID_JPEGProcess1TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	430 storageTransferSyntaxes.push_back(UID_JPEGProcess2_4TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	431 storageTransferSyntaxes.push_back(UID_JPEGProcess3_5TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	432 storageTransferSyntaxes.push_back(UID_JPEGProcess6_8TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	433 storageTransferSyntaxes.push_back(UID_JPEGProcess7_9TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	434 storageTransferSyntaxes.push_back(UID_JPEGProcess10_12TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	435 storageTransferSyntaxes.push_back(UID_JPEGProcess11_13TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	436 storageTransferSyntaxes.push_back(UID_JPEGProcess14TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	437 storageTransferSyntaxes.push_back(UID_JPEGProcess15TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	438 storageTransferSyntaxes.push_back(UID_JPEGProcess16_18TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	439 storageTransferSyntaxes.push_back(UID_JPEGProcess17_19TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	440 storageTransferSyntaxes.push_back(UID_JPEGProcess20_22TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	441 storageTransferSyntaxes.push_back(UID_JPEGProcess21_23TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	442 storageTransferSyntaxes.push_back(UID_JPEGProcess24_26TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	443 storageTransferSyntaxes.push_back(UID_JPEGProcess25_27TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	444 storageTransferSyntaxes.push_back(UID_JPEGProcess28TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	445 storageTransferSyntaxes.push_back(UID_JPEGProcess29TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	446 storageTransferSyntaxes.push_back(UID_JPEGProcess14SV1TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	447 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	448
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	449 if (!server.HasApplicationEntityFilter() \|\|
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	450 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Jpeg2000))
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	451 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	452 storageTransferSyntaxes.push_back(UID_JPEG2000LosslessOnlyTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	453 storageTransferSyntaxes.push_back(UID_JPEG2000TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	454 storageTransferSyntaxes.push_back(UID_JPEG2000LosslessOnlyTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	455 storageTransferSyntaxes.push_back(UID_JPEG2000TransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	456 storageTransferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionLosslessOnlyTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	457 storageTransferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	458 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	459
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	460 if (!server.HasApplicationEntityFilter() \|\|
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	461 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_JpegLossless))
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	462 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	463 storageTransferSyntaxes.push_back(UID_JPEGLSLosslessTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	464 storageTransferSyntaxes.push_back(UID_JPEGLSLossyTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	465 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	466
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	467 if (!server.HasApplicationEntityFilter() \|\|
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	468 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Jpip))
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	469 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	470 storageTransferSyntaxes.push_back(UID_JPIPReferencedTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	471 storageTransferSyntaxes.push_back(UID_JPIPReferencedDeflateTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	472 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	473
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	474 if (!server.HasApplicationEntityFilter() \|\|
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	475 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Mpeg2))
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	476 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	477 storageTransferSyntaxes.push_back(UID_MPEG2MainProfileAtMainLevelTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	478 storageTransferSyntaxes.push_back(UID_MPEG2MainProfileAtHighLevelTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	479 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	480
3769 eb044cc49d51 compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3767 diff changeset	481 #if DCMTK_VERSION_NUMBER >= 361
3646 5faf76511931 integration mainline->storage-commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 3645 diff changeset	482 // New in Orthanc 1.6.0
5faf76511931 integration mainline->storage-commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 3645 diff changeset	483 if (!server.HasApplicationEntityFilter() \|\|
5faf76511931 integration mainline->storage-commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 3645 diff changeset	484 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Mpeg4))
5faf76511931 integration mainline->storage-commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 3645 diff changeset	485 {
5faf76511931 integration mainline->storage-commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 3645 diff changeset	486 storageTransferSyntaxes.push_back(UID_MPEG4BDcompatibleHighProfileLevel4_1TransferSyntax);
5faf76511931 integration mainline->storage-commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 3645 diff changeset	487 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_1TransferSyntax);
5faf76511931 integration mainline->storage-commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 3645 diff changeset	488 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_2_For2DVideoTransferSyntax);
5faf76511931 integration mainline->storage-commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 3645 diff changeset	489 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_2_For3DVideoTransferSyntax);
5faf76511931 integration mainline->storage-commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 3645 diff changeset	490 storageTransferSyntaxes.push_back(UID_MPEG4StereoHighProfileLevel4_2TransferSyntax);
5faf76511931 integration mainline->storage-commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 3645 diff changeset	491 }
3769 eb044cc49d51 compatibility with DCMTK 3.6.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3767 diff changeset	492 #endif
3646 5faf76511931 integration mainline->storage-commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 3641 3645 diff changeset	493
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	494 if (!server.HasApplicationEntityFilter() \|\|
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	495 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Rle))
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	496 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	497 storageTransferSyntaxes.push_back(UID_RLELosslessTransferSyntax);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	498 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	499
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	500 /* the array of Storage SOP Class UIDs that is defined within "dcmdata/libsrc/dcuid.cc" */
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	501 size_t count = 0;
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	502 while (dcmAllStorageSOPClassUIDs[count] != NULL)
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	503 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	504 count++;
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	505 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	506
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	507 #if DCMTK_VERSION_NUMBER >= 362
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	508 // The global variable "numberOfDcmAllStorageSOPClassUIDs" is
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	509 // only published if DCMTK >= 3.6.2:
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	510 // https://bitbucket.org/sjodogne/orthanc/issues/137
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	511 assert(static_cast<int>(count) == numberOfDcmAllStorageSOPClassUIDs);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	512 #endif
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	513
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	514 if (!server.HasGetRequestHandlerFactory()) // dcmqrsrv.cc line 828
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	515 {
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	516 // This branch exactly corresponds to Orthanc <= 1.6.1 (in
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	517 // which C-GET SCP was not supported)
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	518 cond = ASC_acceptContextsWithPreferredTransferSyntaxes(
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	519 assoc->params, dcmAllStorageSOPClassUIDs, count,
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	520 &storageTransferSyntaxes[0], storageTransferSyntaxes.size());
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	521 if (cond.bad())
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	522 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	523 CLOG(INFO, DICOM) << cond.text();
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	524 AssociationCleanup(assoc);
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	525 return NULL;
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	526 }
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	527 }
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	528 else // see dcmqrsrv.cc lines 839 - 876
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	529 {
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	530 /* accept storage syntaxes with proposed role */
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	531 int npc = ASC_countPresentationContexts(assoc->params);
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	532 for (int i = 0; i < npc; i++)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	533 {
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	534 T_ASC_PresentationContext pc;
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	535 ASC_getPresentationContext(assoc->params, i, &pc);
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	536 if (dcmIsaStorageSOPClassUID(pc.abstractSyntax))
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	537 {
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	538 /**
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	539 * We are prepared to accept whatever role the caller
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	540 * proposes. Normally we can be the SCP of the Storage
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	541 * Service Class. When processing the C-GET operation
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	542 * we can be the SCU of the Storage Service Class.
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	543 **/
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	544 const T_ASC_SC_ROLE role = pc.proposedRole;
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	545
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	546 /**
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	547 * Accept in the order "least wanted" to "most wanted"
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	548 * transfer syntax. Accepting a transfer syntax will
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	549 * override previously accepted transfer syntaxes.
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	550 **/
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	551 for (int k = static_cast<int>(storageTransferSyntaxes.size()) - 1; k >= 0; k--)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	552 {
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	553 for (int j = 0; j < static_cast<int>(pc.transferSyntaxCount); j++)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	554 {
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	555 /**
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	556 * If the transfer syntax was proposed then we can accept it
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	557 * appears in our supported list of transfer syntaxes
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	558 **/
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	559 if (strcmp(pc.proposedTransferSyntaxes[j], storageTransferSyntaxes[k]) == 0)
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	560 {
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	561 cond = ASC_acceptPresentationContext(
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	562 assoc->params, pc.presentationContextID, storageTransferSyntaxes[k], role);
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	563 if (cond.bad())
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	564 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	565 CLOG(INFO, DICOM) << cond.text();
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	566 AssociationCleanup(assoc);
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	567 return NULL;
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	568 }
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	569 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	570 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	571 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	572 }
3965 7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	573 } /* for */
7f296ae25039 reviewed CommandDispatcher.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 3964 diff changeset	574 }
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	575
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	576 if (!server.HasApplicationEntityFilter() \|\|
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	577 server.GetApplicationEntityFilter().IsUnknownSopClassAccepted(remoteIp, remoteAet, calledAet))
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	578 {
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	579 /*
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	580 * Promiscous mode is enabled: Accept everything not known not
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	581 * to be a storage SOP class.
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	582 **/
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	583 cond = acceptUnknownContextsWithPreferredTransferSyntaxes(
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	584 assoc->params, &storageTransferSyntaxes[0], storageTransferSyntaxes.size(), ASC_SC_ROLE_DEFAULT);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	585 if (cond.bad())
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	586 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	587 CLOG(INFO, DICOM) << cond.text();
3612 22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	588 AssociationCleanup(assoc);
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	589 return NULL;
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	590 }
22eef03feed7 DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE Sebastien Jodogne <s.jodogne@gmail.com> parents: 3604 diff changeset	591 }
503 273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	592 }
273e7ad98ea9 promiscuous mode Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	593
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 /* set our app title */
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595 ASC_setAPTitles(assoc->params, NULL, NULL, server.GetApplicationEntityTitle().c_str());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	596
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597 /* acknowledge or reject this association */
3118 8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	598 #if DCMTK_VERSION_NUMBER >= 364
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	599 cond = ASC_getApplicationContextName(assoc->params, buf, sizeof(buf));
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	600 #else
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601 cond = ASC_getApplicationContextName(assoc->params, buf);
3118 8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	602 #endif
8849677c2cbc compatibility with dcmtk 3.6.4 s.jodogne@gmail.com parents: 3060 diff changeset	603
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604 if ((cond.bad()) \|\| strcmp(buf, UID_StandardApplicationContext) != 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	605 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	606 /* reject: the application context name is not supported */
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607 T_ASC_RejectParameters rej =
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	608 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	609 ASC_RESULT_REJECTEDPERMANENT,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	610 ASC_SOURCE_SERVICEUSER,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611 ASC_REASON_SU_APPCONTEXTNAMENOTSUPPORTED
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	613
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	614 CLOG(INFO, DICOM) << "Association Rejected: Bad Application Context Name: " << buf;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	615 cond = ASC_rejectAssociation(assoc, &rej);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616 if (cond.bad())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	617 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	618 CLOG(INFO, DICOM) << cond.text();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620 AssociationCleanup(assoc);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	621 return NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	622 }
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	623
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	624 /* check the AETs */
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	625 if (!server.IsMyAETitle(calledAet))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	626 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	627 CLOG(WARNING, DICOM) << "Rejected association, because of a bad called AET in the request (" << calledAet << ")";
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	628 T_ASC_RejectParameters rej =
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	629 {
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	630 ASC_RESULT_REJECTEDPERMANENT,
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	631 ASC_SOURCE_SERVICEUSER,
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	632 ASC_REASON_SU_CALLEDAETITLENOTRECOGNIZED
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	633 };
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	634 ASC_rejectAssociation(assoc, &rej);
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	635 AssociationCleanup(assoc);
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	636 return NULL;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	638
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	639 if (server.HasApplicationEntityFilter() &&
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1786 diff changeset	640 !server.GetApplicationEntityFilter().IsAllowedConnection(remoteIp, remoteAet, calledAet))
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	641 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	642 CLOG(WARNING, DICOM) << "Rejected association for remote AET " << remoteAet << " on IP " << remoteIp;
1163 3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	643 T_ASC_RejectParameters rej =
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	644 {
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	645 ASC_RESULT_REJECTEDPERMANENT,
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	646 ASC_SOURCE_SERVICEUSER,
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	647 ASC_REASON_SU_CALLINGAETITLENOTRECOGNIZED
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	648 };
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	649 ASC_rejectAssociation(assoc, &rej);
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	650 AssociationCleanup(assoc);
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	651 return NULL;
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	652 }
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	653
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	654 if (opt_rejectWithoutImplementationUID &&
3db41779d8f9 abstraction to allow/prevent transfer syntaxes on AET basis Sebastien Jodogne <s.jodogne@gmail.com> parents: 1085 diff changeset	655 strlen(assoc->params->theirImplementationClassUID) == 0)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	657 /* reject: the no implementation Class UID provided */
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	658 T_ASC_RejectParameters rej =
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	659 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	660 ASC_RESULT_REJECTEDPERMANENT,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	661 ASC_SOURCE_SERVICEUSER,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662 ASC_REASON_SU_NOREASON
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	665 CLOG(INFO, DICOM) << "Association Rejected: No Implementation Class UID provided";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	666 cond = ASC_rejectAssociation(assoc, &rej);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	667 if (cond.bad())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	668 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	669 CLOG(INFO, DICOM) << cond.text();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	670 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	671 AssociationCleanup(assoc);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	672 return NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	673 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	674
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	675 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	676 cond = ASC_acknowledgeAssociation(assoc);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677 if (cond.bad())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	678 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	679 CLOG(ERROR, DICOM) << cond.text();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	680 AssociationCleanup(assoc);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	681 return NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	682 }
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	683 CLOG(INFO, DICOM) << "Association Acknowledged (Max Send PDV: " << assoc->sendPDVLength << ")";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684 if (ASC_countAcceptedPresentationContexts(assoc->params) == 0)
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	685 CLOG(INFO, DICOM) << " (but no valid presentation contexts)";
4283 6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	686
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	687 {
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	688 OFString str;
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	689 CLOG(TRACE, DICOM) << "Association Acknowledged Details:" << std::endl
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	690 << ASC_dumpParameters(str, assoc->params, ASC_ASSOC_AC);
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	691 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	693
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	694 IApplicationEntityFilter* filter = server.HasApplicationEntityFilter() ? &server.GetApplicationEntityFilter() : NULL;
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1786 diff changeset	695 return new CommandDispatcher(server, assoc, remoteIp, remoteAet, calledAet, filter);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	696 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	697
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	698
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	699 CommandDispatcher::CommandDispatcher(const DicomServer& server,
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	700 T_ASC_Association* assoc,
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	701 const std::string& remoteIp,
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	702 const std::string& remoteAet,
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	703 const std::string& calledAet,
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	704 IApplicationEntityFilter* filter) :
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	705 server_(server),
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	706 assoc_(assoc),
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	707 remoteIp_(remoteIp),
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	708 remoteAet_(remoteAet),
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	709 calledAet_(calledAet),
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	710 filter_(filter)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	711 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	712 associationTimeout_ = server.GetAssociationTimeout();
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	713 elapsedTimeSinceLastCommand_ = 0;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	714 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	715
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	716
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	717 CommandDispatcher::~CommandDispatcher()
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	718 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	719 try
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	720 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	721 AssociationCleanup(assoc_);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	722 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	723 catch (...)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	724 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	725 CLOG(ERROR, DICOM) << "Some association was not cleanly aborted";
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	726 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	727 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	728
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2068 diff changeset	729
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	730 bool CommandDispatcher::Step()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	731 /*
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	732 * This function receives DIMSE commmands over the network connection
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	733 * and handles these commands correspondingly. Note that in case of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	734 * storscp only C-ECHO-RQ and C-STORE-RQ commands can be processed.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	735 */
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	737 bool finished = false;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739 // receive a DIMSE command over the network, with a timeout of 1 second
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 DcmDataset *statusDetail = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	741 T_ASC_PresentationContextID presID = 0;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742 T_DIMSE_Message msg;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	743
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	744 OFCondition cond = DIMSE_receiveCommand(assoc_, DIMSE_NONBLOCKING, 1, &presID, &msg, &statusDetail);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	745 elapsedTimeSinceLastCommand_++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	746
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	747 // if the command which was received has extra status
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	748 // detail information, dump this information
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	749 if (statusDetail != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	750 {
4288 5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4285 diff changeset	751 std::stringstream s; // DcmObject::PrintHelper cannot be used with VS2008
5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4285 diff changeset	752 statusDetail->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	753 CLOG(TRACE, DICOM) << "Status Detail:" << std::endl << s.str();
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	754
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	755 delete statusDetail;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	756 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	757
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	758 if (cond == DIMSE_OUTOFRESOURCES)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	759 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	760 finished = true;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	761 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	762 else if (cond == DIMSE_NODATAAVAILABLE)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	763 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	764 // Timeout due to DIMSE_NONBLOCKING
2068 879f3be759ef renames to make code clearer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	765 if (associationTimeout_ != 0 &&
879f3be759ef renames to make code clearer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	766 elapsedTimeSinceLastCommand_ >= associationTimeout_)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	767 {
2068 879f3be759ef renames to make code clearer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	768 // This timeout is actually a association timeout
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	769 finished = true;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	770 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	771 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	772 else if (cond == EC_Normal)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	773 {
4283 6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	774 {
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	775 OFString str;
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	776 CLOG(TRACE, DICOM) << "Received Command:" << std::endl
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	777 << DIMSE_dumpMessage(str, msg, DIMSE_INCOMING, NULL, presID);
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	778 }
6b58ceed959e starting debug logs for SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 4199 diff changeset	779
2068 879f3be759ef renames to make code clearer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	780 // Reset the association timeout counter
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	781 elapsedTimeSinceLastCommand_ = 0;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	782
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	783 // Convert the type of request to Orthanc's internal type
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	784 bool supported = false;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	785 DicomRequestType request;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	786 switch (msg.CommandField)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	787 {
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	788 case DIMSE_C_ECHO_RQ:
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	789 request = DicomRequestType_Echo;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	790 supported = true;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	791 break;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	792
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	793 case DIMSE_C_STORE_RQ:
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	794 request = DicomRequestType_Store;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	795 supported = true;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	796 break;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	797
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	798 case DIMSE_C_MOVE_RQ:
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	799 request = DicomRequestType_Move;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	800 supported = true;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	801 break;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	802
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	803 case DIMSE_C_GET_RQ:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	804 request = DicomRequestType_Get;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	805 supported = true;
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	806 break;
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	807
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	808 case DIMSE_C_FIND_RQ:
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	809 request = DicomRequestType_Find;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	810 supported = true;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	811 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	812
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	813 case DIMSE_N_ACTION_RQ:
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	814 request = DicomRequestType_NAction;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	815 supported = true;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	816 break;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	817
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	818 case DIMSE_N_EVENT_REPORT_RQ:
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	819 request = DicomRequestType_NEventReport;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	820 supported = true;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	821 break;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	822
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	823 default:
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	824 // we cannot handle this kind of message
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	825 cond = DIMSE_BADCOMMANDTYPE;
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	826 CLOG(ERROR, DICOM) << "cannot handle command: 0x" << std::hex << msg.CommandField;
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	827 break;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	828 }
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	829
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	831 // Check whether this request is allowed by the security filter
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	832 if (supported &&
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	833 filter_ != NULL &&
1799 4f01c9d73f02 calledAet made available to all the handlers Sebastien Jodogne <s.jodogne@gmail.com> parents: 1786 diff changeset	834 !filter_->IsAllowedRequest(remoteIp_, remoteAet_, calledAet_, request))
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	835 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	836 CLOG(WARNING, DICOM) << "Rejected " << EnumerationToString(request)
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	837 << " request from remote DICOM modality with AET \""
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	838 << remoteAet_ << "\" and hostname \"" << remoteIp_ << "\"";
1085 b161593551db Always allow incoming ECHO requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1073 diff changeset	839 cond = DIMSE_ILLEGALASSOCIATION;
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	840 supported = false;
1085 b161593551db Always allow incoming ECHO requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 1073 diff changeset	841 finished = true;
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	842 }
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	843
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	844 // in case we received a supported message, process this command
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	845 if (supported)
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	846 {
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	847 // If anything goes wrong, there will be a "BADCOMMANDTYPE" answer
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	848 cond = DIMSE_BADCOMMANDTYPE;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	849
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	850 switch (request)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	851 {
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	852 case DicomRequestType_Echo:
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	853 cond = EchoScp(assoc_, &msg, presID);
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	854 break;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	855
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	856 case DicomRequestType_Store:
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	857 if (server_.HasStoreRequestHandlerFactory()) // Should always be true
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	858 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3704 diff changeset	859 std::unique_ptr<IStoreRequestHandler> handler
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	860 (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler());
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	861
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	862 if (handler.get() != NULL)
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	863 {
3704 58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	864 cond = Internals::storeScp(assoc_, &msg, presID, *handler, remoteIp_, associationTimeout_);
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	865 }
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	866 }
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	867 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	868
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	869 case DicomRequestType_Move:
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	870 if (server_.HasMoveRequestHandlerFactory()) // Should always be true
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	871 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3704 diff changeset	872 std::unique_ptr<IMoveRequestHandler> handler
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	873 (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler());
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	874
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	875 if (handler.get() != NULL)
30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	876 {
3704 58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	877 cond = Internals::moveScp(assoc_, &msg, presID, *handler, remoteIp_, remoteAet_, calledAet_, associationTimeout_);
1800 30e97a1f4093 callback for handling worklists with plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1799 diff changeset	878 }
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	879 }
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	880 break;
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	881
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	882 case DicomRequestType_Get:
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	883 if (server_.HasGetRequestHandlerFactory()) // Should always be true
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	884 {
3964 821715370890 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 3959 diff changeset	885 std::unique_ptr<IGetRequestHandler> handler
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	886 (server_.GetGetRequestHandlerFactory().ConstructGetRequestHandler());
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	887
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	888 if (handler.get() != NULL)
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	889 {
3953 620e87e9e816 c-get: fixing memory with failedUIDs_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 3920 diff changeset	890 cond = Internals::getScp(assoc_, &msg, presID, *handler, remoteIp_, remoteAet_, calledAet_, associationTimeout_);
3818 4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	891 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	892 }
4f78da5613a1 Add C-GET SCP support Stacy Loesch <stacy.loesch@varian.com> parents: 3769 diff changeset	893 break;
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	894
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	895 case DicomRequestType_Find:
1786 164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	896 if (server_.HasFindRequestHandlerFactory() \|\| // Should always be true
164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	897 server_.HasWorklistRequestHandlerFactory())
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	898 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3704 diff changeset	899 std::unique_ptr<IFindRequestHandler> findHandler;
1786 164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	900 if (server_.HasFindRequestHandlerFactory())
164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	901 {
164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	902 findHandler.reset(server_.GetFindRequestHandlerFactory().ConstructFindRequestHandler());
164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	903 }
164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	904
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3704 diff changeset	905 std::unique_ptr<IWorklistRequestHandler> worklistHandler;
1786 164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	906 if (server_.HasWorklistRequestHandlerFactory())
164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	907 {
164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	908 worklistHandler.reset(server_.GetWorklistRequestHandlerFactory().ConstructWorklistRequestHandler());
164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	909 }
164d78911382 primitives to handle dicom worklists Sebastien Jodogne <s.jodogne@gmail.com> parents: 1573 diff changeset	910
2381 b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2352 diff changeset	911 cond = Internals::findScp(assoc_, &msg, presID, server_.GetRemoteModalities(),
b8969010b534 uncoupling DCMTK primitives from Orthanc::Configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 2352 diff changeset	912 findHandler.get(), worklistHandler.get(),
3704 58f92b1c8061 Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3691 diff changeset	913 remoteIp_, remoteAet_, calledAet_, associationTimeout_);
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	914 }
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	915 break;
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	916
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	917 case DicomRequestType_NAction:
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	918 cond = NActionScp(&msg, presID);
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	919 break;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	920
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	921 case DicomRequestType_NEventReport:
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	922 cond = NEventReportScp(&msg, presID);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	923 break;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	924
620 4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	925 default:
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	926 // Should never happen
4aa6f0d79947 security filter for dicom requests Sebastien Jodogne <s.jodogne@gmail.com> parents: 503 diff changeset	927 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	928 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	929 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	930 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	931 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	932 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	933 // Bad status, which indicates the closing of the connection by
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	934 // the peer or a network error
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	935 finished = true;
665 41b3e5ccb291 fix for medInria Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	936
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	937 CLOG(INFO, DICOM) << cond.text();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	938 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	939
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940 if (finished)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	942 if (cond == DUL_PEERREQUESTEDRELEASE)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	943 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	944 CLOG(INFO, DICOM) << "Association Release";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	945 ASC_acknowledgeRelease(assoc_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	946 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947 else if (cond == DUL_PEERABORTEDASSOCIATION)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	949 CLOG(INFO, DICOM) << "Association Aborted";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	950 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	951 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	952 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	953 OFString temp_str;
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	954 CLOG(INFO, DICOM) << "DIMSE failure (aborting association): " << cond.text();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	955 /* some kind of error so abort the association */
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	956 ASC_abortAssociation(assoc_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	957 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	958 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	959
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	960 return !finished;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	961 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	962
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	963
1073 01414536c930 complete DICOM conformance Sebastien Jodogne <s.jodogne@gmail.com> parents: 831 diff changeset	964 OFCondition EchoScp(T_ASC_Association * assoc, T_DIMSE_Message * msg, T_ASC_PresentationContextID presID)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	965 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	966 OFString temp_str;
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	967 CLOG(INFO, DICOM) << "Received Echo Request";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	968
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969 /* the echo succeeded !! */
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	970 OFCondition cond = DIMSE_sendEchoResponse(assoc, presID, &msg->msg.CEchoRQ, STATUS_Success, NULL);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	971 if (cond.bad())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	972 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	973 CLOG(ERROR, DICOM) << "Echo SCP Failed: " << cond.text();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	974 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	975 return cond;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	976 }
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	977
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	978
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	979 static DcmDataset* ReadDataset(T_ASC_Association* assoc,
3706 bd34b6ac5c08 timeouts in storage commitment SCU and SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3705 diff changeset	980 const char* errorMessage,
bd34b6ac5c08 timeouts in storage commitment SCU and SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3705 diff changeset	981 int timeout)
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	982 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	983 DcmDataset *tmp = NULL;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	984 T_ASC_PresentationContextID presIdData;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	985
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	986 OFCondition cond = DIMSE_receiveDataSetInMemory(
3706 bd34b6ac5c08 timeouts in storage commitment SCU and SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3705 diff changeset	987 assoc, (timeout ? DIMSE_NONBLOCKING : DIMSE_BLOCKING), timeout,
bd34b6ac5c08 timeouts in storage commitment SCU and SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3705 diff changeset	988 &presIdData, &tmp, NULL, NULL);
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	989 if (!cond.good() \|\|
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	990 tmp == NULL)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	991 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	992 throw OrthancException(ErrorCode_NetworkProtocol, errorMessage);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	993 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	994
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	995 return tmp;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	996 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	997
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	998
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	999 static std::string ReadString(DcmDataset& dataset,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1000 const DcmTagKey& tag)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1001 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1002 const char* s = NULL;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1003 if (!dataset.findAndGetString(tag, s).good() \|\|
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1004 s == NULL)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1005 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1006 char buf[64];
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1007 sprintf(buf, "Missing mandatory tag in dataset: (%04X,%04X)",
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1008 tag.getGroup(), tag.getElement());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1009 throw OrthancException(ErrorCode_NetworkProtocol, buf);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1010 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1011
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1012 return std::string(s);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1013 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1014
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1015
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1016 static void ReadSopSequence(
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1017 std::vector<std::string>& sopClassUids,
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1018 std::vector<std::string>& sopInstanceUids,
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1019 std::vector<StorageCommitmentFailureReason>* failureReasons, // Can be NULL
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1020 DcmDataset& dataset,
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1021 const DcmTagKey& tag,
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1022 bool mandatory)
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1023 {
3614 4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1024 sopClassUids.clear();
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1025 sopInstanceUids.clear();
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1026
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1027 if (failureReasons)
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1028 {
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1029 failureReasons->clear();
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1030 }
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1031
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1032 DcmSequenceOfItems* sequence = NULL;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1033 if (!dataset.findAndGetSequence(tag, sequence).good() \|\|
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1034 sequence == NULL)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1035 {
3614 4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1036 if (mandatory)
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1037 {
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1038 char buf[64];
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1039 sprintf(buf, "Missing mandatory sequence in dataset: (%04X,%04X)",
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1040 tag.getGroup(), tag.getElement());
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1041 throw OrthancException(ErrorCode_NetworkProtocol, buf);
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1042 }
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1043 else
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1044 {
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1045 return;
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1046 }
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1047 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1048
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1049 sopClassUids.reserve(sequence->card());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1050 sopInstanceUids.reserve(sequence->card());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1051
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1052 if (failureReasons)
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1053 {
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1054 failureReasons->reserve(sequence->card());
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1055 }
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1056
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1057 for (unsigned long i = 0; i < sequence->card(); i++)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1058 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1059 const char* a = NULL;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1060 const char* b = NULL;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1061 if (!sequence->getItem(i)->findAndGetString(DCM_ReferencedSOPClassUID, a).good() \|\|
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1062 !sequence->getItem(i)->findAndGetString(DCM_ReferencedSOPInstanceUID, b).good() \|\|
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1063 a == NULL \|\|
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1064 b == NULL)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1065 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1066 throw OrthancException(ErrorCode_NetworkProtocol,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1067 "Missing Referenced SOP Class/Instance UID "
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1068 "in storage commitment dataset");
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1069 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1070
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1071 sopClassUids.push_back(a);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1072 sopInstanceUids.push_back(b);
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1073
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1074 if (failureReasons != NULL)
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1075 {
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1076 Uint16 reason;
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1077 if (!sequence->getItem(i)->findAndGetUint16(DCM_FailureReason, reason).good())
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1078 {
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1079 throw OrthancException(ErrorCode_NetworkProtocol,
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1080 "Missing Failure Reason (0008,1197) "
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1081 "in storage commitment dataset");
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1082 }
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1083
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1084 failureReasons->push_back(static_cast<StorageCommitmentFailureReason>(reason));
0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1085 }
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1086 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1087 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1088
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1089
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1090 OFCondition CommandDispatcher::NActionScp(T_DIMSE_Message* msg,
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1091 T_ASC_PresentationContextID presID)
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1092 {
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1093 /**
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1094 * Starting with Orthanc 1.6.0, only storage commitment is
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1095 * supported with DICOM N-ACTION. This corresponds to the case
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1096 * where "Action Type ID" equals "1".
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1097 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part04/sect_J.3.2.html
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1098 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#table_10.1-4
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1099 **/
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1100
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1101 if (msg->CommandField != DIMSE_N_ACTION_RQ /* value == 304 == 0x0130 */ \|\|
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1102 !server_.HasStorageCommitmentRequestHandlerFactory())
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1103 {
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1104 throw OrthancException(ErrorCode_InternalError);
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1105 }
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1106
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1107
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1108 /**
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1109 * Check that the storage commitment request is correctly formatted.
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1110 **/
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1111
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1112 const T_DIMSE_N_ActionRQ& request = msg->msg.NActionRQ;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1113
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1114 if (request.ActionTypeID != 1)
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1115 {
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1116 throw OrthancException(ErrorCode_NotImplemented,
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1117 "Only storage commitment is implemented for DICOM N-ACTION SCP");
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1118 }
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1119
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1120 if (std::string(request.RequestedSOPClassUID) != UID_StorageCommitmentPushModelSOPClass \|\|
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1121 std::string(request.RequestedSOPInstanceUID) != UID_StorageCommitmentPushModelSOPInstance)
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1122 {
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1123 throw OrthancException(ErrorCode_NetworkProtocol,
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1124 "Unexpected incoming SOP class or instance UID for storage commitment");
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1125 }
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1126
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1127 if (request.DataSetType != DIMSE_DATASET_PRESENT)
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1128 {
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1129 throw OrthancException(ErrorCode_NetworkProtocol,
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1130 "Incoming storage commitment request without a dataset");
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1131 }
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1132
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1133
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1134 /**
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1135 * Extract the DICOM dataset that is associated with the DIMSE
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1136 * message. The content of this dataset is documented in "Table
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1137 * J.3-1. Storage Commitment Request - Action Information":
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1138 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part04/sect_J.3.2.html#table_J.3-1
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1139 **/
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1140
3767 c6658187e4b1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 3736 diff changeset	1141 std::unique_ptr<DcmDataset> dataset(
3706 bd34b6ac5c08 timeouts in storage commitment SCU and SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3705 diff changeset	1142 ReadDataset(assoc_, "Cannot read the dataset in N-ACTION SCP", associationTimeout_));
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	1143 assert(dataset.get() != NULL);
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1144
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	1145 {
4288 5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4285 diff changeset	1146 std::stringstream s; // DcmObject::PrintHelper cannot be used with VS2008
5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4285 diff changeset	1147 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	1148 CLOG(TRACE, DICOM) << "Received Storage Commitment Request:" << std::endl << s.str();
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	1149 }
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	1150
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1151 std::string transactionUid = ReadString(*dataset, DCM_TransactionUID);
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1152
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1153 std::vector<std::string> sopClassUid, sopInstanceUid;
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1154 ReadSopSequence(sopClassUid, sopInstanceUid, NULL,
3614 4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1155 dataset, DCM_ReferencedSOPSequence, true / mandatory */);
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1156
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1157 CLOG(INFO, DICOM) << "Incoming storage commitment request, with transaction UID: " << transactionUid;
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1158
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1159 for (size_t i = 0; i < sopClassUid.size(); i++)
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1160 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1161 CLOG(INFO, DICOM) << " (" << (i + 1) << "/" << sopClassUid.size()
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1162 << ") queried SOP Class/Instance UID: "
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1163 << sopClassUid[i] << " / " << sopInstanceUid[i];
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1164 }
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1165
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1166
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1167 /**
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1168 * Call the Orthanc handler. The list of available DIMSE status
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1169 * codes can be found at:
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1170 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#sect_10.1.4.1.10
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1171 **/
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1172
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1173 DIC_US dimseStatus;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1174
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1175 try
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1176 {
3767 c6658187e4b1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 3736 diff changeset	1177 std::unique_ptr<IStorageCommitmentRequestHandler> handler
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1178 (server_.GetStorageCommitmentRequestHandlerFactory().
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1179 ConstructStorageCommitmentRequestHandler());
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1180
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1181 handler->HandleRequest(transactionUid, sopClassUid, sopInstanceUid,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1182 remoteIp_, remoteAet_, calledAet_);
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1183
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1184 dimseStatus = 0; // Success
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1185 }
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1186 catch (OrthancException& e)
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1187 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1188 CLOG(ERROR, DICOM) << "Error while processing an incoming storage commitment request: " << e.What();
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1189
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1190 // Code 0x0110 - "General failure in processing the operation was encountered"
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1191 dimseStatus = STATUS_N_ProcessingFailure;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1192 }
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1193
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1194
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1195 /**
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1196 * Send the DIMSE status back to the SCU.
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1197 **/
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1198
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1199 {
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1200 T_DIMSE_Message response;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1201 memset(&response, 0, sizeof(response));
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1202 response.CommandField = DIMSE_N_ACTION_RSP;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1203
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1204 T_DIMSE_N_ActionRSP& content = response.msg.NActionRSP;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1205 content.MessageIDBeingRespondedTo = request.MessageID;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1206 strncpy(content.AffectedSOPClassUID, UID_StorageCommitmentPushModelSOPClass, DIC_UI_LEN);
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1207 content.DimseStatus = dimseStatus;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1208 strncpy(content.AffectedSOPInstanceUID, UID_StorageCommitmentPushModelSOPInstance, DIC_UI_LEN);
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1209 content.ActionTypeID = 0; // Not present, as "O_NACTION_ACTIONTYPEID" not set in "opts"
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1210 content.DataSetType = DIMSE_DATASET_NULL; // Dataset is absent in storage commitment response
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1211 content.opts = O_NACTION_AFFECTEDSOPCLASSUID \| O_NACTION_AFFECTEDSOPINSTANCEUID;
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1212
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	1213 {
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	1214 OFString str;
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	1215 CLOG(TRACE, DICOM) << "Sending Storage Commitment Request Response:" << std::endl
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	1216 << DIMSE_dumpMessage(str, response, DIMSE_OUTGOING);
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	1217 }
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	1218
3604 e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1219 return DIMSE_sendMessageUsingMemoryData(
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1220 assoc_, presID, &response, NULL /* no dataset /, NULL / dataObject */,
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1221 NULL /* callback /, NULL / callback context /, NULL / commandSet */);
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1222 }
e327b44780bb abstraction: storage commitment handler Sebastien Jodogne <s.jodogne@gmail.com> parents: 3451 diff changeset	1223 }
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1224
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1225
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1226 OFCondition CommandDispatcher::NEventReportScp(T_DIMSE_Message* msg,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1227 T_ASC_PresentationContextID presID)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1228 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1229 /**
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1230 * Starting with Orthanc 1.6.0, handling N-EVENT-REPORT for
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1231 * storage commitment.
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1232 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part04/sect_J.3.3.html
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1233 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#table_10.1-1
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1234 **/
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1235
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1236 if (msg->CommandField != DIMSE_N_EVENT_REPORT_RQ /* value == 256 == 0x0100 */ \|\|
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1237 !server_.HasStorageCommitmentRequestHandlerFactory())
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1238 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1239 throw OrthancException(ErrorCode_InternalError);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1240 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1241
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1242
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1243 /**
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1244 * Check that the storage commitment report is correctly formatted.
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1245 **/
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1246
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1247 const T_DIMSE_N_EventReportRQ& report = msg->msg.NEventReportRQ;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1248
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1249 if (report.EventTypeID != 1 /* successful */ &&
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1250 report.EventTypeID != 2 /* failures exist */)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1251 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1252 throw OrthancException(ErrorCode_NotImplemented,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1253 "Unknown event for DICOM N-EVENT-REPORT SCP");
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1254 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1255
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1256 if (std::string(report.AffectedSOPClassUID) != UID_StorageCommitmentPushModelSOPClass \|\|
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1257 std::string(report.AffectedSOPInstanceUID) != UID_StorageCommitmentPushModelSOPInstance)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1258 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1259 throw OrthancException(ErrorCode_NetworkProtocol,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1260 "Unexpected incoming SOP class or instance UID for storage commitment");
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1261 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1262
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1263 if (report.DataSetType != DIMSE_DATASET_PRESENT)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1264 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1265 throw OrthancException(ErrorCode_NetworkProtocol,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1266 "Incoming storage commitment report without a dataset");
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1267 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1268
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1269
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1270 /**
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1271 * Extract the DICOM dataset that is associated with the DIMSE
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1272 * message. The content of this dataset is documented in "Table
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1273 * J.3-2. Storage Commitment Result - Event Information":
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1274 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part04/sect_J.3.3.html#table_J.3-2
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1275 **/
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1276
3767 c6658187e4b1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 3736 diff changeset	1277 std::unique_ptr<DcmDataset> dataset(
3706 bd34b6ac5c08 timeouts in storage commitment SCU and SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 3705 diff changeset	1278 ReadDataset(assoc_, "Cannot read the dataset in N-EVENT-REPORT SCP", associationTimeout_));
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	1279 assert(dataset.get() != NULL);
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1280
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	1281 {
4288 5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4285 diff changeset	1282 std::stringstream s; // DcmObject::PrintHelper cannot be used with VS2008
5b254bd435d3 fix for VS2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4285 diff changeset	1283 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	1284 CLOG(TRACE, DICOM) << "Received Storage Commitment Report:" << std::endl << s.str();
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	1285 }
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	1286
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1287 std::string transactionUid = ReadString(*dataset, DCM_TransactionUID);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1288
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1289 std::vector<std::string> successSopClassUid, successSopInstanceUid;
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1290 ReadSopSequence(successSopClassUid, successSopInstanceUid, NULL,
3614 4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1291 *dataset, DCM_ReferencedSOPSequence,
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1292 (report.EventTypeID == 1) /* mandatory in the case of success */);
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1293
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1294 std::vector<std::string> failedSopClassUid, failedSopInstanceUid;
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1295 std::vector<StorageCommitmentFailureReason> failureReasons;
3614 4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1296
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1297 if (report.EventTypeID == 2 /* failures exist */)
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1298 {
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1299 ReadSopSequence(failedSopClassUid, failedSopInstanceUid, &failureReasons,
3614 4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1300 *dataset, DCM_FailedSOPSequence, true);
4543ffad256d storage commitment requests/responses to/from self are working Sebastien Jodogne <s.jodogne@gmail.com> parents: 3613 diff changeset	1301 }
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1302
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1303 CLOG(INFO, DICOM) << "Incoming storage commitment report, with transaction UID: " << transactionUid;
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1304
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1305 for (size_t i = 0; i < successSopClassUid.size(); i++)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1306 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1307 CLOG(INFO, DICOM) << " (success " << (i + 1) << "/" << successSopClassUid.size()
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1308 << ") SOP Class/Instance UID: "
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1309 << successSopClassUid[i] << " / " << successSopInstanceUid[i];
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1310 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1311
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1312 for (size_t i = 0; i < failedSopClassUid.size(); i++)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1313 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1314 CLOG(INFO, DICOM) << " (failure " << (i + 1) << "/" << failedSopClassUid.size()
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1315 << ") SOP Class/Instance UID: "
756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1316 << failedSopClassUid[i] << " / " << failedSopInstanceUid[i];
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1317 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1318
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1319 /**
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1320 * Call the Orthanc handler. The list of available DIMSE status
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1321 * codes can be found at:
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1322 * http://dicom.nema.org/medical/dicom/2019a/output/chtml/part07/chapter_10.html#sect_10.1.4.1.10
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1323 **/
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1324
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1325 DIC_US dimseStatus;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1326
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1327 try
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1328 {
3767 c6658187e4b1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 3736 diff changeset	1329 std::unique_ptr<IStorageCommitmentRequestHandler> handler
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1330 (server_.GetStorageCommitmentRequestHandlerFactory().
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1331 ConstructStorageCommitmentRequestHandler());
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1332
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1333 handler->HandleReport(transactionUid, successSopClassUid, successSopInstanceUid,
3736 0540b54324f1 StorageCommitmentReports Sebastien Jodogne <s.jodogne@gmail.com> parents: 3713 diff changeset	1334 failedSopClassUid, failedSopInstanceUid, failureReasons,
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1335 remoteIp_, remoteAet_, calledAet_);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1336
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1337 dimseStatus = 0; // Success
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1338 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1339 catch (OrthancException& e)
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1340 {
4284 756126cd2219 moving all logs from DicomNetworking folder into the "dicom" category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4283 diff changeset	1341 CLOG(ERROR, DICOM) << "Error while processing an incoming storage commitment report: " << e.What();
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1342
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1343 // Code 0x0110 - "General failure in processing the operation was encountered"
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1344 dimseStatus = STATUS_N_ProcessingFailure;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1345 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1346
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1347
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1348 /**
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1349 * Send the DIMSE status back to the SCU.
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1350 **/
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1351
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1352 {
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1353 T_DIMSE_Message response;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1354 memset(&response, 0, sizeof(response));
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1355 response.CommandField = DIMSE_N_EVENT_REPORT_RSP;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1356
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1357 T_DIMSE_N_EventReportRSP& content = response.msg.NEventReportRSP;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1358 content.MessageIDBeingRespondedTo = report.MessageID;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1359 strncpy(content.AffectedSOPClassUID, UID_StorageCommitmentPushModelSOPClass, DIC_UI_LEN);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1360 content.DimseStatus = dimseStatus;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1361 strncpy(content.AffectedSOPInstanceUID, UID_StorageCommitmentPushModelSOPInstance, DIC_UI_LEN);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1362 content.EventTypeID = 0; // Not present, as "O_NEVENTREPORT_EVENTTYPEID" not set in "opts"
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1363 content.DataSetType = DIMSE_DATASET_NULL; // Dataset is absent in storage commitment response
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1364 content.opts = O_NEVENTREPORT_AFFECTEDSOPCLASSUID \| O_NEVENTREPORT_AFFECTEDSOPINSTANCEUID;
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1365
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	1366 {
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	1367 OFString str;
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	1368 CLOG(TRACE, DICOM) << "Sending Storage Commitment Report Response:" << std::endl
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	1369 << DIMSE_dumpMessage(str, response, DIMSE_OUTGOING);
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	1370 }
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	1371
3613 c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1372 return DIMSE_sendMessageUsingMemoryData(
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1373 assoc_, presID, &response, NULL /* no dataset /, NULL / dataObject */,
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1374 NULL /* callback /, NULL / callback context /, NULL / commandSet */);
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1375 }
c1e2b91c2ab4 all the abstractions for storage commitment are available Sebastien Jodogne <s.jodogne@gmail.com> parents: 3612 diff changeset	1376 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1377 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1378 }

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp @ 4288:5b254bd435d3