orthanc: OrthancServer/DicomProtocol/DicomUserConnection.cpp annotate

annotate OrthancServer/DicomProtocol/DicomUserConnection.cpp @ 1429:7366a0bdda6a

attempt of fix for Syngo.Via

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 29 Jun 2015 14:43:08 +0200
parents	d710ea64f0fd
children	f967bdf8534e

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
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1285 diff changeset	3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1285 diff changeset	4 * Department, University Hospital of Liege, Belgium
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * License, or (at your option) any later version.
136 fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	10 *
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	11 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	12 * program give permission to link the code of its release with the
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	14 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	15 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	16 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	17 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	18 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	19 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	20 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	21 * in the program, then also delete it here.
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 * 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	24 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * General Public License for more details.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 *
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
766 0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	33
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	34 /*=========================================================================
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	35
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	36 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: 763 diff changeset	37
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	38 Program: DCMTK 3.6.0
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	39 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: 763 diff changeset	40
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	41 Copyright (C) 1994-2011, OFFIS e.V.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	42 All rights reserved.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	43
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	44 This software and supporting documentation were developed by
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	45
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	46 OFFIS e.V.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	47 R&D Division Health
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	48 Escherweg 2
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	49 26121 Oldenburg, Germany
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	50
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	51 Redistribution and use in source and binary forms, with or without
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	52 modification, are permitted provided that the following conditions
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	53 are met:
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	54
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	55 - Redistributions of source code must retain the above copyright
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	56 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: 763 diff changeset	57
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	58 - Redistributions in binary form must reproduce the above copyright
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	59 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: 763 diff changeset	60 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: 763 diff changeset	61
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	62 - Neither the name of OFFIS nor the names of its contributors may be
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	63 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: 763 diff changeset	64 without specific prior written permission.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	65
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	66 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	67 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	68 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	69 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	70 HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	71 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	72 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	73 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	74 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	75 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	76 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	77
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	78 =========================================================================*/
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	79
0a2f8c707c78 Fix missing licensing terms about reuse of some DCMTK code Sebastien Jodogne <s.jodogne@gmail.com> parents: 763 diff changeset	80
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	81 #include "../PrecompiledHeadersServer.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 #include "DicomUserConnection.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	84 #include "../../Core/OrthancException.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 #include "../ToDcmtkBridge.h"
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 #include "../FromDcmtkBridge.h"
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	87 #include "../../Core/DicomFormat/DicomArray.h"
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 #include <dcmtk/dcmdata/dcistrmb.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 #include <dcmtk/dcmdata/dcistrmf.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 #include <dcmtk/dcmdata/dcfilefo.h>
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	92 #include <dcmtk/dcmdata/dcmetinf.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 #include <dcmtk/dcmnet/diutil.h>
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 #include <set>
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	96 #include <glog/logging.h>
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100 #ifdef _WIN32
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101 /**
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102 * "The maximum length, in bytes, of the string returned in the buffer
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103 * pointed to by the name parameter is dependent on the namespace provider,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104 * but this string must be 256 bytes or less.
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105 * http://msdn.microsoft.com/en-us/library/windows/desktop/ms738527(v=vs.85).aspx
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 **/
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107 #define HOST_NAME_MAX 256
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108 #endif
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110
918 ac8f68cbdbb6 build cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 725 diff changeset	111 #if !defined(HOST_NAME_MAX) && defined(_POSIX_HOST_NAME_MAX)
890 816dccaeb7cf Support of kFreeBSD jodogne parents: 831 diff changeset	112 /**
816dccaeb7cf Support of kFreeBSD jodogne parents: 831 diff changeset	113 * TO IMPROVE: "_POSIX_HOST_NAME_MAX is only the minimum value that
816dccaeb7cf Support of kFreeBSD jodogne parents: 831 diff changeset	114 * HOST_NAME_MAX can ever have [...] Therefore you cannot allocate an
816dccaeb7cf Support of kFreeBSD jodogne parents: 831 diff changeset	115 * array of size _POSIX_HOST_NAME_MAX, invoke gethostname() and expect
816dccaeb7cf Support of kFreeBSD jodogne parents: 831 diff changeset	116 * that the result will fit."
816dccaeb7cf Support of kFreeBSD jodogne parents: 831 diff changeset	117 * http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00128.html
816dccaeb7cf Support of kFreeBSD jodogne parents: 831 diff changeset	118 **/
816dccaeb7cf Support of kFreeBSD jodogne parents: 831 diff changeset	119 #define HOST_NAME_MAX _POSIX_HOST_NAME_MAX
816dccaeb7cf Support of kFreeBSD jodogne parents: 831 diff changeset	120 #endif
816dccaeb7cf Support of kFreeBSD jodogne parents: 831 diff changeset	121
816dccaeb7cf Support of kFreeBSD jodogne parents: 831 diff changeset	122
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	123 static const char* DEFAULT_PREFERRED_TRANSFER_SYNTAX = UID_LittleEndianImplicitTransferSyntax;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	124
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	125 /**
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	126 * "If we have more than 64 storage SOP classes, tools such as
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	127 * storescu will fail because they attempt to negotiate two
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	128 * presentation contexts for each SOP class, and there is a total
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	129 * limit of 128 contexts for one association."
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	130 **/
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	131 static const unsigned int MAXIMUM_STORAGE_SOP_CLASSES = 64;
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	132
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	133
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	134 namespace Orthanc
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 struct DicomUserConnection::PImpl
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138 // Connection state
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	139 uint32_t dimseTimeout_;
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	140 uint32_t acseTimeout_;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141 T_ASC_Network* net_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 T_ASC_Parameters* params_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 T_ASC_Association* assoc_;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 bool IsOpen() const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 return assoc_ != NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 void CheckIsOpen() const;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	152 void Store(DcmInputStream& is, DicomUserConnection& connection);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153 };
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156 static void Check(const OFCondition& cond)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 if (cond.bad())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 {
1017 9d0c7301596e storescp modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	160 LOG(ERROR) << "DicomUserConnection: " << std::string(cond.text());
9d0c7301596e storescp modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	161 throw OrthancException(ErrorCode_NetworkProtocol);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165 void DicomUserConnection::PImpl::CheckIsOpen() const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 if (!IsOpen())
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168 {
1017 9d0c7301596e storescp modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	169 LOG(ERROR) << "DicomUserConnection: First open the connection";
9d0c7301596e storescp modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 942 diff changeset	170 throw OrthancException(ErrorCode_NetworkProtocol);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 void DicomUserConnection::CheckIsOpen() const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 pimpl_->CheckIsOpen();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	181 static void RegisterStorageSOPClass(T_ASC_Parameters* params,
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	182 unsigned int& presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	183 const std::string& sopClass,
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	184 const char* asPreferred[],
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	185 std::vector<const char*>& asFallback)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186 {
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	187 Check(ASC_addPresentationContext(params, presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	188 sopClass.c_str(), asPreferred, 1));
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	189 presentationContextId += 2;
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	190
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	191 if (asFallback.size() > 0)
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	192 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	193 Check(ASC_addPresentationContext(params, presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	194 sopClass.c_str(), &asFallback[0], asFallback.size()));
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	195 presentationContextId += 2;
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	196 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 }
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	198
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	199
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	200 void DicomUserConnection::SetupPresentationContexts(const std::string& preferredTransferSyntax)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 {
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	202 // Flatten an array with the preferred transfer syntax
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	203 const char* asPreferred[1] = { preferredTransferSyntax.c_str() };
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	204
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	205 // Setup the fallback transfer syntaxes
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	206 std::set<std::string> fallbackSyntaxes;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	207 fallbackSyntaxes.insert(UID_LittleEndianExplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	208 fallbackSyntaxes.insert(UID_BigEndianExplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	209 fallbackSyntaxes.insert(UID_LittleEndianImplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	210 fallbackSyntaxes.erase(preferredTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	211
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	212 // Flatten an array with the fallback transfer syntaxes
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	213 std::vector<const char*> asFallback;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	214 asFallback.reserve(fallbackSyntaxes.size());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	215 for (std::set<std::string>::const_iterator
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	216 it = fallbackSyntaxes.begin(); it != fallbackSyntaxes.end(); ++it)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	217 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	218 asFallback.push_back(it->c_str());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	219 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	221 CheckStorageSOPClassesInvariant();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 unsigned int presentationContextId = 1;
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	223
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	224 for (std::list<std::string>::const_iterator it = reservedStorageSOPClasses_.begin();
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 930 diff changeset	225 it != reservedStorageSOPClasses_.end(); ++it)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 {
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	227 RegisterStorageSOPClass(pimpl_->params_, presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	228 *it, asPreferred, asFallback);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	229 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	231 for (std::set<std::string>::const_iterator it = storageSOPClasses_.begin();
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 930 diff changeset	232 it != storageSOPClasses_.end(); ++it)
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	233 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	234 RegisterStorageSOPClass(pimpl_->params_, presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	235 *it, asPreferred, asFallback);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	236 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	237
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	238 for (std::set<std::string>::const_iterator it = defaultStorageSOPClasses_.begin();
942 b3f6fb1130cd fixes thanks to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 930 diff changeset	239 it != defaultStorageSOPClasses_.end(); ++it)
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	240 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	241 RegisterStorageSOPClass(pimpl_->params_, presentationContextId,
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	242 *it, asPreferred, asFallback);
0 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 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	247 static bool IsGenericTransferSyntax(const std::string& syntax)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	248 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	249 return (syntax == UID_LittleEndianExplicitTransferSyntax \|\|
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	250 syntax == UID_BigEndianExplicitTransferSyntax \|\|
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	251 syntax == UID_LittleEndianImplicitTransferSyntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	252 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	253
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	254
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	255 void DicomUserConnection::PImpl::Store(DcmInputStream& is, DicomUserConnection& connection)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 CheckIsOpen();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 DcmFileFormat dcmff;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260 Check(dcmff.read(is, EXS_Unknown, EGL_noChange, DCM_MaxReadLength));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	262 // Determine the storage SOP class UID for this instance
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	263 static const DcmTagKey DCM_SOP_CLASS_UID(0x0008, 0x0016);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	264 OFString sopClassUid;
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	265 if (dcmff.getDataset()->findAndGetOFString(DCM_SOP_CLASS_UID, sopClassUid).good())
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	266 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	267 connection.AddStorageSOPClass(sopClassUid.c_str());
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	268 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	269
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	270 // Determine whether a new presentation context must be
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	271 // negotiated, depending on the transfer syntax of this instance
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	272 DcmXfer xfer(dcmff.getDataset()->getOriginalXfer());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	273 const std::string syntax(xfer.getXferID());
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	274 bool isGeneric = IsGenericTransferSyntax(syntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	275
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	276 if (isGeneric ^ IsGenericTransferSyntax(connection.GetPreferredTransferSyntax()))
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	277 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	278 // Making a generic-to-specific or specific-to-generic change of
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	279 // the transfer syntax. Renegotiate the connection.
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	280 LOG(INFO) << "Change in the transfer syntax: the C-Store associated must be renegotiated";
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	281
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	282 if (isGeneric)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	283 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	284 connection.ResetPreferredTransferSyntax();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	285 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	286 else
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	287 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	288 connection.SetPreferredTransferSyntax(syntax);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	289 }
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	290 }
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	291
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	292 if (!connection.IsOpen())
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	293 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	294 LOG(INFO) << "Renegotiating a C-Store association due to a change in the parameters";
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	295 connection.Open();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	296 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	297
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298 // Figure out which SOP class and SOP instance is encapsulated in the file
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299 DIC_UI sopClass;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 DIC_UI sopInstance;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 if (!DU_findSOPClassAndInstanceInDataSet(dcmff.getDataset(), sopClass, sopInstance))
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	303 throw OrthancException("DicomUserConnection: Unable to find the SOP class and instance");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 // Figure out which of the accepted presentation contexts should be used
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 int presID = ASC_findAcceptedPresentationContextID(assoc_, sopClass);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 if (presID == 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310 const char *modalityName = dcmSOPClassUIDToModality(sopClass);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 if (!modalityName) modalityName = dcmFindNameOfUID(sopClass);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 if (!modalityName) modalityName = "unknown SOP class";
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	313 throw OrthancException("DicomUserConnection: No presentation context for modality " +
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	314 std::string(modalityName));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 // Prepare the transmission of data
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318 T_DIMSE_C_StoreRQ req;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319 memset(&req, 0, sizeof(req));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 req.MessageID = assoc_->nextMsgID++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321 strcpy(req.AffectedSOPClassUID, sopClass);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322 strcpy(req.AffectedSOPInstanceUID, sopInstance);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 req.DataSetType = DIMSE_DATASET_PRESENT;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 req.Priority = DIMSE_PRIORITY_MEDIUM;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 // Finally conduct transmission of data
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 T_DIMSE_C_StoreRSP rsp;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328 DcmDataset* statusDetail = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 Check(DIMSE_storeUser(assoc_, presID, &req,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 NULL, dcmff.getDataset(), /progressCallback/ NULL, NULL,
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	331 /opt_blockMode/ DIMSE_BLOCKING, /opt_dimse_timeout/ dimseTimeout_,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 &rsp, &statusDetail, NULL));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 if (statusDetail != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336 delete statusDetail;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	341 namespace
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	342 {
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	343 struct FindPayload
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	344 {
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	345 DicomFindAnswers* answers;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	346 std::string level;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	347 };
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	348 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	349
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	350
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 static void FindCallback(
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 /* in */
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 void *callbackData,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 T_DIMSE_C_FindRQ request, / original find request */
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 int responseCount,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 T_DIMSE_C_FindRSP response, / pending response received */
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 DcmDataset responseIdentifiers / pending response identifiers */
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 )
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 {
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	360 FindPayload& payload = reinterpret_cast<FindPayload>(callbackData);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 if (responseIdentifiers != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 DicomMap m;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 FromDcmtkBridge::Convert(m, *responseIdentifiers);
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	366
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	367 if (!m.HasTag(DICOM_TAG_QUERY_RETRIEVE_LEVEL))
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	368 {
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	369 m.SetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL, payload.level);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	370 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	371
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	372 payload.answers->Add(m);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	375
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	376
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	377 static void CheckFindQuery(ResourceType level,
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	378 const DicomMap& fields)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	379 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	380 std::set<DicomTag> allowedTags;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	381
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	382 // WARNING: Do not add "break" or reorder items in this switch-case!
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	383 switch (level)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	384 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	385 case ResourceType_Instance:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	386 DicomTag::AddTagsForModule(allowedTags, DicomModule_Instance);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	387
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	388 case ResourceType_Series:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	389 DicomTag::AddTagsForModule(allowedTags, DicomModule_Series);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	390
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	391 case ResourceType_Study:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	392 DicomTag::AddTagsForModule(allowedTags, DicomModule_Study);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	393
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	394 case ResourceType_Patient:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	395 DicomTag::AddTagsForModule(allowedTags, DicomModule_Patient);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	396 break;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	397
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	398 default:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	399 throw OrthancException(ErrorCode_InternalError);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	400 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	401
1371 f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	402 if (level == ResourceType_Study)
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	403 {
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	404 allowedTags.insert(DICOM_TAG_MODALITIES_IN_STUDY);
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	405 }
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	406
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	407 allowedTags.insert(DICOM_TAG_SPECIFIC_CHARACTER_SET);
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	408
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	409 DicomArray query(fields);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	410 for (size_t i = 0; i < query.GetSize(); i++)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	411 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	412 const DicomTag& tag = query.GetElement(i).GetTag();
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	413 if (allowedTags.find(tag) == allowedTags.end())
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	414 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	415 LOG(ERROR) << "Tag not allowed for this C-Find level: " << tag;
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	416 throw OrthancException(ErrorCode_BadRequest);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	417 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	418 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	419 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	420
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	421
1429 7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	422 static DcmDataset* ConvertQueryFields(const DicomMap& fields,
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	423 ModalityManufacturer manufacturer)
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	424 {
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	425 switch (manufacturer)
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	426 {
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	427 case ModalityManufacturer_SyngoVia:
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	428 {
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	429 std::auto_ptr<DicomMap> fix(fields.Clone());
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	430
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	431 // This issue for Syngo.Via and its solution was reported by
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	432 // Emsy Chan by private mail on June 17th, 2015.
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	433 std::set<DicomTag> tags;
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	434 fix->GetTags(tags);
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	435
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	436 for (std::set<DicomTag>::const_iterator it = tags.begin(); it != tags.end(); ++it)
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	437 {
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	438 if (FromDcmtkBridge::GetValueRepresentation(*it) == ValueRepresentation_Date)
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	439 {
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	440 // Replace a "*" query by an empty query ("") for "date"
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	441 // value representations. Necessary to search over dates
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	442 // in Syngo.Via.
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	443 const DicomValue* value = fix->TestAndGetValue(*it);
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	444
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	445 if (value != NULL &&
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	446 value->AsString() == "*")
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	447 {
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	448 fix->SetValue(*it, "");
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	449 }
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	450 }
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	451 }
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	452
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	453 return ToDcmtkBridge::Convert(*fix);
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	454 }
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	455
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	456 default:
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	457 return ToDcmtkBridge::Convert(fields);
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	458 }
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	459 }
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	460
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	461
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462 void DicomUserConnection::Find(DicomFindAnswers& result,
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	463 ResourceType level,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 const DicomMap& fields)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	466 CheckFindQuery(level, fields);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	467
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	468 CheckIsOpen();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	469
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	470 FindPayload payload;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	471 payload.answers = &result;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	472
1429 7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	473 std::auto_ptr<DcmDataset> dataset(ConvertQueryFields(fields, manufacturer_));
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	474
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 const char* sopClass;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	476 switch (level)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 {
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	478 case ResourceType_Patient:
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	479 payload.level = "PATIENT";
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	480 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "PATIENT");
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	481 sopClass = UID_FINDPatientRootQueryRetrieveInformationModel;
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	482 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	484 case ResourceType_Study:
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	485 payload.level = "STUDY";
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	486 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "STUDY");
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	487 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel;
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	488 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	490 case ResourceType_Series:
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	491 payload.level = "SERIES";
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	492 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "SERIES");
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	493 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel;
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	494 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	496 case ResourceType_Instance:
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	497 payload.level = "INSTANCE";
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	498 if (manufacturer_ == ModalityManufacturer_ClearCanvas \|\|
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	499 manufacturer_ == ModalityManufacturer_Dcm4Chee)
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	500 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	501 // This is a particular case for ClearCanvas, thanks to Peter Somlo <peter.somlo@gmail.com>.
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	502 // https://groups.google.com/d/msg/orthanc-users/j-6C3MAVwiw/iolB9hclom8J
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	503 // http://www.clearcanvas.ca/Home/Community/OldForums/tabid/526/aff/11/aft/14670/afv/topic/Default.aspx
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	504 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "IMAGE");
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	505 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	506 else
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	507 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	508 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "INSTANCE");
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	509 }
519 1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	510
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	511 sopClass = UID_FINDStudyRootQueryRetrieveInformationModel;
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	512 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	514 default:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	515 throw OrthancException(ErrorCode_ParameterOutOfRange);
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	516 }
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	517
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	518 // Add the expected tags for this query level.
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	519 // WARNING: Do not reorder or add "break" in this switch-case!
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	520 switch (level)
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	521 {
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	522 case ResourceType_Instance:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	523 // SOP Instance UID
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	524 if (!fields.HasTag(0x0008, 0x0018))
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	525 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0018), "");
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	526
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	527 case ResourceType_Series:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	528 // Series instance UID
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	529 if (!fields.HasTag(0x0020, 0x000e))
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	530 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0020, 0x000e), "");
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	531
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	532 case ResourceType_Study:
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	533 // Accession number
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	534 if (!fields.HasTag(0x0008, 0x0050))
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	535 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0050), "");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	537 // Study instance UID
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	538 if (!fields.HasTag(0x0020, 0x000d))
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	539 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0020, 0x000d), "");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540
1368 b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	541 case ResourceType_Patient:
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	542 // Patient ID
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	543 if (!fields.HasTag(0x0010, 0x0020))
b22ba8c5edbe query retrieve Sebastien Jodogne <s.jodogne@gmail.com> parents: 1366 diff changeset	544 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0010, 0x0020), "");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	545
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	546 break;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	548 default:
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	549 throw OrthancException(ErrorCode_ParameterOutOfRange);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	550 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552 // Figure out which of the accepted presentation contexts should be used
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	553 int presID = ASC_findAcceptedPresentationContextID(pimpl_->assoc_, sopClass);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554 if (presID == 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 {
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	556 throw OrthancException("DicomUserConnection: The C-FIND command is not supported by the remote AET");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	557 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	559 T_DIMSE_C_FindRQ request;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	560 memset(&request, 0, sizeof(request));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	561 request.MessageID = pimpl_->assoc_->nextMsgID++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	562 strcpy(request.AffectedSOPClassUID, sopClass);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	563 request.DataSetType = DIMSE_DATASET_PRESENT;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	564 request.Priority = DIMSE_PRIORITY_MEDIUM;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	565
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	566 T_DIMSE_C_FindRSP response;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	567 DcmDataset* statusDetail = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	568 OFCondition cond = DIMSE_findUser(pimpl_->assoc_, presID, &request, dataset.get(),
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	569 FindCallback, &payload,
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	570 /opt_blockMode/ DIMSE_BLOCKING,
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	571 /opt_dimse_timeout/ pimpl_->dimseTimeout_,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	572 &response, &statusDetail);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	573
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574 if (statusDetail)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	575 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	576 delete statusDetail;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	577 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	578
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	579 Check(cond);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	580 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	581
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	582
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	583 void DicomUserConnection::MoveInternal(const std::string& targetAet,
1371 f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	584 ResourceType level,
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	585 const DicomMap& fields)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587 CheckIsOpen();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	588
1429 7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	589 std::auto_ptr<DcmDataset> dataset(ConvertQueryFields(fields, manufacturer_));
7366a0bdda6a attempt of fix for Syngo.Via Sebastien Jodogne <s.jodogne@gmail.com> parents: 1427 diff changeset	590
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591 const char* sopClass = UID_MOVEStudyRootQueryRetrieveInformationModel;
1371 f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	592 switch (level)
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	593 {
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	594 case ResourceType_Patient:
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	595 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "PATIENT");
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	596 break;
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	597
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	598 case ResourceType_Study:
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	599 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "STUDY");
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	600 break;
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	601
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	602 case ResourceType_Series:
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	603 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "SERIES");
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	604 break;
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	605
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	606 case ResourceType_Instance:
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	607 if (manufacturer_ == ModalityManufacturer_ClearCanvas \|\|
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	608 manufacturer_ == ModalityManufacturer_Dcm4Chee)
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	609 {
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	610 // This is a particular case for ClearCanvas, thanks to Peter Somlo <peter.somlo@gmail.com>.
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	611 // https://groups.google.com/d/msg/orthanc-users/j-6C3MAVwiw/iolB9hclom8J
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	612 // http://www.clearcanvas.ca/Home/Community/OldForums/tabid/526/aff/11/aft/14670/afv/topic/Default.aspx
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	613 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "IMAGE");
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	614 }
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	615 else
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	616 {
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	617 DU_putStringDOElement(dataset.get(), DcmTagKey(0x0008, 0x0052), "INSTANCE");
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	618 }
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	619 break;
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	620
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	621 default:
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	622 throw OrthancException(ErrorCode_ParameterOutOfRange);
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	623 }
f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	624
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	625 // Figure out which of the accepted presentation contexts should be used
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	626 int presID = ASC_findAcceptedPresentationContextID(pimpl_->assoc_, sopClass);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	627 if (presID == 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628 {
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	629 throw OrthancException("DicomUserConnection: The C-MOVE command is not supported by the remote AET");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	630 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	631
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	632 T_DIMSE_C_MoveRQ request;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	633 memset(&request, 0, sizeof(request));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	634 request.MessageID = pimpl_->assoc_->nextMsgID++;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635 strcpy(request.AffectedSOPClassUID, sopClass);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	636 request.DataSetType = DIMSE_DATASET_PRESENT;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 request.Priority = DIMSE_PRIORITY_MEDIUM;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	638 strncpy(request.MoveDestination, targetAet.c_str(), sizeof(DIC_AE) / sizeof(char));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640 T_DIMSE_C_MoveRSP response;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	641 DcmDataset* statusDetail = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	642 DcmDataset* responseIdentifiers = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	643 OFCondition cond = DIMSE_moveUser(pimpl_->assoc_, presID, &request, dataset.get(),
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	644 NULL, NULL,
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	645 /opt_blockMode/ DIMSE_BLOCKING,
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	646 /opt_dimse_timeout/ pimpl_->dimseTimeout_,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 pimpl_->net_, NULL, NULL,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 &response, &statusDetail, &responseIdentifiers);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650 if (statusDetail)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	651 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	652 delete statusDetail;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	654
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 if (responseIdentifiers)
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 delete responseIdentifiers;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	658 }
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 Check(cond);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	661 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	664 void DicomUserConnection::ResetStorageSOPClasses()
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	665 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	666 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	667
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	668 storageSOPClasses_.clear();
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	669 defaultStorageSOPClasses_.clear();
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	670
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	671 // Copy the short list of storage SOP classes from DCMTK, making
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	672 // room for the 4 SOP classes reserved for C-ECHO, C-FIND, C-MOVE.
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	673
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	674 std::set<std::string> uncommon;
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	675 uncommon.insert(UID_BlendingSoftcopyPresentationStateStorage);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	676 uncommon.insert(UID_GrayscaleSoftcopyPresentationStateStorage);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	677 uncommon.insert(UID_ColorSoftcopyPresentationStateStorage);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	678 uncommon.insert(UID_PseudoColorSoftcopyPresentationStateStorage);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	679
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	680 // Add the storage syntaxes for C-STORE
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	681 for (int i = 0; i < numberOfDcmShortSCUStorageSOPClassUIDs - 1; i++)
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	682 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	683 if (uncommon.find(dcmShortSCUStorageSOPClassUIDs[i]) == uncommon.end())
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	684 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	685 defaultStorageSOPClasses_.insert(dcmShortSCUStorageSOPClassUIDs[i]);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	686 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	687 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	688
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	689 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	690 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	691
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	692
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	693 DicomUserConnection::DicomUserConnection() :
08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	694 pimpl_(new PImpl),
666 b8383ac0b227 fix cppcheck warning Sebastien Jodogne <s.jodogne@gmail.com> parents: 662 diff changeset	695 preferredTransferSyntax_(DEFAULT_PREFERRED_TRANSFER_SYNTAX),
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 519 diff changeset	696 localAet_("STORESCU"),
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	697 remoteAet_("ANY-SCP"),
5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	698 remoteHost_("127.0.0.1")
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	699 {
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	700 remotePort_ = 104;
519 1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	701 manufacturer_ = ModalityManufacturer_Generic;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	702
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	703 SetTimeout(10);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	704 pimpl_->net_ = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	705 pimpl_->params_ = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	706 pimpl_->assoc_ = NULL;
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	707
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	708 // SOP classes for C-ECHO, C-FIND and C-MOVE
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	709 reservedStorageSOPClasses_.push_back(UID_VerificationSOPClass);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	710 reservedStorageSOPClasses_.push_back(UID_FINDPatientRootQueryRetrieveInformationModel);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	711 reservedStorageSOPClasses_.push_back(UID_FINDStudyRootQueryRetrieveInformationModel);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	712 reservedStorageSOPClasses_.push_back(UID_MOVEStudyRootQueryRetrieveInformationModel);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	713
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	714 ResetStorageSOPClasses();
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	715 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	716
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	717 DicomUserConnection::~DicomUserConnection()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	718 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	719 Close();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	720 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	721
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	722
1427 d710ea64f0fd Custom setting of the local AET during C-Store SCU (both in Lua and in the REST API) Sebastien Jodogne <s.jodogne@gmail.com> parents: 1371 diff changeset	723 void DicomUserConnection::SetRemoteModality(const RemoteModalityParameters& parameters)
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	724 {
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	725 SetRemoteApplicationEntityTitle(parameters.GetApplicationEntityTitle());
5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	726 SetRemoteHost(parameters.GetHost());
5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	727 SetRemotePort(parameters.GetPort());
5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	728 SetRemoteManufacturer(parameters.GetManufacturer());
772 31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	729 }
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	730
31cc399c7762 RemoteModalityParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 769 diff changeset	731
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	732 void DicomUserConnection::SetLocalApplicationEntityTitle(const std::string& aet)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	733 {
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	734 if (localAet_ != aet)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	735 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	736 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	737 localAet_ = aet;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	738 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	741 void DicomUserConnection::SetRemoteApplicationEntityTitle(const std::string& aet)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742 {
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	743 if (remoteAet_ != aet)
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	744 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	745 Close();
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	746 remoteAet_ = aet;
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	747 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	748 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	749
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	750 void DicomUserConnection::SetRemoteManufacturer(ModalityManufacturer manufacturer)
519 1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	751 {
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	752 if (manufacturer_ != manufacturer)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	753 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	754 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	755 manufacturer_ = manufacturer;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	756 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	757 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	758
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	759 void DicomUserConnection::ResetPreferredTransferSyntax()
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	760 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	761 SetPreferredTransferSyntax(DEFAULT_PREFERRED_TRANSFER_SYNTAX);
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	762 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	763
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	764 void DicomUserConnection::SetPreferredTransferSyntax(const std::string& preferredTransferSyntax)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	765 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	766 if (preferredTransferSyntax_ != preferredTransferSyntax)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	767 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	768 Close();
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	769 preferredTransferSyntax_ = preferredTransferSyntax;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	770 }
519 1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	771 }
1b2cdc855bd3 Parameter for PACS manufacturer, support for ClearCanvas Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	772
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	773
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	774 void DicomUserConnection::SetRemoteHost(const std::string& host)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	775 {
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	776 if (remoteHost_ != host)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	777 {
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	778 if (host.size() > HOST_NAME_MAX - 10)
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	779 {
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	780 throw OrthancException("Remote host name is too long");
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	781 }
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	782
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	783 Close();
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	784 remoteHost_ = host;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	785 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	786 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	787
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	788 void DicomUserConnection::SetRemotePort(uint16_t port)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	789 {
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	790 if (remotePort_ != port)
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	791 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	792 Close();
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	793 remotePort_ = port;
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	794 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	795 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	796
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	797 void DicomUserConnection::Open()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	798 {
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	799 if (IsOpen())
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	800 {
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	801 // Don't reopen the connection
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	802 return;
70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	803 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804
769 3f946e5c3802 ReusableDicomUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 766 diff changeset	805 LOG(INFO) << "Opening a DICOM SCU connection from AET \"" << GetLocalApplicationEntityTitle()
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	806 << "\" to AET \"" << GetRemoteApplicationEntityTitle() << "\" on host "
5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	807 << GetRemoteHost() << ":" << GetRemotePort()
5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	808 << " (manufacturer: " << EnumerationToString(GetRemoteManufacturer()) << ")";
769 3f946e5c3802 ReusableDicomUserConnection Sebastien Jodogne <s.jodogne@gmail.com> parents: 766 diff changeset	809
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	810 Check(ASC_initializeNetwork(NET_REQUESTOR, 0, /opt_acse_timeout/ pimpl_->acseTimeout_, &pimpl_->net_));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	811 Check(ASC_createAssociationParameters(&pimpl_->params_, /opt_maxReceivePDULength/ ASC_DEFAULTMAXPDU));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	812
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	813 // Set this application's title and the called application's title in the params
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	814 Check(ASC_setAPTitles(pimpl_->params_, localAet_.c_str(), remoteAet_.c_str(), NULL));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	815
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	816 // Set the network addresses of the local and remote entities
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	817 char localHost[HOST_NAME_MAX];
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	818 gethostname(localHost, HOST_NAME_MAX - 1);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	819
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	820 char remoteHostAndPort[HOST_NAME_MAX];
2 67a6978503b7 fixing Windows build Jodogne@Laptop parents: 0 diff changeset	821
67a6978503b7 fixing Windows build Jodogne@Laptop parents: 0 diff changeset	822 #ifdef _MSC_VER
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	823 _snprintf
2 67a6978503b7 fixing Windows build Jodogne@Laptop parents: 0 diff changeset	824 #else
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	825 snprintf
2 67a6978503b7 fixing Windows build Jodogne@Laptop parents: 0 diff changeset	826 #endif
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	827 (remoteHostAndPort, HOST_NAME_MAX - 1, "%s:%d", remoteHost_.c_str(), remotePort_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	828
1285 5730f374e4e6 Access to called AET and remote AET from Lua scripts Sebastien Jodogne <s.jodogne@gmail.com> parents: 1186 diff changeset	829 Check(ASC_setPresentationAddresses(pimpl_->params_, localHost, remoteHostAndPort));
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	831 // Set various options
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	832 Check(ASC_setTransportLayerType(pimpl_->params_, /opt_secureConnection/ false));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	834 SetupPresentationContexts(preferredTransferSyntax_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	836 // Do the association
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	837 Check(ASC_requestAssociation(pimpl_->net_, pimpl_->params_, &pimpl_->assoc_));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	838
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	839 if (ASC_countAcceptedPresentationContexts(pimpl_->params_) == 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	840 {
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	841 throw OrthancException("DicomUserConnection: No Acceptable Presentation Contexts");
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	842 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	843 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	844
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	845 void DicomUserConnection::Close()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	846 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	847 if (pimpl_->assoc_ != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	848 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	849 ASC_releaseAssociation(pimpl_->assoc_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	850 ASC_destroyAssociation(&pimpl_->assoc_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	851 pimpl_->assoc_ = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	852 pimpl_->params_ = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	853 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	854 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	855 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	856 if (pimpl_->params_ != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	858 ASC_destroyAssociationParameters(&pimpl_->params_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	859 pimpl_->params_ = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	860 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	861 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	862
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863 if (pimpl_->net_ != NULL)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	864 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	865 ASC_dropNetwork(&pimpl_->net_);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	866 pimpl_->net_ = NULL;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	868 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	869
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	870 bool DicomUserConnection::IsOpen() const
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	871 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	872 return pimpl_->IsOpen();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	873 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	874
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	875 void DicomUserConnection::Store(const char* buffer, size_t size)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	877 // Prepare an input stream for the memory buffer
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	878 DcmInputBufferStream is;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	879 if (size > 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	880 is.setBuffer(buffer, size);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	881 is.setEos();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	882
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	883 pimpl_->Store(is, *this);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	884 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	885
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	886 void DicomUserConnection::Store(const std::string& buffer)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	887 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	888 if (buffer.size() > 0)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	889 Store(reinterpret_cast<const char*>(&buffer[0]), buffer.size());
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	890 else
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	891 Store(NULL, 0);
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	892 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	893
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	894 void DicomUserConnection::StoreFile(const std::string& path)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	895 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	896 // Prepare an input stream for the file
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	897 DcmInputFileStream is(path.c_str());
662 70161eb45b5c orthanc can act as a C-Store SCU for JPEG transfer syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 657 diff changeset	898 pimpl_->Store(is, *this);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	899 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	900
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	901 bool DicomUserConnection::Echo()
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	902 {
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	903 CheckIsOpen();
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	904 DIC_US status;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	905 Check(DIMSE_echoUser(pimpl_->assoc_, pimpl_->assoc_->nextMsgID++,
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	906 /opt_blockMode/ DIMSE_BLOCKING,
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	907 /opt_dimse_timeout/ pimpl_->dimseTimeout_,
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	908 &status, NULL));
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	909 return status == STATUS_Success;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	911
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	912
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	913 static void TestAndCopyTag(DicomMap& result,
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	914 const DicomMap& source,
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	915 const DicomTag& tag)
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	916 {
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	917 if (!source.HasTag(tag))
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	918 {
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	919 throw OrthancException(ErrorCode_BadRequest);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	920 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	921 else
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	922 {
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	923 result.SetValue(tag, source.GetValue(tag));
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	924 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	925 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	926
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	927
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	928 void DicomUserConnection::Move(const std::string& targetAet,
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	929 const DicomMap& findResult)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	930 {
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	931 if (!findResult.HasTag(DICOM_TAG_QUERY_RETRIEVE_LEVEL))
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	932 {
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	933 throw OrthancException(ErrorCode_InternalError);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	934 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	935
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	936 const std::string tmp = findResult.GetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL).AsString();
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	937 ResourceType level = StringToResourceType(tmp.c_str());
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	938
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	939 DicomMap move;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	940 switch (level)
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	941 {
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	942 case ResourceType_Patient:
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	943 TestAndCopyTag(move, findResult, DICOM_TAG_PATIENT_ID);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	944 break;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	945
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	946 case ResourceType_Study:
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	947 TestAndCopyTag(move, findResult, DICOM_TAG_STUDY_INSTANCE_UID);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	948 break;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	949
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	950 case ResourceType_Series:
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	951 TestAndCopyTag(move, findResult, DICOM_TAG_STUDY_INSTANCE_UID);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	952 TestAndCopyTag(move, findResult, DICOM_TAG_SERIES_INSTANCE_UID);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	953 break;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	954
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	955 case ResourceType_Instance:
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	956 TestAndCopyTag(move, findResult, DICOM_TAG_STUDY_INSTANCE_UID);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	957 TestAndCopyTag(move, findResult, DICOM_TAG_SERIES_INSTANCE_UID);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	958 TestAndCopyTag(move, findResult, DICOM_TAG_SOP_INSTANCE_UID);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	959 break;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	960
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	961 default:
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	962 throw OrthancException(ErrorCode_InternalError);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	963 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	964
1371 f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	965 MoveInternal(targetAet, level, move);
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	966 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	967
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	968
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	969 void DicomUserConnection::MovePatient(const std::string& targetAet,
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	970 const std::string& patientId)
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	971 {
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	972 DicomMap query;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	973 query.SetValue(DICOM_TAG_PATIENT_ID, patientId);
1371 f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	974 MoveInternal(targetAet, ResourceType_Patient, query);
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	975 }
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	976
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	977 void DicomUserConnection::MoveStudy(const std::string& targetAet,
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	978 const std::string& studyUid)
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	979 {
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	980 DicomMap query;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	981 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid);
1371 f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	982 MoveInternal(targetAet, ResourceType_Study, query);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	983 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	984
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	985 void DicomUserConnection::MoveSeries(const std::string& targetAet,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	986 const std::string& studyUid,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	987 const std::string& seriesUid)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	988 {
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	989 DicomMap query;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	990 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	991 query.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid);
1371 f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	992 MoveInternal(targetAet, ResourceType_Series, query);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	993 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	994
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	995 void DicomUserConnection::MoveInstance(const std::string& targetAet,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	996 const std::string& studyUid,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	997 const std::string& seriesUid,
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	998 const std::string& instanceUid)
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	999 {
1366 a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	1000 DicomMap query;
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	1001 query.SetValue(DICOM_TAG_STUDY_INSTANCE_UID, studyUid);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	1002 query.SetValue(DICOM_TAG_SERIES_INSTANCE_UID, seriesUid);
a3559b66fba7 move primitives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1364 diff changeset	1003 query.SetValue(DICOM_TAG_SOP_INSTANCE_UID, instanceUid);
1371 f528849ee9f7 DICOM Query/Retrieve available from Orthanc Explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	1004 MoveInternal(targetAet, ResourceType_Instance, query);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1005 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1006
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1007
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1008 void DicomUserConnection::SetTimeout(uint32_t seconds)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1009 {
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1010 if (seconds <= 0)
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1011 {
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1012 throw OrthancException(ErrorCode_ParameterOutOfRange);
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1013 }
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1014
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1015 dcmConnectionTimeout.set(seconds);
1186 b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1016 pimpl_->dimseTimeout_ = seconds;
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1017 pimpl_->acseTimeout_ = 10;
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1018 }
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1019
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1020
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1021 void DicomUserConnection::DisableTimeout()
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1022 {
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1023 /**
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1024 * Global timeout (seconds) for connecting to remote hosts.
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1025 * Default value is -1 which selects infinite timeout, i.e. blocking connect().
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1026 */
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1027 dcmConnectionTimeout.set(-1);
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1028 pimpl_->dimseTimeout_ = 0;
b17b6bd59747 timeouts for HTTP and DICOM Sebastien Jodogne <s.jodogne@gmail.com> parents: 1017 diff changeset	1029 pimpl_->acseTimeout_ = 10;
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1030 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1031
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1032
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1033 void DicomUserConnection::CheckStorageSOPClassesInvariant() const
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1034 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1035 assert(storageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1036 defaultStorageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1037 reservedStorageSOPClasses_.size() <= MAXIMUM_STORAGE_SOP_CLASSES);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1038 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1039
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1040 void DicomUserConnection::AddStorageSOPClass(const char* sop)
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1041 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1042 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1043
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1044 if (storageSOPClasses_.find(sop) != storageSOPClasses_.end())
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1045 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1046 // This storage SOP class is already explicitly registered. Do
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1047 // nothing.
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1048 return;
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1049 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1050
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1051 if (defaultStorageSOPClasses_.find(sop) != defaultStorageSOPClasses_.end())
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1052 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1053 // This storage SOP class is not explicitly registered, but is
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1054 // used by default. Just register it explicitly.
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1055 defaultStorageSOPClasses_.erase(sop);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1056 storageSOPClasses_.insert(sop);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1057
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1058 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1059 return;
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1060 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1061
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1062 // This storage SOP class is neither explicitly, nor implicitly
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1063 // registered. Close the connection and register it explicitly.
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1064
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1065 Close();
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1066
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1067 if (reservedStorageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1068 storageSOPClasses_.size() >= MAXIMUM_STORAGE_SOP_CLASSES) // (*)
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1069 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1070 // The maximum number of SOP classes is reached
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1071 ResetStorageSOPClasses();
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1072 defaultStorageSOPClasses_.erase(sop);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1073 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1074 else if (reservedStorageSOPClasses_.size() + storageSOPClasses_.size() +
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1075 defaultStorageSOPClasses_.size() >= MAXIMUM_STORAGE_SOP_CLASSES)
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1076 {
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1077 // Make room in the default storage syntaxes
1303 bba8a47922d1 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1288 diff changeset	1078 assert(!defaultStorageSOPClasses_.empty()); // Necessarily true because condition (*) is false
763 b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1079 defaultStorageSOPClasses_.erase(*defaultStorageSOPClasses_.rbegin());
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1080 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1081
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1082 // Explicitly register the new storage syntax
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1083 storageSOPClasses_.insert(sop);
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1084
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1085 CheckStorageSOPClassesInvariant();
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1086 }
b5e6d2823115 dynamic negotiation of storage sop classes Sebastien Jodogne <s.jodogne@gmail.com> parents: 732 diff changeset	1087
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1088 }

Mercurial > hg > orthanc

annotate OrthancServer/DicomProtocol/DicomUserConnection.cpp @ 1429:7366a0bdda6a