Mercurial > hg > orthanc

comparison Core/DicomNetworking/Internals/CommandDispatcher.cpp @ 3705:d8b214a46b91 storage-commitment

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->storage-commitment
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 27 Feb 2020 12:07:19 +0100
parents 898903022836 58f92b1c8061
children bd34b6ac5c08
comparison
equal deleted inserted replaced
3703:2eeaa076c8f6 3705:d8b214a46b91
785 std::auto_ptr<IStoreRequestHandler> handler 785 std::auto_ptr<IStoreRequestHandler> handler
786 (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler()); 786 (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler());
787 787
788 if (handler.get() != NULL) 788 if (handler.get() != NULL)
789 { 789 {
790 cond = Internals::storeScp(assoc_, &msg, presID, *handler, remoteIp_); 790 cond = Internals::storeScp(assoc_, &msg, presID, *handler, remoteIp_, associationTimeout_);
791 } 791 }
792 } 792 }
793 break; 793 break;
794 794
795 case DicomRequestType_Move: 795 case DicomRequestType_Move:
798 std::auto_ptr<IMoveRequestHandler> handler 798 std::auto_ptr<IMoveRequestHandler> handler
799 (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler()); 799 (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler());
800 800
801 if (handler.get() != NULL) 801 if (handler.get() != NULL)
802 { 802 {
803 cond = Internals::moveScp(assoc_, &msg, presID, *handler, remoteIp_, remoteAet_, calledAet_); 803 cond = Internals::moveScp(assoc_, &msg, presID, *handler, remoteIp_, remoteAet_, calledAet_, associationTimeout_);
804 } 804 }
805 } 805 }
806 break; 806 break;
807 807
808 case DicomRequestType_Find: 808 case DicomRequestType_Find:
821 worklistHandler.reset(server_.GetWorklistRequestHandlerFactory().ConstructWorklistRequestHandler()); 821 worklistHandler.reset(server_.GetWorklistRequestHandlerFactory().ConstructWorklistRequestHandler());
822 } 822 }
823 823
824 cond = Internals::findScp(assoc_, &msg, presID, server_.GetRemoteModalities(), 824 cond = Internals::findScp(assoc_, &msg, presID, server_.GetRemoteModalities(),
825 findHandler.get(), worklistHandler.get(), 825 findHandler.get(), worklistHandler.get(),
826 remoteIp_, remoteAet_, calledAet_); 826 remoteIp_, remoteAet_, calledAet_, associationTimeout_);
827 } 827 }
828 break; 828 break;
829 829
830 case DicomRequestType_NAction: 830 case DicomRequestType_NAction:
831 cond = NActionScp(&msg, presID); 831 cond = NActionScp(&msg, presID);