Mercurial > hg > orthanc
annotate OrthancFramework/Sources/DicomNetworking/Internals/CommandDispatcher.cpp @ 4119:bf7b9edf6b81 framework-lgpl
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 07 Jul 2020 19:17:56 +0200 |
parents | d25f4c0fa160 |
children | fbc49a65340a |
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 OFCondition cond = EC_Normal; | |
141 int n, i, k; | |
142 DUL_PRESENTATIONCONTEXT *dpc; | |
143 T_ASC_PresentationContext pc; | |
144 OFBool accepted = OFFalse; | |
145 OFBool abstractOK = OFFalse; | |
146 | |
147 n = ASC_countPresentationContexts(params); | |
148 for (i = 0; i < n; i++) | |
149 { | |
150 cond = ASC_getPresentationContext(params, i, &pc); | |
151 if (cond.bad()) return cond; | |
152 abstractOK = OFFalse; | |
153 accepted = OFFalse; | |
154 | |
155 if (dcmFindNameOfUID(pc.abstractSyntax) == NULL) | |
156 { | |
157 abstractOK = OFTrue; | |
158 | |
159 /* check the transfer syntax */ | |
160 for (k = 0; (k < OFstatic_cast(int, pc.transferSyntaxCount)) && !accepted; k++) | |
161 { | |
162 if (strcmp(pc.proposedTransferSyntaxes[k], transferSyntax) == 0) | |
163 { | |
164 accepted = OFTrue; | |
165 } | |
166 } | |
167 } | |
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
|
168 |
503 | 169 if (accepted) |
170 { | |
171 cond = ASC_acceptPresentationContext( | |
172 params, pc.presentationContextID, | |
173 transferSyntax, acceptedRole); | |
174 if (cond.bad()) return cond; | |
175 } else { | |
176 T_ASC_P_ResultReason reason; | |
177 | |
178 /* do not refuse if already accepted */ | |
179 dpc = findPresentationContextID(params->DULparams.acceptedPresentationContext, | |
180 pc.presentationContextID); | |
181 if ((dpc == NULL) || ((dpc != NULL) && (dpc->result != ASC_P_ACCEPTANCE))) | |
182 { | |
183 | |
184 if (abstractOK) { | |
185 reason = ASC_P_TRANSFERSYNTAXESNOTSUPPORTED; | |
186 } else { | |
187 reason = ASC_P_ABSTRACTSYNTAXNOTSUPPORTED; | |
188 } | |
189 /* | |
190 * If previously this presentation context was refused | |
191 * because of bad transfer syntax let it stay that way. | |
192 */ | |
193 if ((dpc != NULL) && (dpc->result == ASC_P_TRANSFERSYNTAXESNOTSUPPORTED)) | |
194 reason = ASC_P_TRANSFERSYNTAXESNOTSUPPORTED; | |
195 | |
196 cond = ASC_refusePresentationContext(params, pc.presentationContextID, reason); | |
197 if (cond.bad()) return cond; | |
198 } | |
199 } | |
200 } | |
201 return EC_Normal; | |
202 } | |
203 | |
204 | |
205 /** accept all presenstation contexts for unknown SOP classes, | |
206 * i.e. UIDs appearing in the list of abstract syntaxes | |
207 * where no corresponding name is defined in the UID dictionary. | |
208 * This method is passed a list of "preferred" transfer syntaxes. | |
209 * @param params pointer to association parameters structure | |
210 * @param transferSyntax transfer syntax to accept | |
211 * @param acceptedRole SCU/SCP role to accept | |
212 */ | |
213 static OFCondition acceptUnknownContextsWithPreferredTransferSyntaxes( | |
214 T_ASC_Parameters * params, | |
215 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
|
216 T_ASC_SC_ROLE acceptedRole) |
503 | 217 { |
218 OFCondition cond = EC_Normal; | |
219 /* | |
220 ** Accept in the order "least wanted" to "most wanted" transfer | |
221 ** syntax. Accepting a transfer syntax will override previously | |
222 ** accepted transfer syntaxes. | |
223 */ | |
224 for (int i = transferSyntaxCount - 1; i >= 0; i--) | |
225 { | |
226 cond = acceptUnknownContextsWithTransferSyntax(params, transferSyntaxes[i], acceptedRole); | |
227 if (cond.bad()) return cond; | |
228 } | |
229 return cond; | |
230 } | |
231 | |
232 | |
1073
01414536c930
complete DICOM conformance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
233 |
62 | 234 namespace Orthanc |
0 | 235 { |
236 namespace Internals | |
237 { | |
238 OFCondition AssociationCleanup(T_ASC_Association *assoc) | |
239 { | |
240 OFCondition cond = ASC_dropSCPAssociation(assoc); | |
241 if (cond.bad()) | |
242 { | |
3998
b3f09bc9734b
sharing more code between the loggers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3965
diff
changeset
|
243 LOG(ERROR) << cond.text(); |
0 | 244 return cond; |
245 } | |
246 | |
247 cond = ASC_destroyAssociation(&assoc); | |
248 if (cond.bad()) | |
249 { | |
3998
b3f09bc9734b
sharing more code between the loggers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3965
diff
changeset
|
250 LOG(ERROR) << cond.text(); |
0 | 251 return cond; |
252 } | |
253 | |
254 return cond; | |
255 } | |
256 | |
257 | |
258 | |
259 CommandDispatcher* AcceptAssociation(const DicomServer& server, T_ASC_Network *net) | |
260 { | |
261 DcmAssociationConfiguration asccfg; | |
262 char buf[BUFSIZ]; | |
263 T_ASC_Association *assoc; | |
264 OFCondition cond; | |
265 OFString sprofile; | |
266 OFString temp_str; | |
267 | |
268 cond = ASC_receiveAssociation(net, &assoc, | |
269 /*opt_maxPDU*/ ASC_DEFAULTMAXPDU, | |
270 NULL, NULL, | |
271 /*opt_secureConnection*/ OFFalse, | |
272 DUL_NOBLOCK, 1); | |
273 | |
274 if (cond == DUL_NOASSOCIATIONREQUEST) | |
275 { | |
276 // Timeout | |
277 AssociationCleanup(assoc); | |
278 return NULL; | |
279 } | |
280 | |
281 // if some kind of error occured, take care of it | |
282 if (cond.bad()) | |
283 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
284 LOG(ERROR) << "Receiving Association failed: " << cond.text(); |
0 | 285 // no matter what kind of error occurred, we need to do a cleanup |
286 AssociationCleanup(assoc); | |
287 return NULL; | |
288 } | |
289 | |
1163
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
290 // 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
|
291 std::string remoteAet; |
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1786
diff
changeset
|
292 std::string remoteIp; |
1163
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
293 std::string calledAet; |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
294 |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
295 { |
1799
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1786
diff
changeset
|
296 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
|
297 DIC_AE calledAet_C; |
1799
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1786
diff
changeset
|
298 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
|
299 DIC_AE calledIP_C; |
3118 | 300 |
301 if ( | |
302 #if DCMTK_VERSION_NUMBER >= 364 | |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
303 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
|
304 ASC_getPresentationAddresses(assoc->params, remoteIp_C, sizeof(remoteIp_C), calledIP_C, sizeof(calledIP_C)).bad() |
3118 | 305 #else |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
306 ASC_getAPTitles(assoc->params, remoteAet_C, calledAet_C, NULL).bad() || |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
307 ASC_getPresentationAddresses(assoc->params, remoteIp_C, calledIP_C).bad() |
3118 | 308 #endif |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
309 ) |
1163
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
310 { |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
311 T_ASC_RejectParameters rej = |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
312 { |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
313 ASC_RESULT_REJECTEDPERMANENT, |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
314 ASC_SOURCE_SERVICEUSER, |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
315 ASC_REASON_SU_NOREASON |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
316 }; |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
317 ASC_rejectAssociation(assoc, &rej); |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
318 AssociationCleanup(assoc); |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
319 return NULL; |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
320 } |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
321 |
1799
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1786
diff
changeset
|
322 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
|
323 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
|
324 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
|
325 } |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
326 |
1799
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1786
diff
changeset
|
327 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
|
328 << " on IP " << remoteIp; |
1163
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
329 |
0 | 330 |
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 /* 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
|
333 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
|
334 |
3612
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
335 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
|
336 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
|
337 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
|
338 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
|
339 |
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
|
340 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
|
341 |
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
|
342 // 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
|
343 // 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
|
344 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
|
345 |
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
|
346 // 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
|
347 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
|
348 { |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
349 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
|
350 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
|
351 } |
1163
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
352 |
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
|
353 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
|
354 { |
22eef03feed7
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 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
|
356 } |
0 | 357 |
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
|
358 // 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
|
359 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
|
360 { |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
361 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
|
362 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
|
363 } |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
364 |
3818
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
365 // For C-GET |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
366 if (server.HasGetRequestHandlerFactory()) |
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 knownAbstractSyntaxes.push_back(UID_GETStudyRootQueryRetrieveInformationModel); |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
369 knownAbstractSyntaxes.push_back(UID_GETPatientRootQueryRetrieveInformationModel); |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
370 } |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
371 |
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
|
372 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
|
373 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
|
374 &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
|
375 &genericTransferSyntaxes[0], genericTransferSyntaxes.size()); |
1806
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1800
diff
changeset
|
376 if (cond.bad()) |
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1800
diff
changeset
|
377 { |
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1800
diff
changeset
|
378 LOG(INFO) << cond.text(); |
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1800
diff
changeset
|
379 AssociationCleanup(assoc); |
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1800
diff
changeset
|
380 return NULL; |
cd213ebcaefd
UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1800
diff
changeset
|
381 } |
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
|
382 |
22eef03feed7
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 /* 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
|
385 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
|
386 { |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
387 /** |
22eef03feed7
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 * "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
|
389 * 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
|
390 * 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
|
391 **/ |
22eef03feed7
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 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
|
393 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
|
394 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
|
395 &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
|
396 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
|
397 { |
22eef03feed7
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 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
|
399 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
|
400 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
|
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 |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
405 |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
406 { |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
407 /* 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
|
408 |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
409 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
|
410 |
22eef03feed7
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 // 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
|
412 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
|
413 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
|
414 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
|
415 |
22eef03feed7
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 // 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
|
417 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
|
418 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
|
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 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
|
421 } |
22eef03feed7
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 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
|
424 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
|
425 { |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
426 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
|
427 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
|
428 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
|
429 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
|
430 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
|
431 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
|
432 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
|
433 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
|
434 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
|
435 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
|
436 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
|
437 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
|
438 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
|
439 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
|
440 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
|
441 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
|
442 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
|
443 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
|
444 } |
22eef03feed7
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 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
|
447 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
|
448 { |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
449 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
|
450 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
|
451 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
|
452 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
|
453 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
|
454 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
|
455 } |
22eef03feed7
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 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
|
458 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
|
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 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
|
461 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
|
462 } |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
463 |
22eef03feed7
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 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
|
465 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
|
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 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
|
468 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
|
469 } |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
470 |
22eef03feed7
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 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
|
472 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
|
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 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
|
475 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
|
476 } |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
477 |
3769
eb044cc49d51
compatibility with DCMTK 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3767
diff
changeset
|
478 #if DCMTK_VERSION_NUMBER >= 361 |
3646
5faf76511931
integration mainline->storage-commitment
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
479 // New in Orthanc 1.6.0 |
5faf76511931
integration mainline->storage-commitment
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
480 if (!server.HasApplicationEntityFilter() || |
5faf76511931
integration mainline->storage-commitment
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
481 server.GetApplicationEntityFilter().IsAllowedTransferSyntax(remoteIp, remoteAet, calledAet, TransferSyntax_Mpeg4)) |
5faf76511931
integration mainline->storage-commitment
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
482 { |
5faf76511931
integration mainline->storage-commitment
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
483 storageTransferSyntaxes.push_back(UID_MPEG4BDcompatibleHighProfileLevel4_1TransferSyntax); |
5faf76511931
integration mainline->storage-commitment
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
484 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_1TransferSyntax); |
5faf76511931
integration mainline->storage-commitment
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
485 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_2_For2DVideoTransferSyntax); |
5faf76511931
integration mainline->storage-commitment
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
486 storageTransferSyntaxes.push_back(UID_MPEG4HighProfileLevel4_2_For3DVideoTransferSyntax); |
5faf76511931
integration mainline->storage-commitment
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
487 storageTransferSyntaxes.push_back(UID_MPEG4StereoHighProfileLevel4_2TransferSyntax); |
5faf76511931
integration mainline->storage-commitment
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
488 } |
3769
eb044cc49d51
compatibility with DCMTK 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3767
diff
changeset
|
489 #endif |
3646
5faf76511931
integration mainline->storage-commitment
Sebastien Jodogne <s.jodogne@gmail.com>
diff
changeset
|
490 |
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
|
491 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
|
492 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
|
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 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
|
495 } |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
496 |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
497 /* 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
|
498 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
|
499 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
|
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 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
|
502 } |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
503 |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
504 #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
|
505 // 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
|
506 // 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
|
507 // 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
|
508 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
|
509 #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
|
510 |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
511 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
|
512 { |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
513 // This branch exactly corresponds to Orthanc <= 1.6.1 (in |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
514 // which C-GET SCP was not supported) |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
515 cond = ASC_acceptContextsWithPreferredTransferSyntaxes( |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
516 assoc->params, dcmAllStorageSOPClassUIDs, count, |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
517 &storageTransferSyntaxes[0], storageTransferSyntaxes.size()); |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
518 if (cond.bad()) |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
519 { |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
520 LOG(INFO) << cond.text(); |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
521 AssociationCleanup(assoc); |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
522 return NULL; |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
523 } |
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
|
524 } |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
525 else // see dcmqrsrv.cc lines 839 - 876 |
3818
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
526 { |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
527 /* accept storage syntaxes with proposed role */ |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
528 int npc = ASC_countPresentationContexts(assoc->params); |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
529 for (int i = 0; i < npc; i++) |
3818
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
530 { |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
531 T_ASC_PresentationContext pc; |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
532 ASC_getPresentationContext(assoc->params, i, &pc); |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
533 if (dcmIsaStorageSOPClassUID(pc.abstractSyntax)) |
3818
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
534 { |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
535 /** |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
536 * We are prepared to accept whatever role the caller |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
537 * proposes. Normally we can be the SCP of the Storage |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
538 * Service Class. When processing the C-GET operation |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
539 * we can be the SCU of the Storage Service Class. |
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 const T_ASC_SC_ROLE role = pc.proposedRole; |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
542 |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
543 /** |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
544 * Accept in the order "least wanted" to "most wanted" |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
545 * transfer syntax. Accepting a transfer syntax will |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
546 * override previously accepted transfer syntaxes. |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
547 **/ |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
548 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
|
549 { |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
550 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
|
551 { |
3965
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 the transfer syntax was proposed then we can accept it |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
554 * appears in our supported list of transfer syntaxes |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
555 **/ |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
556 if (strcmp(pc.proposedTransferSyntaxes[j], storageTransferSyntaxes[k]) == 0) |
3818
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
557 { |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
558 cond = ASC_acceptPresentationContext( |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
559 assoc->params, pc.presentationContextID, storageTransferSyntaxes[k], role); |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
560 if (cond.bad()) |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
561 { |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
562 LOG(INFO) << cond.text(); |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
563 AssociationCleanup(assoc); |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
564 return NULL; |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
565 } |
3818
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
566 } |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
567 } |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
568 } |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
569 } |
3965
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
570 } /* for */ |
7f296ae25039
reviewed CommandDispatcher.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3964
diff
changeset
|
571 } |
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
|
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 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
|
574 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
|
575 { |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
576 /* |
22eef03feed7
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 * 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
|
578 * 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
|
579 **/ |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
580 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
|
581 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
|
582 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
|
583 { |
22eef03feed7
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 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
|
585 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
|
586 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
|
587 } |
22eef03feed7
DANGEROUS changeset: Removing unnecessary transfer syntaxes for C-ECHO, C-FIND and C-MOVE
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3604
diff
changeset
|
588 } |
503 | 589 } |
590 | |
0 | 591 /* set our app title */ |
592 ASC_setAPTitles(assoc->params, NULL, NULL, server.GetApplicationEntityTitle().c_str()); | |
593 | |
594 /* acknowledge or reject this association */ | |
3118 | 595 #if DCMTK_VERSION_NUMBER >= 364 |
596 cond = ASC_getApplicationContextName(assoc->params, buf, sizeof(buf)); | |
597 #else | |
0 | 598 cond = ASC_getApplicationContextName(assoc->params, buf); |
3118 | 599 #endif |
600 | |
0 | 601 if ((cond.bad()) || strcmp(buf, UID_StandardApplicationContext) != 0) |
602 { | |
603 /* reject: the application context name is not supported */ | |
604 T_ASC_RejectParameters rej = | |
605 { | |
606 ASC_RESULT_REJECTEDPERMANENT, | |
607 ASC_SOURCE_SERVICEUSER, | |
608 ASC_REASON_SU_APPCONTEXTNAMENOTSUPPORTED | |
609 }; | |
610 | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
611 LOG(INFO) << "Association Rejected: Bad Application Context Name: " << buf; |
0 | 612 cond = ASC_rejectAssociation(assoc, &rej); |
613 if (cond.bad()) | |
614 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
615 LOG(INFO) << cond.text(); |
0 | 616 } |
617 AssociationCleanup(assoc); | |
618 return NULL; | |
619 } | |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
620 |
0 | 621 /* check the AETs */ |
1163
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
622 if (!server.IsMyAETitle(calledAet)) |
0 | 623 { |
1163
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
624 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
|
625 T_ASC_RejectParameters rej = |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
626 { |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
627 ASC_RESULT_REJECTEDPERMANENT, |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
628 ASC_SOURCE_SERVICEUSER, |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
629 ASC_REASON_SU_CALLEDAETITLENOTRECOGNIZED |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
630 }; |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
631 ASC_rejectAssociation(assoc, &rej); |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
632 AssociationCleanup(assoc); |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
633 return NULL; |
0 | 634 } |
635 | |
1163
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
636 if (server.HasApplicationEntityFilter() && |
1799
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1786
diff
changeset
|
637 !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
|
638 { |
1799
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1786
diff
changeset
|
639 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
|
640 T_ASC_RejectParameters rej = |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
641 { |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
642 ASC_RESULT_REJECTEDPERMANENT, |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
643 ASC_SOURCE_SERVICEUSER, |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
644 ASC_REASON_SU_CALLINGAETITLENOTRECOGNIZED |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
645 }; |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
646 ASC_rejectAssociation(assoc, &rej); |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
647 AssociationCleanup(assoc); |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
648 return NULL; |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
649 } |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
650 |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
651 if (opt_rejectWithoutImplementationUID && |
3db41779d8f9
abstraction to allow/prevent transfer syntaxes on AET basis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1085
diff
changeset
|
652 strlen(assoc->params->theirImplementationClassUID) == 0) |
0 | 653 { |
654 /* reject: the no implementation Class UID provided */ | |
655 T_ASC_RejectParameters rej = | |
656 { | |
657 ASC_RESULT_REJECTEDPERMANENT, | |
658 ASC_SOURCE_SERVICEUSER, | |
659 ASC_REASON_SU_NOREASON | |
660 }; | |
661 | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
662 LOG(INFO) << "Association Rejected: No Implementation Class UID provided"; |
0 | 663 cond = ASC_rejectAssociation(assoc, &rej); |
664 if (cond.bad()) | |
665 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
666 LOG(INFO) << cond.text(); |
0 | 667 } |
668 AssociationCleanup(assoc); | |
669 return NULL; | |
670 } | |
671 | |
672 { | |
673 cond = ASC_acknowledgeAssociation(assoc); | |
674 if (cond.bad()) | |
675 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
676 LOG(ERROR) << cond.text(); |
0 | 677 AssociationCleanup(assoc); |
678 return NULL; | |
679 } | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
680 LOG(INFO) << "Association Acknowledged (Max Send PDV: " << assoc->sendPDVLength << ")"; |
0 | 681 if (ASC_countAcceptedPresentationContexts(assoc->params) == 0) |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
682 LOG(INFO) << " (but no valid presentation contexts)"; |
0 | 683 } |
684 | |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
685 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
|
686 return new CommandDispatcher(server, assoc, remoteIp, remoteAet, calledAet, filter); |
0 | 687 } |
688 | |
2134
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
689 |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
690 CommandDispatcher::CommandDispatcher(const DicomServer& server, |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
691 T_ASC_Association* assoc, |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
692 const std::string& remoteIp, |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
693 const std::string& remoteAet, |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
694 const std::string& calledAet, |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
695 IApplicationEntityFilter* filter) : |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
696 server_(server), |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
697 assoc_(assoc), |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
698 remoteIp_(remoteIp), |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
699 remoteAet_(remoteAet), |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
700 calledAet_(calledAet), |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
701 filter_(filter) |
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 associationTimeout_ = server.GetAssociationTimeout(); |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
704 elapsedTimeSinceLastCommand_ = 0; |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
705 } |
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 |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
708 CommandDispatcher::~CommandDispatcher() |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
709 { |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
710 try |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
711 { |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
712 AssociationCleanup(assoc_); |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
713 } |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
714 catch (...) |
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 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
|
717 } |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
718 } |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
719 |
ddc75c6c712d
Avoid hard crash if not enough memory
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2068
diff
changeset
|
720 |
0 | 721 bool CommandDispatcher::Step() |
722 /* | |
723 * This function receives DIMSE commmands over the network connection | |
724 * and handles these commands correspondingly. Note that in case of | |
725 * storscp only C-ECHO-RQ and C-STORE-RQ commands can be processed. | |
726 */ | |
727 { | |
728 bool finished = false; | |
729 | |
730 // receive a DIMSE command over the network, with a timeout of 1 second | |
731 DcmDataset *statusDetail = NULL; | |
732 T_ASC_PresentationContextID presID = 0; | |
733 T_DIMSE_Message msg; | |
734 | |
735 OFCondition cond = DIMSE_receiveCommand(assoc_, DIMSE_NONBLOCKING, 1, &presID, &msg, &statusDetail); | |
736 elapsedTimeSinceLastCommand_++; | |
737 | |
738 // if the command which was received has extra status | |
739 // detail information, dump this information | |
740 if (statusDetail != NULL) | |
741 { | |
101 | 742 //LOG4CPP_WARN(Internals::GetLogger(), "Status Detail:" << OFendl << DcmObject::PrintHelper(*statusDetail)); |
0 | 743 delete statusDetail; |
744 } | |
745 | |
746 if (cond == DIMSE_OUTOFRESOURCES) | |
747 { | |
748 finished = true; | |
749 } | |
750 else if (cond == DIMSE_NODATAAVAILABLE) | |
751 { | |
752 // Timeout due to DIMSE_NONBLOCKING | |
2068
879f3be759ef
renames to make code clearer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
753 if (associationTimeout_ != 0 && |
879f3be759ef
renames to make code clearer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
754 elapsedTimeSinceLastCommand_ >= associationTimeout_) |
0 | 755 { |
2068
879f3be759ef
renames to make code clearer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
756 // This timeout is actually a association timeout |
0 | 757 finished = true; |
758 } | |
759 } | |
760 else if (cond == EC_Normal) | |
761 { | |
2068
879f3be759ef
renames to make code clearer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1900
diff
changeset
|
762 // Reset the association timeout counter |
0 | 763 elapsedTimeSinceLastCommand_ = 0; |
764 | |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
765 // 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
|
766 bool supported = false; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
767 DicomRequestType request; |
0 | 768 switch (msg.CommandField) |
769 { | |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
770 case DIMSE_C_ECHO_RQ: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
771 request = DicomRequestType_Echo; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
772 supported = true; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
773 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
774 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
775 case DIMSE_C_STORE_RQ: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
776 request = DicomRequestType_Store; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
777 supported = true; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
778 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
779 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
780 case DIMSE_C_MOVE_RQ: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
781 request = DicomRequestType_Move; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
782 supported = true; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
783 break; |
3818
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
784 |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
785 case DIMSE_C_GET_RQ: |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
786 request = DicomRequestType_Get; |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
787 supported = true; |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
788 break; |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
789 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
790 case DIMSE_C_FIND_RQ: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
791 request = DicomRequestType_Find; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
792 supported = true; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
793 break; |
0 | 794 |
3604
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
795 case DIMSE_N_ACTION_RQ: |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
796 request = DicomRequestType_NAction; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
797 supported = true; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
798 break; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
799 |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
800 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
|
801 request = DicomRequestType_NEventReport; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
802 supported = true; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
803 break; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
804 |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
805 default: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
806 // we cannot handle this kind of message |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
807 cond = DIMSE_BADCOMMANDTYPE; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
808 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
|
809 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
810 } |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
811 |
0 | 812 |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
813 // 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
|
814 if (supported && |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
815 filter_ != NULL && |
1799
4f01c9d73f02
calledAet made available to all the handlers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1786
diff
changeset
|
816 !filter_->IsAllowedRequest(remoteIp_, remoteAet_, calledAet_, request)) |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
817 { |
2352
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
818 LOG(WARNING) << "Rejected " << EnumerationToString(request) |
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
819 << " 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
|
820 << remoteAet_ << "\" and hostname \"" << remoteIp_ << "\""; |
1085
b161593551db
Always allow incoming ECHO requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1073
diff
changeset
|
821 cond = DIMSE_ILLEGALASSOCIATION; |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
822 supported = false; |
1085
b161593551db
Always allow incoming ECHO requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1073
diff
changeset
|
823 finished = true; |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
824 } |
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 // 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
|
827 if (supported) |
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 // 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
|
830 cond = DIMSE_BADCOMMANDTYPE; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
831 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
832 switch (request) |
0 | 833 { |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
834 case DicomRequestType_Echo: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
835 cond = EchoScp(assoc_, &msg, presID); |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
836 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
837 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
838 case DicomRequestType_Store: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
839 if (server_.HasStoreRequestHandlerFactory()) // Should always be true |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
840 { |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3704
diff
changeset
|
841 std::unique_ptr<IStoreRequestHandler> handler |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
842 (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler()); |
1800
30e97a1f4093
callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1799
diff
changeset
|
843 |
30e97a1f4093
callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1799
diff
changeset
|
844 if (handler.get() != NULL) |
30e97a1f4093
callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1799
diff
changeset
|
845 { |
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
|
846 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
|
847 } |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
848 } |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
849 break; |
0 | 850 |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
851 case DicomRequestType_Move: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
852 if (server_.HasMoveRequestHandlerFactory()) // Should always be true |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
853 { |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3704
diff
changeset
|
854 std::unique_ptr<IMoveRequestHandler> handler |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
855 (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler()); |
1800
30e97a1f4093
callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1799
diff
changeset
|
856 |
30e97a1f4093
callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1799
diff
changeset
|
857 if (handler.get() != NULL) |
30e97a1f4093
callback for handling worklists with plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1799
diff
changeset
|
858 { |
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
|
859 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
|
860 } |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
861 } |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
862 break; |
3818
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
863 |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
864 case DicomRequestType_Get: |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
865 if (server_.HasGetRequestHandlerFactory()) // Should always be true |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
866 { |
3964 | 867 std::unique_ptr<IGetRequestHandler> handler |
3818
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
868 (server_.GetGetRequestHandlerFactory().ConstructGetRequestHandler()); |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
869 |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
870 if (handler.get() != NULL) |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
871 { |
3953
620e87e9e816
c-get: fixing memory with failedUIDs_
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3920
diff
changeset
|
872 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
|
873 } |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
874 } |
4f78da5613a1
Add C-GET SCP support
Stacy Loesch <stacy.loesch@varian.com>
parents:
3769
diff
changeset
|
875 break; |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
876 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
877 case DicomRequestType_Find: |
1786
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
878 if (server_.HasFindRequestHandlerFactory() || // Should always be true |
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
879 server_.HasWorklistRequestHandlerFactory()) |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
880 { |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3704
diff
changeset
|
881 std::unique_ptr<IFindRequestHandler> findHandler; |
1786
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
882 if (server_.HasFindRequestHandlerFactory()) |
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
883 { |
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
884 findHandler.reset(server_.GetFindRequestHandlerFactory().ConstructFindRequestHandler()); |
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
885 } |
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
886 |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3704
diff
changeset
|
887 std::unique_ptr<IWorklistRequestHandler> worklistHandler; |
1786
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
888 if (server_.HasWorklistRequestHandlerFactory()) |
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
889 { |
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
890 worklistHandler.reset(server_.GetWorklistRequestHandlerFactory().ConstructWorklistRequestHandler()); |
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
891 } |
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1573
diff
changeset
|
892 |
2381
b8969010b534
uncoupling DCMTK primitives from Orthanc::Configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2352
diff
changeset
|
893 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
|
894 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
|
895 remoteIp_, remoteAet_, calledAet_, associationTimeout_); |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
896 } |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
897 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
898 |
3604
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
899 case DicomRequestType_NAction: |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
900 cond = NActionScp(&msg, presID); |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
901 break; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
902 |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
903 case DicomRequestType_NEventReport: |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
904 cond = NEventReportScp(&msg, presID); |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
905 break; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
906 |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
907 default: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
908 // Should never happen |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
909 break; |
0 | 910 } |
911 } | |
912 } | |
913 else | |
914 { | |
915 // Bad status, which indicates the closing of the connection by | |
916 // the peer or a network error | |
917 finished = true; | |
665 | 918 |
667
aa2ab67d913d
log error to log info
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
919 LOG(INFO) << cond.text(); |
0 | 920 } |
921 | |
922 if (finished) | |
923 { | |
924 if (cond == DUL_PEERREQUESTEDRELEASE) | |
925 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
926 LOG(INFO) << "Association Release"; |
0 | 927 ASC_acknowledgeRelease(assoc_); |
928 } | |
929 else if (cond == DUL_PEERABORTEDASSOCIATION) | |
930 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
931 LOG(INFO) << "Association Aborted"; |
0 | 932 } |
933 else | |
934 { | |
935 OFString temp_str; | |
2352
3ab96768d144
Fix issue 52 (DICOM level security association problems)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2244
diff
changeset
|
936 LOG(INFO) << "DIMSE failure (aborting association): " << cond.text(); |
0 | 937 /* some kind of error so abort the association */ |
938 ASC_abortAssociation(assoc_); | |
939 } | |
940 } | |
941 | |
942 return !finished; | |
943 } | |
944 | |
945 | |
1073
01414536c930
complete DICOM conformance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
946 OFCondition EchoScp(T_ASC_Association * assoc, T_DIMSE_Message * msg, T_ASC_PresentationContextID presID) |
0 | 947 { |
948 OFString temp_str; | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
949 LOG(INFO) << "Received Echo Request"; |
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
950 //LOG(DEBUG) << DIMSE_dumpMessage(temp_str, msg->msg.CEchoRQ, DIMSE_INCOMING, NULL, presID)); |
0 | 951 |
952 /* the echo succeeded !! */ | |
953 OFCondition cond = DIMSE_sendEchoResponse(assoc, presID, &msg->msg.CEchoRQ, STATUS_Success, NULL); | |
954 if (cond.bad()) | |
955 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
956 LOG(ERROR) << "Echo SCP Failed: " << cond.text(); |
0 | 957 } |
958 return cond; | |
959 } | |
3604
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
960 |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
961 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
962 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
|
963 const char* errorMessage, |
bd34b6ac5c08
timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3705
diff
changeset
|
964 int timeout) |
3613
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 DcmDataset *tmp = NULL; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
967 T_ASC_PresentationContextID presIdData; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
968 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
969 OFCondition cond = DIMSE_receiveDataSetInMemory( |
3706
bd34b6ac5c08
timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3705
diff
changeset
|
970 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
|
971 &presIdData, &tmp, NULL, NULL); |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
972 if (!cond.good() || |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
973 tmp == NULL) |
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 throw OrthancException(ErrorCode_NetworkProtocol, errorMessage); |
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 return tmp; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
979 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
980 |
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 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
|
983 const DcmTagKey& tag) |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
984 { |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
985 const char* s = NULL; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
986 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
|
987 s == NULL) |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
988 { |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
989 char buf[64]; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
990 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
|
991 tag.getGroup(), tag.getElement()); |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
992 throw OrthancException(ErrorCode_NetworkProtocol, buf); |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
993 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
994 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
995 return std::string(s); |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
996 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
997 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
998 |
3736
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
999 static void ReadSopSequence( |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1000 std::vector<std::string>& sopClassUids, |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1001 std::vector<std::string>& sopInstanceUids, |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1002 std::vector<StorageCommitmentFailureReason>* failureReasons, // Can be NULL |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1003 DcmDataset& dataset, |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1004 const DcmTagKey& tag, |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1005 bool mandatory) |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1006 { |
3614
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1007 sopClassUids.clear(); |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1008 sopInstanceUids.clear(); |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1009 |
3736
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1010 if (failureReasons) |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1011 { |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1012 failureReasons->clear(); |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1013 } |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1014 |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1015 DcmSequenceOfItems* sequence = NULL; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1016 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
|
1017 sequence == NULL) |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1018 { |
3614
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1019 if (mandatory) |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1020 { |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1021 char buf[64]; |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1022 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
|
1023 tag.getGroup(), tag.getElement()); |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1024 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
|
1025 } |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1026 else |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1027 { |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1028 return; |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1029 } |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1030 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1031 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1032 sopClassUids.reserve(sequence->card()); |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1033 sopInstanceUids.reserve(sequence->card()); |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1034 |
3736
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1035 if (failureReasons) |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1036 { |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1037 failureReasons->reserve(sequence->card()); |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1038 } |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1039 |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1040 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
|
1041 { |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1042 const char* a = NULL; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1043 const char* b = NULL; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1044 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
|
1045 !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
|
1046 a == NULL || |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1047 b == NULL) |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1048 { |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1049 throw OrthancException(ErrorCode_NetworkProtocol, |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1050 "Missing Referenced SOP Class/Instance UID " |
3736
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1051 "in storage commitment dataset"); |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1052 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1053 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1054 sopClassUids.push_back(a); |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1055 sopInstanceUids.push_back(b); |
3736
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1056 |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1057 if (failureReasons != NULL) |
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 Uint16 reason; |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1060 if (!sequence->getItem(i)->findAndGetUint16(DCM_FailureReason, reason).good()) |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1061 { |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1062 throw OrthancException(ErrorCode_NetworkProtocol, |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1063 "Missing Failure Reason (0008,1197) " |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1064 "in storage commitment dataset"); |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1065 } |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1066 |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1067 failureReasons->push_back(static_cast<StorageCommitmentFailureReason>(reason)); |
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1068 } |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1069 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1070 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1071 |
3604
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 OFCondition CommandDispatcher::NActionScp(T_DIMSE_Message* msg, |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1074 T_ASC_PresentationContextID presID) |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1075 { |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1076 /** |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1077 * 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
|
1078 * 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
|
1079 * where "Action Type ID" equals "1". |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1080 * 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
|
1081 * 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
|
1082 **/ |
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 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
|
1085 !server_.HasStorageCommitmentRequestHandlerFactory()) |
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 throw OrthancException(ErrorCode_InternalError); |
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 |
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 * Check that the storage commitment request is correctly formatted. |
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 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1095 const T_DIMSE_N_ActionRQ& request = msg->msg.NActionRQ; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1096 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1097 if (request.ActionTypeID != 1) |
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 throw OrthancException(ErrorCode_NotImplemented, |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1100 "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
|
1101 } |
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 if (std::string(request.RequestedSOPClassUID) != UID_StorageCommitmentPushModelSOPClass || |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1104 std::string(request.RequestedSOPInstanceUID) != UID_StorageCommitmentPushModelSOPInstance) |
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 throw OrthancException(ErrorCode_NetworkProtocol, |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1107 "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
|
1108 } |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1109 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1110 if (request.DataSetType != DIMSE_DATASET_PRESENT) |
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 throw OrthancException(ErrorCode_NetworkProtocol, |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1113 "Incoming storage commitment request without a dataset"); |
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 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1116 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1117 /** |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1118 * 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
|
1119 * 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
|
1120 * J.3-1. Storage Commitment Request - Action Information": |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1121 * 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
|
1122 **/ |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1123 |
3767 | 1124 std::unique_ptr<DcmDataset> dataset( |
3706
bd34b6ac5c08
timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3705
diff
changeset
|
1125 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
|
1126 |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1127 std::string transactionUid = ReadString(*dataset, DCM_TransactionUID); |
3604
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1128 |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1129 std::vector<std::string> sopClassUid, sopInstanceUid; |
3736
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1130 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
|
1131 *dataset, DCM_ReferencedSOPSequence, true /* mandatory */); |
3604
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1132 |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1133 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
|
1134 |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1135 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
|
1136 { |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1137 LOG(INFO) << " (" << (i + 1) << "/" << sopClassUid.size() |
3604
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1138 << ") 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
|
1139 << sopClassUid[i] << " / " << sopInstanceUid[i]; |
3604
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 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1142 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1143 /** |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1144 * 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
|
1145 * codes can be found at: |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1146 * 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
|
1147 **/ |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1148 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1149 DIC_US dimseStatus; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1150 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1151 try |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1152 { |
3767 | 1153 std::unique_ptr<IStorageCommitmentRequestHandler> handler |
3604
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1154 (server_.GetStorageCommitmentRequestHandlerFactory(). |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1155 ConstructStorageCommitmentRequestHandler()); |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1156 |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1157 handler->HandleRequest(transactionUid, sopClassUid, sopInstanceUid, |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1158 remoteIp_, remoteAet_, calledAet_); |
3604
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1159 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1160 dimseStatus = 0; // Success |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1161 } |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1162 catch (OrthancException& e) |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1163 { |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1164 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
|
1165 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1166 // 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
|
1167 dimseStatus = STATUS_N_ProcessingFailure; |
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 |
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 * Send the DIMSE status back to the SCU. |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1173 **/ |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1174 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1175 { |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1176 T_DIMSE_Message response; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1177 memset(&response, 0, sizeof(response)); |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1178 response.CommandField = DIMSE_N_ACTION_RSP; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1179 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1180 T_DIMSE_N_ActionRSP& content = response.msg.NActionRSP; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1181 content.MessageIDBeingRespondedTo = request.MessageID; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1182 strncpy(content.AffectedSOPClassUID, UID_StorageCommitmentPushModelSOPClass, DIC_UI_LEN); |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1183 content.DimseStatus = dimseStatus; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1184 strncpy(content.AffectedSOPInstanceUID, UID_StorageCommitmentPushModelSOPInstance, DIC_UI_LEN); |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1185 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
|
1186 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
|
1187 content.opts = O_NACTION_AFFECTEDSOPCLASSUID | O_NACTION_AFFECTEDSOPINSTANCEUID; |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1188 |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1189 return DIMSE_sendMessageUsingMemoryData( |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1190 assoc_, presID, &response, NULL /* no dataset */, NULL /* dataObject */, |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1191 NULL /* callback */, NULL /* callback context */, NULL /* commandSet */); |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1192 } |
e327b44780bb
abstraction: storage commitment handler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3451
diff
changeset
|
1193 } |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1194 |
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 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
|
1197 T_ASC_PresentationContextID presID) |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1198 { |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1199 /** |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1200 * 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
|
1201 * storage commitment. |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1202 * 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
|
1203 * 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
|
1204 **/ |
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 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
|
1207 !server_.HasStorageCommitmentRequestHandlerFactory()) |
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 throw OrthancException(ErrorCode_InternalError); |
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 |
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 * 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
|
1215 **/ |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1216 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1217 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
|
1218 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1219 if (report.EventTypeID != 1 /* successful */ && |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1220 report.EventTypeID != 2 /* failures exist */) |
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 throw OrthancException(ErrorCode_NotImplemented, |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1223 "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
|
1224 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1225 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1226 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
|
1227 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
|
1228 { |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1229 throw OrthancException(ErrorCode_NetworkProtocol, |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1230 "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
|
1231 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1232 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1233 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
|
1234 { |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1235 throw OrthancException(ErrorCode_NetworkProtocol, |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1236 "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
|
1237 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1238 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1239 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1240 /** |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1241 * 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
|
1242 * 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
|
1243 * 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
|
1244 * 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
|
1245 **/ |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1246 |
3767 | 1247 std::unique_ptr<DcmDataset> dataset( |
3706
bd34b6ac5c08
timeouts in storage commitment SCU and SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3705
diff
changeset
|
1248 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
|
1249 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1250 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
|
1251 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1252 std::vector<std::string> successSopClassUid, successSopInstanceUid; |
3736
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1253 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
|
1254 *dataset, DCM_ReferencedSOPSequence, |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1255 (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
|
1256 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1257 std::vector<std::string> failedSopClassUid, failedSopInstanceUid; |
3736
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1258 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
|
1259 |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1260 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
|
1261 { |
3736
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1262 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
|
1263 *dataset, DCM_FailedSOPSequence, true); |
4543ffad256d
storage commitment requests/responses to/from self are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3613
diff
changeset
|
1264 } |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1265 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1266 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
|
1267 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1268 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
|
1269 { |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1270 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
|
1271 << ") SOP Class/Instance UID: " |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1272 << successSopClassUid[i] << " / " << successSopInstanceUid[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 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1275 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
|
1276 { |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1277 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
|
1278 << ") SOP Class/Instance UID: " |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1279 << failedSopClassUid[i] << " / " << failedSopInstanceUid[i]; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1280 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1281 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1282 /** |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1283 * 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
|
1284 * codes can be found at: |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1285 * 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
|
1286 **/ |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1287 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1288 DIC_US dimseStatus; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1289 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1290 try |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1291 { |
3767 | 1292 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
|
1293 (server_.GetStorageCommitmentRequestHandlerFactory(). |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1294 ConstructStorageCommitmentRequestHandler()); |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1295 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1296 handler->HandleReport(transactionUid, successSopClassUid, successSopInstanceUid, |
3736
0540b54324f1
StorageCommitmentReports
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1297 failedSopClassUid, failedSopInstanceUid, failureReasons, |
3613
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1298 remoteIp_, remoteAet_, calledAet_); |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1299 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1300 dimseStatus = 0; // Success |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1301 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1302 catch (OrthancException& e) |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1303 { |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1304 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
|
1305 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1306 // 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
|
1307 dimseStatus = STATUS_N_ProcessingFailure; |
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 |
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 * 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
|
1313 **/ |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1314 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1315 { |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1316 T_DIMSE_Message response; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1317 memset(&response, 0, sizeof(response)); |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1318 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
|
1319 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1320 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
|
1321 content.MessageIDBeingRespondedTo = report.MessageID; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1322 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
|
1323 content.DimseStatus = dimseStatus; |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1324 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
|
1325 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
|
1326 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
|
1327 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
|
1328 |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1329 return DIMSE_sendMessageUsingMemoryData( |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1330 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
|
1331 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
|
1332 } |
c1e2b91c2ab4
all the abstractions for storage commitment are available
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3612
diff
changeset
|
1333 } |
0 | 1334 } |
1335 } |