Mercurial > hg > orthanc
comparison OrthancServer/Internals/CommandDispatcher.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 | b1291df2f780 |
children | ddc75c6c712d |
comparison
equal
deleted
inserted
replaced
2067:02c543c42e61 | 2068:879f3be759ef |
---|---|
725 finished = true; | 725 finished = true; |
726 } | 726 } |
727 else if (cond == DIMSE_NODATAAVAILABLE) | 727 else if (cond == DIMSE_NODATAAVAILABLE) |
728 { | 728 { |
729 // Timeout due to DIMSE_NONBLOCKING | 729 // Timeout due to DIMSE_NONBLOCKING |
730 if (clientTimeout_ != 0 && | 730 if (associationTimeout_ != 0 && |
731 elapsedTimeSinceLastCommand_ >= clientTimeout_) | 731 elapsedTimeSinceLastCommand_ >= associationTimeout_) |
732 { | 732 { |
733 // This timeout is actually a client timeout | 733 // This timeout is actually a association timeout |
734 finished = true; | 734 finished = true; |
735 } | 735 } |
736 } | 736 } |
737 else if (cond == EC_Normal) | 737 else if (cond == EC_Normal) |
738 { | 738 { |
739 // Reset the client timeout counter | 739 // Reset the association timeout counter |
740 elapsedTimeSinceLastCommand_ = 0; | 740 elapsedTimeSinceLastCommand_ = 0; |
741 | 741 |
742 // Convert the type of request to Orthanc's internal type | 742 // Convert the type of request to Orthanc's internal type |
743 bool supported = false; | 743 bool supported = false; |
744 DicomRequestType request; | 744 DicomRequestType request; |