X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fcodec%2FEngineImpl.cpp;h=9d06706ec01ffba6f763b86098b9ef36e24bb3d3;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=bda3c1f6535f1c8a5d02ed4bc59efb826c6d40a9;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/diameter/codec/EngineImpl.cpp b/source/diameter/codec/EngineImpl.cpp index bda3c1f..9d06706 100644 --- a/source/diameter/codec/EngineImpl.cpp +++ b/source/diameter/codec/EngineImpl.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not 'N' Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // // Local @@ -51,126 +23,38 @@ #include - -namespace anna { -namespace diameter { -namespace codec { - -const char *MessageDTD = "\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -\n\ -"; - - -} -} -} - using namespace anna::diameter::codec; //------------------------------------------------------------------------------ //----------------------------------------------------- EngineImpl::EngineImpl() //------------------------------------------------------------------------------ -EngineImpl::EngineImpl(const char* className) : +EngineImpl::EngineImpl(const char* className, const stack::Dictionary * dictionary) : anna::Component(className), - a_dictionary(NULL), + a_dictionary(dictionary), a_validationDepth(ValidationDepth::FirstError), a_validationMode(ValidationMode::AfterDecoding), + a_singleFailedAVP(true), a_ignoreFlags(false), - a_fixMode(FixMode::BeforeCoding) { + a_fixMode(FixMode::BeforeEncoding) { anna::diameter::sccs::activate(); anna::xml::functions::initialize(); - a_dtd.initialize(MessageDTD); -} - - -//------------------------------------------------------------------------------ -//-------------------------------------------------- EngineImpl::setDictionary() -//------------------------------------------------------------------------------ -const anna::diameter::stack::Dictionary *EngineImpl::setDictionary(int stackId) throw() { - a_dictionary = (stack::Engine::instantiate()).getDictionary(stackId); - return a_dictionary; } //------------------------------------------------------------------------------ //------------------------------------------------------ EngineImpl::createAvp() //------------------------------------------------------------------------------ -Avp* EngineImpl::createAvp(const AvpId *id) throw(anna::RuntimeException) { +Avp* EngineImpl::createAvp(const AvpId *id) noexcept(false) { Avp *result(NULL); anna::Guard guard(this, "diameter::codec::EngineImpl::createAvp"); if((result = allocateAvp()) == NULL) throw anna::RuntimeException("diameter::codec::EngineImpl::allocateAvp returns NULL", ANNA_FILE_LOCATION); + // Sets engine + result->setEngine((Engine*)this); + //result->clear(); better clear this at releaseAvp(), see class-help implementation example if(id) result->setId(*id); @@ -181,13 +65,16 @@ Avp* EngineImpl::createAvp(const AvpId *id) throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //-------------------------------------------------- EngineImpl::createMessage() //------------------------------------------------------------------------------ -Message* EngineImpl::createMessage(const CommandId *id) throw(anna::RuntimeException) { +Message* EngineImpl::createMessage(const CommandId *id) noexcept(false) { Message *result(NULL); anna::Guard guard(this, "diameter::codec::EngineImpl::createMessage"); if((result = allocateMessage()) == NULL) throw anna::RuntimeException("diameter::codec::EngineImpl::allocateMessage returns NULL", ANNA_FILE_LOCATION); + // Sets engine + result->setEngine((Engine*)this); + //result->clear(); better clear this at releaseMessage(), see class-help implementation example if(id) result->setId(*id); @@ -198,26 +85,32 @@ Message* EngineImpl::createMessage(const CommandId *id) throw(anna::RuntimeExcep //------------------------------------------------------------------------------ //-------------------------------------------------- EngineImpl::createMessage() //------------------------------------------------------------------------------ -Message *EngineImpl::createMessage(const std::string & xmlPathFile) throw(anna::RuntimeException) { +Message *EngineImpl::createMessage(const std::string & xmlPathFile_or_string, bool pathfile_or_string) noexcept(false) { Message *result = createMessage(); - result->loadXML(xmlPathFile); + if (pathfile_or_string) + result->loadXMLFile(xmlPathFile_or_string); + else + result->loadXMLString(xmlPathFile_or_string); + return result; } -std::string EngineImpl::asString(void) const throw() { +std::string EngineImpl::asString(void) const { std::string result = anna::Component::asString(); result += "\nValidationDepth: "; result += asText(a_validationDepth); result += "\nValidationMode: "; result += asText(a_validationMode); + result += "\nSingle Failed-AVP: "; + result += a_singleFailedAVP ? "yes" : "no"; result += "\nIgnore flags: "; result += a_ignoreFlags ? "yes" : "no"; result += "\nFixMode: "; result += asText(a_fixMode); result += "\nActivated Dictionary: "; - result += a_dictionary ? (a_dictionary->getName()) : ""; + result += a_dictionary ? (a_dictionary->getName()) : "[null]"; return result; } @@ -225,14 +118,15 @@ std::string EngineImpl::asString(void) const throw() { //---------------------------------------------------------- EngineImpl::asXML() //------------------------------------------------------------------------------ anna::xml::Node* EngineImpl::asXML(anna::xml::Node* parent) const -throw() { +{ parent = anna::Component::asXML(parent); anna::xml::Node* result = parent->createChild("diameter.codec.EngineImpl"); result->createAttribute("ValidationDepth", asText(a_validationDepth)); result->createAttribute("ValidationMode", asText(a_validationMode)); + result->createAttribute("SingleFailedAVP", a_singleFailedAVP ? "yes" : "no"); result->createAttribute("IgnoreFlags", a_ignoreFlags ? "yes" : "no"); result->createAttribute("FixMode", asText(a_fixMode)); - anna::xml::Node* dictionary = result->createChild("EngineImpl.ActivatedDictionary"); + result->createChild("EngineImpl.ActivatedDictionary"); if(a_dictionary) a_dictionary->asXML(result); @@ -243,7 +137,7 @@ throw() { //--------------------------------------------------------- EngineImpl::asText() //------------------------------------------------------------------------------ const char* EngineImpl::asText(const ValidationDepth::_v vd) -throw() { +{ static const char* text [] = { "Complete", "FirstError" }; return text [vd]; } @@ -252,8 +146,8 @@ throw() { //--------------------------------------------------------- EngineImpl::asText() //------------------------------------------------------------------------------ const char* EngineImpl::asText(const ValidationMode::_v vm) -throw() { - static const char* text [] = { "BeforeCoding", "AfterDecoding", "Always", "Never" }; +{ + static const char* text [] = { "BeforeEncoding", "AfterDecoding", "Always", "Never" }; return text [vm]; } @@ -261,15 +155,15 @@ throw() { //--------------------------------------------------------- EngineImpl::asText() //------------------------------------------------------------------------------ const char* EngineImpl::asText(const FixMode::_v fm) -throw() { - static const char* text [] = { "BeforeCoding", "AfterDecoding", "Always", "Never" }; +{ + static const char* text [] = { "BeforeEncoding", "AfterDecoding", "Always", "Never" }; return text [fm]; } //------------------------------------------------------------------------------ //---------------------------------------------- EngineImpl::validationAnomaly() //------------------------------------------------------------------------------ -void EngineImpl::validationAnomaly(const std::string & description) const throw(anna::RuntimeException) { +void EngineImpl::validationAnomaly(const std::string & description) const noexcept(false) { std::string msg = "Validation error: "; if(a_validationDepth == ValidationDepth::FirstError) @@ -282,7 +176,7 @@ void EngineImpl::validationAnomaly(const std::string & description) const throw( //------------------------------------------------------------------------------ //--------------------------------------------------- EngineImpl::avpIdForName() //------------------------------------------------------------------------------ -anna::diameter::AvpId EngineImpl::avpIdForName(const char * name) throw(anna::RuntimeException) { +anna::diameter::AvpId EngineImpl::avpIdForName(const char * name) noexcept(false) { if(!name) throw anna::RuntimeException("Provided NULL Avp Logical Name", ANNA_FILE_LOCATION); @@ -307,7 +201,7 @@ anna::diameter::AvpId EngineImpl::avpIdForName(const char * name) throw(anna::Ru //------------------------------------------------------------------------------ //----------------------------------------------- EngineImpl::commandIdForName() //------------------------------------------------------------------------------ -anna::diameter::CommandId EngineImpl::commandIdForName(const char * name) throw(anna::RuntimeException) { +anna::diameter::CommandId EngineImpl::commandIdForName(const char * name) noexcept(false) { if(!name) throw anna::RuntimeException("Provided NULL Command Logical Name", ANNA_FILE_LOCATION);