Mercurial > hg > orthanc
annotate OrthancServer/DicomProtocol/DicomServer.cpp @ 1794:bdfae6e17d23 worklists
integration mainline->worklists
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 19 Nov 2015 16:02:35 +0100 |
| parents | 164d78911382 |
| children | b1291df2f780 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 62 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1243
diff
changeset
|
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics |
|
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1243
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
| 0 | 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 | |
|
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
33 #include "../PrecompiledHeadersServer.h" |
| 0 | 34 #include "DicomServer.h" |
| 35 | |
|
1486
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1454
diff
changeset
|
36 #include "../../Core/Logging.h" |
| 62 | 37 #include "../../Core/OrthancException.h" |
| 0 | 38 #include "../../Core/Toolbox.h" |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
137
diff
changeset
|
39 #include "../../Core/Uuid.h" |
| 0 | 40 #include "../Internals/CommandDispatcher.h" |
|
690
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
41 #include "../OrthancInitialization.h" |
|
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
137
diff
changeset
|
42 #include "EmbeddedResources.h" |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
43 #include "../../Core/MultiThreading/RunnableWorkersPool.h" |
| 0 | 44 |
| 45 #include <boost/thread.hpp> | |
| 46 | |
|
376
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
47 #if defined(__linux) |
|
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
48 #include <cstdlib> |
|
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
49 #endif |
|
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
357
diff
changeset
|
50 |
| 0 | 51 |
| 62 | 52 namespace Orthanc |
| 0 | 53 { |
| 54 struct DicomServer::PImpl | |
| 55 { | |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
56 boost::thread thread_; |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
57 T_ASC_Network *network_; |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
58 std::auto_ptr<RunnableWorkersPool> workers_; |
| 0 | 59 }; |
| 60 | |
| 61 | |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
62 void DicomServer::ServerThread(DicomServer* server) |
|
685
b01cc78caba4
possibility to disable the DICOM/HTTP servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
660
diff
changeset
|
63 { |
|
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
64 LOG(INFO) << "DICOM server started"; |
| 0 | 65 |
| 66 while (server->continue_) | |
| 67 { | |
| 68 /* receive an association and acknowledge or reject it. If the association was */ | |
| 69 /* acknowledged, offer corresponding services and invoke one or more if required. */ | |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
70 std::auto_ptr<Internals::CommandDispatcher> dispatcher(Internals::AcceptAssociation(*server, server->pimpl_->network_)); |
| 0 | 71 |
| 1680 | 72 try |
| 0 | 73 { |
| 1680 | 74 if (dispatcher.get() != NULL) |
| 0 | 75 { |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
76 server->pimpl_->workers_->Add(dispatcher.release()); |
| 0 | 77 } |
| 1680 | 78 } |
| 79 catch (OrthancException& e) | |
| 80 { | |
| 81 LOG(ERROR) << "Exception in the DICOM server thread: " << e.What(); | |
| 0 | 82 } |
| 83 } | |
| 84 | |
|
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
85 LOG(INFO) << "DICOM server stopping"; |
| 1680 | 86 } |
| 0 | 87 |
| 88 | |
| 656 | 89 DicomServer::DicomServer() : |
| 90 pimpl_(new PImpl), | |
| 91 aet_("ANY-SCP") | |
| 0 | 92 { |
| 93 port_ = 104; | |
| 94 findRequestHandlerFactory_ = NULL; | |
| 95 moveRequestHandlerFactory_ = NULL; | |
| 96 storeRequestHandlerFactory_ = NULL; | |
|
1786
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
97 worklistRequestHandlerFactory_ = NULL; |
| 0 | 98 applicationEntityFilter_ = NULL; |
| 99 checkCalledAet_ = true; | |
| 100 clientTimeout_ = 30; | |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
101 continue_ = false; |
| 0 | 102 } |
| 103 | |
| 104 DicomServer::~DicomServer() | |
| 105 { | |
|
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
106 if (continue_) |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
107 { |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
108 LOG(ERROR) << "INTERNAL ERROR: DicomServer::Stop() should be invoked manually to avoid mess in the destruction order!"; |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
109 Stop(); |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
110 } |
| 0 | 111 } |
| 112 | |
| 128 | 113 void DicomServer::SetPortNumber(uint16_t port) |
| 0 | 114 { |
| 115 Stop(); | |
| 116 port_ = port; | |
| 117 } | |
| 118 | |
| 128 | 119 uint16_t DicomServer::GetPortNumber() const |
| 0 | 120 { |
| 121 return port_; | |
| 122 } | |
| 123 | |
| 124 void DicomServer::SetClientTimeout(uint32_t timeout) | |
| 125 { | |
| 126 Stop(); | |
| 127 clientTimeout_ = timeout; | |
| 128 } | |
| 129 | |
| 130 uint32_t DicomServer::GetClientTimeout() const | |
| 131 { | |
| 132 return clientTimeout_; | |
| 133 } | |
| 134 | |
| 135 | |
| 136 void DicomServer::SetCalledApplicationEntityTitleCheck(bool check) | |
| 137 { | |
| 138 Stop(); | |
| 139 checkCalledAet_ = check; | |
| 140 } | |
| 141 | |
| 142 bool DicomServer::HasCalledApplicationEntityTitleCheck() const | |
| 143 { | |
| 144 return checkCalledAet_; | |
| 145 } | |
| 146 | |
| 147 void DicomServer::SetApplicationEntityTitle(const std::string& aet) | |
| 148 { | |
| 149 if (aet.size() == 0) | |
| 150 { | |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
151 throw OrthancException(ErrorCode_BadApplicationEntityTitle); |
| 0 | 152 } |
| 153 | |
| 1234 | 154 if (aet.size() > 16) |
| 155 { | |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
156 throw OrthancException(ErrorCode_BadApplicationEntityTitle); |
| 1234 | 157 } |
| 158 | |
| 0 | 159 for (size_t i = 0; i < aet.size(); i++) |
| 160 { | |
| 1243 | 161 if (!(aet[i] == '-' || |
| 162 aet[i] == '_' || | |
| 163 isdigit(aet[i]) || | |
| 164 (aet[i] >= 'A' && aet[i] <= 'Z'))) | |
| 0 | 165 { |
| 1234 | 166 LOG(WARNING) << "For best interoperability, only upper case, alphanumeric characters should be present in AET: \"" << aet << "\""; |
| 167 break; | |
| 0 | 168 } |
| 169 } | |
| 170 | |
| 171 Stop(); | |
| 172 aet_ = aet; | |
| 173 } | |
| 174 | |
| 175 const std::string& DicomServer::GetApplicationEntityTitle() const | |
| 176 { | |
| 177 return aet_; | |
| 178 } | |
| 179 | |
| 180 void DicomServer::SetFindRequestHandlerFactory(IFindRequestHandlerFactory& factory) | |
| 181 { | |
| 182 Stop(); | |
| 183 findRequestHandlerFactory_ = &factory; | |
| 184 } | |
| 185 | |
| 186 bool DicomServer::HasFindRequestHandlerFactory() const | |
| 187 { | |
| 188 return (findRequestHandlerFactory_ != NULL); | |
| 189 } | |
| 190 | |
| 191 IFindRequestHandlerFactory& DicomServer::GetFindRequestHandlerFactory() const | |
| 192 { | |
| 193 if (HasFindRequestHandlerFactory()) | |
| 194 { | |
| 195 return *findRequestHandlerFactory_; | |
| 196 } | |
| 197 else | |
| 198 { | |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
199 throw OrthancException(ErrorCode_NoCFindHandler); |
| 0 | 200 } |
| 201 } | |
| 202 | |
| 203 void DicomServer::SetMoveRequestHandlerFactory(IMoveRequestHandlerFactory& factory) | |
| 204 { | |
| 205 Stop(); | |
| 206 moveRequestHandlerFactory_ = &factory; | |
| 207 } | |
| 208 | |
| 209 bool DicomServer::HasMoveRequestHandlerFactory() const | |
| 210 { | |
| 211 return (moveRequestHandlerFactory_ != NULL); | |
| 212 } | |
| 213 | |
| 214 IMoveRequestHandlerFactory& DicomServer::GetMoveRequestHandlerFactory() const | |
| 215 { | |
| 216 if (HasMoveRequestHandlerFactory()) | |
| 217 { | |
| 218 return *moveRequestHandlerFactory_; | |
| 219 } | |
| 220 else | |
| 221 { | |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
222 throw OrthancException(ErrorCode_NoCMoveHandler); |
| 0 | 223 } |
| 224 } | |
| 225 | |
| 226 void DicomServer::SetStoreRequestHandlerFactory(IStoreRequestHandlerFactory& factory) | |
| 227 { | |
| 228 Stop(); | |
| 229 storeRequestHandlerFactory_ = &factory; | |
| 230 } | |
| 231 | |
| 232 bool DicomServer::HasStoreRequestHandlerFactory() const | |
| 233 { | |
| 234 return (storeRequestHandlerFactory_ != NULL); | |
| 235 } | |
| 236 | |
| 237 IStoreRequestHandlerFactory& DicomServer::GetStoreRequestHandlerFactory() const | |
| 238 { | |
| 239 if (HasStoreRequestHandlerFactory()) | |
| 240 { | |
| 241 return *storeRequestHandlerFactory_; | |
| 242 } | |
| 243 else | |
| 244 { | |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
245 throw OrthancException(ErrorCode_NoCStoreHandler); |
| 0 | 246 } |
| 247 } | |
| 248 | |
|
1786
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
249 void DicomServer::SetWorklistRequestHandlerFactory(IWorklistRequestHandlerFactory& factory) |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
250 { |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
251 Stop(); |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
252 worklistRequestHandlerFactory_ = &factory; |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
253 } |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
254 |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
255 bool DicomServer::HasWorklistRequestHandlerFactory() const |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
256 { |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
257 return (worklistRequestHandlerFactory_ != NULL); |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
258 } |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
259 |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
260 IWorklistRequestHandlerFactory& DicomServer::GetWorklistRequestHandlerFactory() const |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
261 { |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
262 if (HasWorklistRequestHandlerFactory()) |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
263 { |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
264 return *worklistRequestHandlerFactory_; |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
265 } |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
266 else |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
267 { |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
268 throw OrthancException(ErrorCode_NoWorklistHandler); |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
269 } |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
270 } |
|
164d78911382
primitives to handle dicom worklists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1682
diff
changeset
|
271 |
| 0 | 272 void DicomServer::SetApplicationEntityFilter(IApplicationEntityFilter& factory) |
| 273 { | |
| 274 Stop(); | |
| 275 applicationEntityFilter_ = &factory; | |
| 276 } | |
| 277 | |
| 278 bool DicomServer::HasApplicationEntityFilter() const | |
| 279 { | |
| 280 return (applicationEntityFilter_ != NULL); | |
| 281 } | |
| 282 | |
| 283 IApplicationEntityFilter& DicomServer::GetApplicationEntityFilter() const | |
| 284 { | |
| 285 if (HasApplicationEntityFilter()) | |
| 286 { | |
| 287 return *applicationEntityFilter_; | |
| 288 } | |
| 289 else | |
| 290 { | |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1486
diff
changeset
|
291 throw OrthancException(ErrorCode_NoApplicationEntityFilter); |
| 0 | 292 } |
| 293 } | |
| 294 | |
| 295 void DicomServer::Start() | |
| 296 { | |
| 297 Stop(); | |
| 298 | |
| 1680 | 299 /* initialize network, i.e. create an instance of T_ASC_Network*. */ |
| 300 OFCondition cond = ASC_initializeNetwork | |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
301 (NET_ACCEPTOR, OFstatic_cast(int, port_), /*opt_acse_timeout*/ 30, &pimpl_->network_); |
| 1680 | 302 if (cond.bad()) |
| 0 | 303 { |
| 1680 | 304 LOG(ERROR) << "cannot create network: " << cond.text(); |
| 305 throw OrthancException(ErrorCode_DicomPortInUse); | |
| 0 | 306 } |
| 1680 | 307 |
|
1675
131136aeeaa7
improved exception handling in the main program
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1656
diff
changeset
|
308 continue_ = true; |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
309 pimpl_->workers_.reset(new RunnableWorkersPool(4)); // Use 4 workers - TODO as a parameter? |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
310 pimpl_->thread_ = boost::thread(ServerThread, this); |
| 0 | 311 } |
| 312 | |
|
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
313 |
| 0 | 314 void DicomServer::Stop() |
| 315 { | |
|
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
316 if (continue_) |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
317 { |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
318 continue_ = false; |
|
431
16b52fb8d034
fix by cyril paulus
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
319 |
|
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
320 if (pimpl_->thread_.joinable()) |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
321 { |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
322 pimpl_->thread_.join(); |
|
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
323 } |
| 1454 | 324 |
|
1681
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
325 pimpl_->workers_.reset(NULL); |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
326 |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
327 /* drop the network, i.e. free memory of T_ASC_Network* structure. This call */ |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
328 /* is the counterpart of ASC_initializeNetwork(...) which was called above. */ |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
329 OFCondition cond = ASC_dropNetwork(&pimpl_->network_); |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
330 if (cond.bad()) |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
331 { |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
332 LOG(ERROR) << "Error while dropping the network: " << cond.text(); |
|
ee4367497d0d
got rid of buggy BagOfRunnablesBySteps
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1680
diff
changeset
|
333 } |
|
431
16b52fb8d034
fix by cyril paulus
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
334 } |
| 0 | 335 } |
|
690
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
336 |
|
1453
c0bdc47165ef
code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1288
diff
changeset
|
337 |
|
690
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
338 bool DicomServer::IsMyAETitle(const std::string& aet) const |
|
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
339 { |
|
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
340 if (!HasCalledApplicationEntityTitleCheck()) |
|
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
341 { |
|
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
342 // OK, no check on the AET. |
|
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
343 return true; |
|
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
344 } |
|
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
345 |
|
810
401a9633e492
configuration into a namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
690
diff
changeset
|
346 return Configuration::IsSameAETitle(aet, GetApplicationEntityTitle()); |
|
690
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
347 } |
|
2e67366aab83
case-insensitive matching of Application Entity Titles
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
348 |
| 0 | 349 } |