Mercurial > hg > orthanc

comparison Core/DicomNetworking/Internals/CommandDispatcher.cpp @ 3704:58f92b1c8061

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue #167 (Job can't be cancelled - Handling of timeouts after established association)
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 27 Feb 2020 11:25:57 +0100
parents 4922bdd046dd
children d8b214a46b91 2a170a8f1faf
comparison
equal deleted inserted replaced
3702:643b5ee86f92 3704:58f92b1c8061
741 std::auto_ptr<IStoreRequestHandler> handler 741 std::auto_ptr<IStoreRequestHandler> handler
742 (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler()); 742 (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler());
743 743
744 if (handler.get() != NULL) 744 if (handler.get() != NULL)
745 { 745 {
746 cond = Internals::storeScp(assoc_, &msg, presID, *handler, remoteIp_); 746 cond = Internals::storeScp(assoc_, &msg, presID, *handler, remoteIp_, associationTimeout_);
747 } 747 }
748 } 748 }
749 break; 749 break;
750 750
751 case DicomRequestType_Move: 751 case DicomRequestType_Move:
754 std::auto_ptr<IMoveRequestHandler> handler 754 std::auto_ptr<IMoveRequestHandler> handler
755 (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler()); 755 (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler());
756 756
757 if (handler.get() != NULL) 757 if (handler.get() != NULL)
758 { 758 {
759 cond = Internals::moveScp(assoc_, &msg, presID, *handler, remoteIp_, remoteAet_, calledAet_); 759 cond = Internals::moveScp(assoc_, &msg, presID, *handler, remoteIp_, remoteAet_, calledAet_, associationTimeout_);
760 } 760 }
761 } 761 }
762 break; 762 break;
763 763
764 case DicomRequestType_Find: 764 case DicomRequestType_Find:
777 worklistHandler.reset(server_.GetWorklistRequestHandlerFactory().ConstructWorklistRequestHandler()); 777 worklistHandler.reset(server_.GetWorklistRequestHandlerFactory().ConstructWorklistRequestHandler());
778 } 778 }
779 779
780 cond = Internals::findScp(assoc_, &msg, presID, server_.GetRemoteModalities(), 780 cond = Internals::findScp(assoc_, &msg, presID, server_.GetRemoteModalities(),
781 findHandler.get(), worklistHandler.get(), 781 findHandler.get(), worklistHandler.get(),
782 remoteIp_, remoteAet_, calledAet_); 782 remoteIp_, remoteAet_, calledAet_, associationTimeout_);
783 } 783 }
784 break; 784 break;
785 785
786 default: 786 default:
787 // Should never happen 787 // Should never happen