Mercurial > hg > orthanc
annotate OrthancServer/Internals/CommandDispatcher.cpp @ 661:d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 05 Nov 2013 17:41:25 +0100 |
parents | 4aa6f0d79947 |
children | 41b3e5ccb291 |
rev | line source |
---|---|
0 | 1 /** |
62 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
399 | 3 * Copyright (C) 2012-2013 Medical Physics Department, CHU of Liege, |
0 | 4 * Belgium |
5 * | |
6 * This program is free software: you can redistribute it and/or | |
7 * modify it under the terms of the GNU General Public License as | |
8 * published by the Free Software Foundation, either version 3 of the | |
9 * License, or (at your option) any later version. | |
136 | 10 * |
11 * In addition, as a special exception, the copyright holders of this | |
12 * program give permission to link the code of its release with the | |
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
14 * that use the same license as the "OpenSSL" library), and distribute | |
15 * the linked executables. You must obey the GNU General Public License | |
16 * in all respects for all of the code used other than "OpenSSL". If you | |
17 * modify file(s) with this exception, you may extend this exception to | |
18 * your version of the file(s), but you are not obligated to do so. If | |
19 * you do not wish to do so, delete this exception statement from your | |
20 * version. If you delete this exception statement from all source files | |
21 * in the program, then also delete it here. | |
0 | 22 * |
23 * This program is distributed in the hope that it will be useful, but | |
24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
26 * General Public License for more details. | |
27 * | |
28 * You should have received a copy of the GNU General Public License | |
29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
30 **/ | |
31 | |
32 | |
33 #include "CommandDispatcher.h" | |
34 | |
35 #include "FindScp.h" | |
36 #include "StoreScp.h" | |
37 #include "MoveScp.h" | |
38 #include "../../Core/Toolbox.h" | |
39 | |
40 #include <dcmtk/dcmnet/dcasccfg.h> /* for class DcmAssociationConfiguration */ | |
101 | 41 #include <boost/lexical_cast.hpp> |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
42 #include <glog/logging.h> |
0 | 43 |
503 | 44 #define ORTHANC_PROMISCUOUS 1 |
45 | |
0 | 46 static OFBool opt_rejectWithoutImplementationUID = OFFalse; |
47 | |
48 | |
503 | 49 |
50 #if ORTHANC_PROMISCUOUS == 1 | |
51 static | |
52 DUL_PRESENTATIONCONTEXT * | |
53 findPresentationContextID(LST_HEAD * head, | |
54 T_ASC_PresentationContextID presentationContextID) | |
55 { | |
56 DUL_PRESENTATIONCONTEXT *pc; | |
57 LST_HEAD **l; | |
58 OFBool found = OFFalse; | |
59 | |
60 if (head == NULL) | |
61 return NULL; | |
62 | |
63 l = &head; | |
64 if (*l == NULL) | |
65 return NULL; | |
66 | |
67 pc = OFstatic_cast(DUL_PRESENTATIONCONTEXT *, LST_Head(l)); | |
68 (void)LST_Position(l, OFstatic_cast(LST_NODE *, pc)); | |
69 | |
70 while (pc && !found) { | |
71 if (pc->presentationContextID == presentationContextID) { | |
72 found = OFTrue; | |
73 } else { | |
74 pc = OFstatic_cast(DUL_PRESENTATIONCONTEXT *, LST_Next(l)); | |
75 } | |
76 } | |
77 return pc; | |
78 } | |
79 | |
80 | |
81 /** accept all presenstation contexts for unknown SOP classes, | |
82 * i.e. UIDs appearing in the list of abstract syntaxes | |
83 * where no corresponding name is defined in the UID dictionary. | |
84 * @param params pointer to association parameters structure | |
85 * @param transferSyntax transfer syntax to accept | |
86 * @param acceptedRole SCU/SCP role to accept | |
87 */ | |
88 static OFCondition acceptUnknownContextsWithTransferSyntax( | |
89 T_ASC_Parameters * params, | |
90 const char* transferSyntax, | |
91 T_ASC_SC_ROLE acceptedRole) | |
92 { | |
93 OFCondition cond = EC_Normal; | |
94 int n, i, k; | |
95 DUL_PRESENTATIONCONTEXT *dpc; | |
96 T_ASC_PresentationContext pc; | |
97 OFBool accepted = OFFalse; | |
98 OFBool abstractOK = OFFalse; | |
99 | |
100 n = ASC_countPresentationContexts(params); | |
101 for (i = 0; i < n; i++) | |
102 { | |
103 cond = ASC_getPresentationContext(params, i, &pc); | |
104 if (cond.bad()) return cond; | |
105 abstractOK = OFFalse; | |
106 accepted = OFFalse; | |
107 | |
108 if (dcmFindNameOfUID(pc.abstractSyntax) == NULL) | |
109 { | |
110 abstractOK = OFTrue; | |
111 | |
112 /* check the transfer syntax */ | |
113 for (k = 0; (k < OFstatic_cast(int, pc.transferSyntaxCount)) && !accepted; k++) | |
114 { | |
115 if (strcmp(pc.proposedTransferSyntaxes[k], transferSyntax) == 0) | |
116 { | |
117 accepted = OFTrue; | |
118 } | |
119 } | |
120 } | |
121 | |
122 if (accepted) | |
123 { | |
124 cond = ASC_acceptPresentationContext( | |
125 params, pc.presentationContextID, | |
126 transferSyntax, acceptedRole); | |
127 if (cond.bad()) return cond; | |
128 } else { | |
129 T_ASC_P_ResultReason reason; | |
130 | |
131 /* do not refuse if already accepted */ | |
132 dpc = findPresentationContextID(params->DULparams.acceptedPresentationContext, | |
133 pc.presentationContextID); | |
134 if ((dpc == NULL) || ((dpc != NULL) && (dpc->result != ASC_P_ACCEPTANCE))) | |
135 { | |
136 | |
137 if (abstractOK) { | |
138 reason = ASC_P_TRANSFERSYNTAXESNOTSUPPORTED; | |
139 } else { | |
140 reason = ASC_P_ABSTRACTSYNTAXNOTSUPPORTED; | |
141 } | |
142 /* | |
143 * If previously this presentation context was refused | |
144 * because of bad transfer syntax let it stay that way. | |
145 */ | |
146 if ((dpc != NULL) && (dpc->result == ASC_P_TRANSFERSYNTAXESNOTSUPPORTED)) | |
147 reason = ASC_P_TRANSFERSYNTAXESNOTSUPPORTED; | |
148 | |
149 cond = ASC_refusePresentationContext(params, pc.presentationContextID, reason); | |
150 if (cond.bad()) return cond; | |
151 } | |
152 } | |
153 } | |
154 return EC_Normal; | |
155 } | |
156 | |
157 | |
158 /** accept all presenstation contexts for unknown SOP classes, | |
159 * i.e. UIDs appearing in the list of abstract syntaxes | |
160 * where no corresponding name is defined in the UID dictionary. | |
161 * This method is passed a list of "preferred" transfer syntaxes. | |
162 * @param params pointer to association parameters structure | |
163 * @param transferSyntax transfer syntax to accept | |
164 * @param acceptedRole SCU/SCP role to accept | |
165 */ | |
166 static OFCondition acceptUnknownContextsWithPreferredTransferSyntaxes( | |
167 T_ASC_Parameters * params, | |
168 const char* transferSyntaxes[], int transferSyntaxCount, | |
169 T_ASC_SC_ROLE acceptedRole = ASC_SC_ROLE_DEFAULT) | |
170 { | |
171 OFCondition cond = EC_Normal; | |
172 /* | |
173 ** Accept in the order "least wanted" to "most wanted" transfer | |
174 ** syntax. Accepting a transfer syntax will override previously | |
175 ** accepted transfer syntaxes. | |
176 */ | |
177 for (int i = transferSyntaxCount - 1; i >= 0; i--) | |
178 { | |
179 cond = acceptUnknownContextsWithTransferSyntax(params, transferSyntaxes[i], acceptedRole); | |
180 if (cond.bad()) return cond; | |
181 } | |
182 return cond; | |
183 } | |
184 #endif | |
185 | |
186 | |
62 | 187 namespace Orthanc |
0 | 188 { |
189 namespace Internals | |
190 { | |
191 OFCondition AssociationCleanup(T_ASC_Association *assoc) | |
192 { | |
193 OFString temp_str; | |
194 OFCondition cond = ASC_dropSCPAssociation(assoc); | |
195 if (cond.bad()) | |
196 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
197 LOG(FATAL) << cond.text(); |
0 | 198 return cond; |
199 } | |
200 | |
201 cond = ASC_destroyAssociation(&assoc); | |
202 if (cond.bad()) | |
203 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
204 LOG(FATAL) << cond.text(); |
0 | 205 return cond; |
206 } | |
207 | |
208 return cond; | |
209 } | |
210 | |
211 | |
212 | |
213 CommandDispatcher* AcceptAssociation(const DicomServer& server, T_ASC_Network *net) | |
214 { | |
215 DcmAssociationConfiguration asccfg; | |
216 char buf[BUFSIZ]; | |
217 T_ASC_Association *assoc; | |
218 OFCondition cond; | |
219 OFString sprofile; | |
220 OFString temp_str; | |
221 | |
222 std::vector<const char*> knownAbstractSyntaxes; | |
223 | |
224 // For C-STORE | |
225 if (server.HasStoreRequestHandlerFactory()) | |
226 { | |
227 knownAbstractSyntaxes.push_back(UID_VerificationSOPClass); | |
228 } | |
229 | |
230 // For C-FIND | |
231 if (server.HasFindRequestHandlerFactory()) | |
232 { | |
233 knownAbstractSyntaxes.push_back(UID_FINDPatientRootQueryRetrieveInformationModel); | |
234 knownAbstractSyntaxes.push_back(UID_FINDStudyRootQueryRetrieveInformationModel); | |
235 } | |
236 | |
237 // For C-MOVE | |
238 if (server.HasMoveRequestHandlerFactory()) | |
239 { | |
240 knownAbstractSyntaxes.push_back(UID_MOVEStudyRootQueryRetrieveInformationModel); | |
241 } | |
242 | |
243 cond = ASC_receiveAssociation(net, &assoc, | |
244 /*opt_maxPDU*/ ASC_DEFAULTMAXPDU, | |
245 NULL, NULL, | |
246 /*opt_secureConnection*/ OFFalse, | |
247 DUL_NOBLOCK, 1); | |
248 | |
249 if (cond == DUL_NOASSOCIATIONREQUEST) | |
250 { | |
251 // Timeout | |
252 AssociationCleanup(assoc); | |
253 return NULL; | |
254 } | |
255 | |
256 // if some kind of error occured, take care of it | |
257 if (cond.bad()) | |
258 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
259 LOG(ERROR) << "Receiving Association failed: " << cond.text(); |
0 | 260 // no matter what kind of error occurred, we need to do a cleanup |
261 AssociationCleanup(assoc); | |
262 return NULL; | |
263 } | |
264 | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
265 LOG(INFO) << "Association Received"; |
0 | 266 |
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
267 std::vector<const char*> transferSyntaxes; |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
268 |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
269 #if 0 |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
270 // This is the list of the transfer syntaxes that were supported up to Orthanc 0.7.1 |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
271 transferSyntaxes.push_back(UID_LittleEndianExplicitTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
272 transferSyntaxes.push_back(UID_BigEndianExplicitTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
273 transferSyntaxes.push_back(UID_LittleEndianImplicitTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
274 #else |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
275 transferSyntaxes.push_back(UID_LittleEndianImplicitTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
276 transferSyntaxes.push_back(UID_DeflatedExplicitVRLittleEndianTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
277 transferSyntaxes.push_back(UID_JPEGProcess1TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
278 transferSyntaxes.push_back(UID_JPEGProcess2_4TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
279 transferSyntaxes.push_back(UID_JPEGProcess3_5TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
280 transferSyntaxes.push_back(UID_JPEGProcess6_8TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
281 transferSyntaxes.push_back(UID_JPEGProcess7_9TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
282 transferSyntaxes.push_back(UID_JPEGProcess10_12TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
283 transferSyntaxes.push_back(UID_JPEGProcess11_13TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
284 transferSyntaxes.push_back(UID_JPEGProcess14TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
285 transferSyntaxes.push_back(UID_JPEGProcess15TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
286 transferSyntaxes.push_back(UID_JPEGProcess16_18TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
287 transferSyntaxes.push_back(UID_JPEGProcess17_19TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
288 transferSyntaxes.push_back(UID_JPEGProcess20_22TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
289 transferSyntaxes.push_back(UID_JPEGProcess21_23TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
290 transferSyntaxes.push_back(UID_JPEGProcess24_26TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
291 transferSyntaxes.push_back(UID_JPEGProcess25_27TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
292 transferSyntaxes.push_back(UID_JPEGProcess28TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
293 transferSyntaxes.push_back(UID_JPEGProcess29TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
294 transferSyntaxes.push_back(UID_JPEGProcess14SV1TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
295 transferSyntaxes.push_back(UID_JPEGLSLosslessTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
296 transferSyntaxes.push_back(UID_JPEGLSLossyTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
297 transferSyntaxes.push_back(UID_JPEG2000LosslessOnlyTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
298 transferSyntaxes.push_back(UID_JPEG2000TransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
299 transferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionLosslessOnlyTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
300 transferSyntaxes.push_back(UID_JPEG2000Part2MulticomponentImageCompressionTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
301 transferSyntaxes.push_back(UID_JPIPReferencedTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
302 transferSyntaxes.push_back(UID_JPIPReferencedDeflateTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
303 transferSyntaxes.push_back(UID_MPEG2MainProfileAtMainLevelTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
304 transferSyntaxes.push_back(UID_MPEG2MainProfileAtHighLevelTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
305 transferSyntaxes.push_back(UID_RLELosslessTransferSyntax); |
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
306 #endif |
0 | 307 |
308 /* accept the Verification SOP Class if presented */ | |
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
309 cond = ASC_acceptContextsWithPreferredTransferSyntaxes( assoc->params, &knownAbstractSyntaxes[0], knownAbstractSyntaxes.size(), &transferSyntaxes[0], transferSyntaxes.size()); |
0 | 310 if (cond.bad()) |
311 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
312 LOG(INFO) << cond.text(); |
0 | 313 AssociationCleanup(assoc); |
314 return NULL; | |
315 } | |
316 | |
317 /* the array of Storage SOP Class UIDs comes from dcuid.h */ | |
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
318 cond = ASC_acceptContextsWithPreferredTransferSyntaxes( assoc->params, dcmAllStorageSOPClassUIDs, numberOfAllDcmStorageSOPClassUIDs, &transferSyntaxes[0], transferSyntaxes.size()); |
0 | 319 if (cond.bad()) |
320 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
321 LOG(INFO) << cond.text(); |
0 | 322 AssociationCleanup(assoc); |
323 return NULL; | |
324 } | |
325 | |
503 | 326 #if ORTHANC_PROMISCUOUS == 1 |
327 /* accept everything not known not to be a storage SOP class */ | |
328 cond = acceptUnknownContextsWithPreferredTransferSyntaxes( | |
661
d233b5090105
accept more transfer syntaxes for C-Store SCP, write meta-header when receiving files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
620
diff
changeset
|
329 assoc->params, &transferSyntaxes[0], transferSyntaxes.size()); |
503 | 330 if (cond.bad()) |
331 { | |
332 LOG(INFO) << cond.text(); | |
333 AssociationCleanup(assoc); | |
334 return NULL; | |
335 } | |
336 #endif | |
337 | |
0 | 338 /* set our app title */ |
339 ASC_setAPTitles(assoc->params, NULL, NULL, server.GetApplicationEntityTitle().c_str()); | |
340 | |
341 /* acknowledge or reject this association */ | |
342 cond = ASC_getApplicationContextName(assoc->params, buf); | |
343 if ((cond.bad()) || strcmp(buf, UID_StandardApplicationContext) != 0) | |
344 { | |
345 /* reject: the application context name is not supported */ | |
346 T_ASC_RejectParameters rej = | |
347 { | |
348 ASC_RESULT_REJECTEDPERMANENT, | |
349 ASC_SOURCE_SERVICEUSER, | |
350 ASC_REASON_SU_APPCONTEXTNAMENOTSUPPORTED | |
351 }; | |
352 | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
353 LOG(INFO) << "Association Rejected: Bad Application Context Name: " << buf; |
0 | 354 cond = ASC_rejectAssociation(assoc, &rej); |
355 if (cond.bad()) | |
356 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
357 LOG(INFO) << cond.text(); |
0 | 358 } |
359 AssociationCleanup(assoc); | |
360 return NULL; | |
361 } | |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
362 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
363 std::string callingIP; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
364 std::string callingTitle; |
0 | 365 |
366 /* check the AETs */ | |
367 { | |
368 DIC_AE callingTitle_C; | |
369 DIC_AE calledTitle_C; | |
370 DIC_AE callingIP_C; | |
371 DIC_AE calledIP_C; | |
372 if (ASC_getAPTitles(assoc->params, callingTitle_C, calledTitle_C, NULL).bad() || | |
373 ASC_getPresentationAddresses(assoc->params, callingIP_C, calledIP_C).bad()) | |
374 { | |
375 T_ASC_RejectParameters rej = | |
376 { | |
377 ASC_RESULT_REJECTEDPERMANENT, | |
378 ASC_SOURCE_SERVICEUSER, | |
379 ASC_REASON_SU_NOREASON | |
380 }; | |
381 ASC_rejectAssociation(assoc, &rej); | |
382 AssociationCleanup(assoc); | |
383 return NULL; | |
384 } | |
385 | |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
386 callingIP = std::string(/*OFSTRING_GUARD*/(callingIP_C)); |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
387 callingTitle = std::string(/*OFSTRING_GUARD*/(callingTitle_C)); |
101 | 388 std::string calledTitle(/*OFSTRING_GUARD*/(calledTitle_C)); |
0 | 389 Toolbox::ToUpperCase(callingIP); |
390 Toolbox::ToUpperCase(callingTitle); | |
391 Toolbox::ToUpperCase(calledTitle); | |
392 | |
393 if (server.HasCalledApplicationEntityTitleCheck() && | |
394 calledTitle != server.GetApplicationEntityTitle()) | |
395 { | |
396 T_ASC_RejectParameters rej = | |
397 { | |
398 ASC_RESULT_REJECTEDPERMANENT, | |
399 ASC_SOURCE_SERVICEUSER, | |
400 ASC_REASON_SU_CALLEDAETITLENOTRECOGNIZED | |
401 }; | |
402 ASC_rejectAssociation(assoc, &rej); | |
403 AssociationCleanup(assoc); | |
404 return NULL; | |
405 } | |
406 | |
407 if (server.HasApplicationEntityFilter() && | |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
408 !server.GetApplicationEntityFilter().IsAllowedConnection(callingIP, callingTitle)) |
0 | 409 { |
410 T_ASC_RejectParameters rej = | |
411 { | |
412 ASC_RESULT_REJECTEDPERMANENT, | |
413 ASC_SOURCE_SERVICEUSER, | |
414 ASC_REASON_SU_CALLINGAETITLENOTRECOGNIZED | |
415 }; | |
416 ASC_rejectAssociation(assoc, &rej); | |
417 AssociationCleanup(assoc); | |
418 return NULL; | |
419 } | |
420 } | |
421 | |
422 if (opt_rejectWithoutImplementationUID && strlen(assoc->params->theirImplementationClassUID) == 0) | |
423 { | |
424 /* reject: the no implementation Class UID provided */ | |
425 T_ASC_RejectParameters rej = | |
426 { | |
427 ASC_RESULT_REJECTEDPERMANENT, | |
428 ASC_SOURCE_SERVICEUSER, | |
429 ASC_REASON_SU_NOREASON | |
430 }; | |
431 | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
432 LOG(INFO) << "Association Rejected: No Implementation Class UID provided"; |
0 | 433 cond = ASC_rejectAssociation(assoc, &rej); |
434 if (cond.bad()) | |
435 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
436 LOG(INFO) << cond.text(); |
0 | 437 } |
438 AssociationCleanup(assoc); | |
439 return NULL; | |
440 } | |
441 | |
442 { | |
443 cond = ASC_acknowledgeAssociation(assoc); | |
444 if (cond.bad()) | |
445 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
446 LOG(ERROR) << cond.text(); |
0 | 447 AssociationCleanup(assoc); |
448 return NULL; | |
449 } | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
450 LOG(INFO) << "Association Acknowledged (Max Send PDV: " << assoc->sendPDVLength << ")"; |
0 | 451 if (ASC_countAcceptedPresentationContexts(assoc->params) == 0) |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
452 LOG(INFO) << " (but no valid presentation contexts)"; |
0 | 453 } |
454 | |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
455 IApplicationEntityFilter* filter = server.HasApplicationEntityFilter() ? &server.GetApplicationEntityFilter() : NULL; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
456 return new CommandDispatcher(server, assoc, callingIP, callingTitle, filter); |
0 | 457 } |
458 | |
459 bool CommandDispatcher::Step() | |
460 /* | |
461 * This function receives DIMSE commmands over the network connection | |
462 * and handles these commands correspondingly. Note that in case of | |
463 * storscp only C-ECHO-RQ and C-STORE-RQ commands can be processed. | |
464 */ | |
465 { | |
466 bool finished = false; | |
467 | |
468 // receive a DIMSE command over the network, with a timeout of 1 second | |
469 DcmDataset *statusDetail = NULL; | |
470 T_ASC_PresentationContextID presID = 0; | |
471 T_DIMSE_Message msg; | |
472 | |
473 OFCondition cond = DIMSE_receiveCommand(assoc_, DIMSE_NONBLOCKING, 1, &presID, &msg, &statusDetail); | |
474 elapsedTimeSinceLastCommand_++; | |
475 | |
476 // if the command which was received has extra status | |
477 // detail information, dump this information | |
478 if (statusDetail != NULL) | |
479 { | |
101 | 480 //LOG4CPP_WARN(Internals::GetLogger(), "Status Detail:" << OFendl << DcmObject::PrintHelper(*statusDetail)); |
0 | 481 delete statusDetail; |
482 } | |
483 | |
484 if (cond == DIMSE_OUTOFRESOURCES) | |
485 { | |
486 finished = true; | |
487 } | |
488 else if (cond == DIMSE_NODATAAVAILABLE) | |
489 { | |
490 // Timeout due to DIMSE_NONBLOCKING | |
491 if (clientTimeout_ != 0 && | |
492 elapsedTimeSinceLastCommand_ >= clientTimeout_) | |
493 { | |
494 // This timeout is actually a client timeout | |
495 finished = true; | |
496 } | |
497 } | |
498 else if (cond == EC_Normal) | |
499 { | |
500 // Reset the client timeout counter | |
501 elapsedTimeSinceLastCommand_ = 0; | |
502 | |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
503 // 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
|
504 bool supported = false; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
505 DicomRequestType request; |
0 | 506 switch (msg.CommandField) |
507 { | |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
508 case DIMSE_C_ECHO_RQ: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
509 request = DicomRequestType_Echo; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
510 supported = true; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
511 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
512 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
513 case DIMSE_C_STORE_RQ: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
514 request = DicomRequestType_Store; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
515 supported = true; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
516 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
517 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
518 case DIMSE_C_MOVE_RQ: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
519 request = DicomRequestType_Move; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
520 supported = true; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
521 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
522 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
523 case DIMSE_C_FIND_RQ: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
524 request = DicomRequestType_Find; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
525 supported = true; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
526 break; |
0 | 527 |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
528 default: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
529 // we cannot handle this kind of message |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
530 cond = DIMSE_BADCOMMANDTYPE; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
531 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
|
532 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
533 } |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
534 |
0 | 535 |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
536 // 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
|
537 if (supported && |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
538 filter_ != NULL && |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
539 !filter_->IsAllowedRequest(callingIP_, callingAETitle_, request)) |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
540 { |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
541 LOG(ERROR) << EnumerationToString(request) |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
542 << " requests are disallowed for the AET \"" |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
543 << callingAETitle_ << "\""; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
544 cond = DIMSE_BADCOMMANDTYPE; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
545 supported = false; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
546 } |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
547 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
548 // 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
|
549 if (supported) |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
550 { |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
551 // 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
|
552 cond = DIMSE_BADCOMMANDTYPE; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
553 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
554 switch (request) |
0 | 555 { |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
556 case DicomRequestType_Echo: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
557 cond = EchoScp(assoc_, &msg, presID); |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
558 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
559 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
560 case DicomRequestType_Store: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
561 if (server_.HasStoreRequestHandlerFactory()) // Should always be true |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
562 { |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
563 std::auto_ptr<IStoreRequestHandler> handler |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
564 (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler()); |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
565 cond = Internals::storeScp(assoc_, &msg, presID, *handler); |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
566 } |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
567 break; |
0 | 568 |
620
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
569 case DicomRequestType_Move: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
570 if (server_.HasMoveRequestHandlerFactory()) // Should always be true |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
571 { |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
572 std::auto_ptr<IMoveRequestHandler> handler |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
573 (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler()); |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
574 cond = Internals::moveScp(assoc_, &msg, presID, *handler); |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
575 } |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
576 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
577 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
578 case DicomRequestType_Find: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
579 if (server_.HasFindRequestHandlerFactory()) // Should always be true |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
580 { |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
581 std::auto_ptr<IFindRequestHandler> handler |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
582 (server_.GetFindRequestHandlerFactory().ConstructFindRequestHandler()); |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
583 cond = Internals::findScp(assoc_, &msg, presID, *handler); |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
584 } |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
585 break; |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
586 |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
587 default: |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
588 // Should never happen |
4aa6f0d79947
security filter for dicom requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
503
diff
changeset
|
589 break; |
0 | 590 } |
591 } | |
592 } | |
593 else | |
594 { | |
595 // Bad status, which indicates the closing of the connection by | |
596 // the peer or a network error | |
597 finished = true; | |
598 } | |
599 | |
600 if (finished) | |
601 { | |
602 if (cond == DUL_PEERREQUESTEDRELEASE) | |
603 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
604 LOG(INFO) << "Association Release"; |
0 | 605 ASC_acknowledgeRelease(assoc_); |
606 } | |
607 else if (cond == DUL_PEERABORTEDASSOCIATION) | |
608 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
609 LOG(INFO) << "Association Aborted"; |
0 | 610 } |
611 else | |
612 { | |
613 OFString temp_str; | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
614 LOG(ERROR) << "DIMSE failure (aborting association): " << cond.text(); |
0 | 615 /* some kind of error so abort the association */ |
616 ASC_abortAssociation(assoc_); | |
617 } | |
618 } | |
619 | |
620 return !finished; | |
621 } | |
622 | |
623 | |
624 OFCondition EchoScp( T_ASC_Association * assoc, T_DIMSE_Message * msg, T_ASC_PresentationContextID presID) | |
625 { | |
626 OFString temp_str; | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
627 LOG(INFO) << "Received Echo Request"; |
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
628 //LOG(DEBUG) << DIMSE_dumpMessage(temp_str, msg->msg.CEchoRQ, DIMSE_INCOMING, NULL, presID)); |
0 | 629 |
630 /* the echo succeeded !! */ | |
631 OFCondition cond = DIMSE_sendEchoResponse(assoc, presID, &msg->msg.CEchoRQ, STATUS_Success, NULL); | |
632 if (cond.bad()) | |
633 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
101
diff
changeset
|
634 LOG(ERROR) << "Echo SCP Failed: " << cond.text(); |
0 | 635 } |
636 return cond; | |
637 } | |
638 } | |
639 } |