Mercurial > hg > orthanc
diff OrthancServer/Internals/MoveScp.cpp @ 1799:4f01c9d73f02 worklists
calledAet made available to all the handlers
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 20 Nov 2015 12:57:14 +0100 |
parents | 164d78911382 |
children | b1291df2f780 |
line wrap: on
line diff
--- a/OrthancServer/Internals/MoveScp.cpp Fri Nov 20 12:00:34 2015 +0100 +++ b/OrthancServer/Internals/MoveScp.cpp Fri Nov 20 12:57:14 2015 +0100 @@ -105,6 +105,7 @@ std::auto_ptr<IMoveRequestIterator> iterator_; const std::string* remoteIp_; const std::string* remoteAet_; + const std::string* calledAet_; }; @@ -133,7 +134,8 @@ try { data.iterator_.reset(data.handler_->Handle(data.target_, input, - *data.remoteIp_, *data.remoteAet_)); + *data.remoteIp_, *data.remoteAet_, + *data.calledAet_)); if (data.iterator_.get() == NULL) { @@ -215,7 +217,8 @@ T_ASC_PresentationContextID presID, IMoveRequestHandler& handler, const std::string& remoteIp, - const std::string& remoteAet) + const std::string& remoteAet, + const std::string& calledAet) { MoveScpData data; data.target_ = std::string(msg->msg.CMoveRQ.MoveDestination); @@ -223,6 +226,7 @@ data.handler_ = &handler; data.remoteIp_ = &remoteIp; data.remoteAet_ = &remoteAet; + data.calledAet_ = &calledAet; OFCondition cond = DIMSE_moveProvider(assoc, presID, &msg->msg.CMoveRQ, MoveScpCallback, &data,