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