Mercurial > hg > orthanc
diff 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 |
line wrap: on
line diff
--- a/OrthancServer/DicomProtocol/DicomServer.cpp Wed Jul 13 15:55:50 2016 +0200 +++ b/OrthancServer/DicomProtocol/DicomServer.cpp Wed Jul 13 16:10:25 2016 +0200 @@ -97,7 +97,7 @@ worklistRequestHandlerFactory_ = NULL; applicationEntityFilter_ = NULL; checkCalledAet_ = true; - clientTimeout_ = 30; + associationTimeout_ = 30; continue_ = false; } @@ -121,15 +121,15 @@ return port_; } - void DicomServer::SetClientTimeout(uint32_t timeout) + void DicomServer::SetAssociationTimeout(uint32_t timeout) { Stop(); - clientTimeout_ = timeout; + associationTimeout_ = timeout; } - uint32_t DicomServer::GetClientTimeout() const + uint32_t DicomServer::GetAssociationTimeout() const { - return clientTimeout_; + return associationTimeout_; } @@ -296,9 +296,15 @@ { Stop(); + uint32_t timeout = associationTimeout_; + if (timeout == 0) + { + timeout = 30; // Some safe value (30 seconds) if association timeout is disabled + } + /* initialize network, i.e. create an instance of T_ASC_Network*. */ OFCondition cond = ASC_initializeNetwork - (NET_ACCEPTOR, OFstatic_cast(int, port_), /*opt_acse_timeout*/ 30, &pimpl_->network_); + (NET_ACCEPTOR, OFstatic_cast(int, port_), /*opt_acse_timeout*/ timeout, &pimpl_->network_); if (cond.bad()) { LOG(ERROR) << "cannot create network: " << cond.text();