Mercurial > hg > orthanc
diff OrthancServer/main.cpp @ 1807:91216c42c6e5 worklists
integration mainline->worklists
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 23 Nov 2015 15:26:42 +0100 |
parents | f08978b1f45b cd213ebcaefd |
children | 5ed8769b17f9 |
line wrap: on
line diff
--- a/OrthancServer/main.cpp Fri Nov 20 17:56:31 2015 +0100 +++ b/OrthancServer/main.cpp Mon Nov 23 15:26:42 2015 +0100 @@ -190,7 +190,7 @@ virtual bool IsAllowedTransferSyntax(const std::string& remoteIp, const std::string& remoteAet, - const std::string& /*calledAet*/, + const std::string& calledAet, TransferSyntax syntax) { std::string configuration; @@ -239,6 +239,32 @@ LuaFunctionCall call(locker.GetLua(), lua.c_str()); call.PushString(remoteAet); call.PushString(remoteIp); + call.PushString(calledAet); + return call.ExecutePredicate(); + } + } + + return Configuration::GetGlobalBoolParameter(configuration, true); + } + + + virtual bool IsUnknownSopClassAccepted(const std::string& remoteIp, + const std::string& remoteAet, + const std::string& calledAet) + { + static const char* configuration = "UnknownSopClassAccepted"; + + { + std::string lua = "Is" + std::string(configuration); + + LuaScripting::Locker locker(context_.GetLua()); + + if (locker.GetLua().IsExistingFunction(lua.c_str())) + { + LuaFunctionCall call(locker.GetLua(), lua.c_str()); + call.PushString(remoteAet); + call.PushString(remoteIp); + call.PushString(calledAet); return call.ExecutePredicate(); } }