Mercurial > hg > orthanc
comparison OrthancServer/DicomProtocol/DicomServer.cpp @ 2068:879f3be759ef
renames to make code clearer
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 13 Jul 2016 16:10:25 +0200 |
parents | 325772dadcd6 |
children | fabf7820d1f1 |
comparison
equal
deleted
inserted
replaced
2067:02c543c42e61 | 2068:879f3be759ef |
---|---|
95 moveRequestHandlerFactory_ = NULL; | 95 moveRequestHandlerFactory_ = NULL; |
96 storeRequestHandlerFactory_ = NULL; | 96 storeRequestHandlerFactory_ = NULL; |
97 worklistRequestHandlerFactory_ = NULL; | 97 worklistRequestHandlerFactory_ = NULL; |
98 applicationEntityFilter_ = NULL; | 98 applicationEntityFilter_ = NULL; |
99 checkCalledAet_ = true; | 99 checkCalledAet_ = true; |
100 clientTimeout_ = 30; | 100 associationTimeout_ = 30; |
101 continue_ = false; | 101 continue_ = false; |
102 } | 102 } |
103 | 103 |
104 DicomServer::~DicomServer() | 104 DicomServer::~DicomServer() |
105 { | 105 { |
119 uint16_t DicomServer::GetPortNumber() const | 119 uint16_t DicomServer::GetPortNumber() const |
120 { | 120 { |
121 return port_; | 121 return port_; |
122 } | 122 } |
123 | 123 |
124 void DicomServer::SetClientTimeout(uint32_t timeout) | 124 void DicomServer::SetAssociationTimeout(uint32_t timeout) |
125 { | 125 { |
126 Stop(); | 126 Stop(); |
127 clientTimeout_ = timeout; | 127 associationTimeout_ = timeout; |
128 } | 128 } |
129 | 129 |
130 uint32_t DicomServer::GetClientTimeout() const | 130 uint32_t DicomServer::GetAssociationTimeout() const |
131 { | 131 { |
132 return clientTimeout_; | 132 return associationTimeout_; |
133 } | 133 } |
134 | 134 |
135 | 135 |
136 void DicomServer::SetCalledApplicationEntityTitleCheck(bool check) | 136 void DicomServer::SetCalledApplicationEntityTitleCheck(bool check) |
137 { | 137 { |
294 | 294 |
295 void DicomServer::Start() | 295 void DicomServer::Start() |
296 { | 296 { |
297 Stop(); | 297 Stop(); |
298 | 298 |
299 uint32_t timeout = associationTimeout_; | |
300 if (timeout == 0) | |
301 { | |
302 timeout = 30; // Some safe value (30 seconds) if association timeout is disabled | |
303 } | |
304 | |
299 /* initialize network, i.e. create an instance of T_ASC_Network*. */ | 305 /* initialize network, i.e. create an instance of T_ASC_Network*. */ |
300 OFCondition cond = ASC_initializeNetwork | 306 OFCondition cond = ASC_initializeNetwork |
301 (NET_ACCEPTOR, OFstatic_cast(int, port_), /*opt_acse_timeout*/ 30, &pimpl_->network_); | 307 (NET_ACCEPTOR, OFstatic_cast(int, port_), /*opt_acse_timeout*/ timeout, &pimpl_->network_); |
302 if (cond.bad()) | 308 if (cond.bad()) |
303 { | 309 { |
304 LOG(ERROR) << "cannot create network: " << cond.text(); | 310 LOG(ERROR) << "cannot create network: " << cond.text(); |
305 throw OrthancException(ErrorCode_DicomPortInUse); | 311 throw OrthancException(ErrorCode_DicomPortInUse); |
306 } | 312 } |