X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fstack%2FEngine.cpp;h=e8c77a309936c686f97dbc5e1bcdd07674806886;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=07daa793dd152df6ee3507c0ed231a5e958770b9;hpb=0c646b4aa99a84ef6976a51b6d4554aea11ded35;p=anna.git diff --git a/source/diameter/stack/Engine.cpp b/source/diameter/stack/Engine.cpp index 07daa79..e8c77a3 100644 --- a/source/diameter/stack/Engine.cpp +++ b/source/diameter/stack/Engine.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// http://redmine.teslayout.com/projects/anna-suite -// -// 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 the copyright holder 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 @@ -47,11 +19,6 @@ #include - -// libxml2 Parser doesn't support default attribute value retrieving: -// \n\ -// This dtd sintax will be replaced by #IMPLIED attributes. - namespace anna { namespace diameter { namespace stack { @@ -163,7 +130,7 @@ anna::diameter::stack::Engine::Engine(void) { //------------------------------------------------------------------------------ //------------------------------------------------------ Engine::getDictionary() //------------------------------------------------------------------------------ -const anna::diameter::stack::Dictionary * anna::diameter::stack::Engine::getDictionary(int stackId) const throw() { +const anna::diameter::stack::Dictionary * anna::diameter::stack::Engine::getDictionary(unsigned int stackId) const { const Dictionary * result = NULL; const_stack_iterator it = a_stacks.find(stackId); @@ -176,12 +143,11 @@ const anna::diameter::stack::Dictionary * anna::diameter::stack::Engine::getDict //------------------------------------------------------------------------------ //----------------------------------------------------------- Engine::asString() //------------------------------------------------------------------------------ -std::string anna::diameter::stack::Engine::asString(void) const throw() { +std::string anna::diameter::stack::Engine::asString(bool all) const { std::string trace; - int stackId; if(isEmpty()) { - trace = "No diameter dictionaries found"; + trace = "No diameter stacks found"; } else { int numberOfStacks = stack_size(); trace = ((numberOfStacks > 1) ? "Multi-stack " : "Mono-stack "); @@ -194,7 +160,11 @@ std::string anna::diameter::stack::Engine::asString(void) const throw() { std::string title = "Diameter stack id = "; title += anna::functions::asString((*it).first); trace += anna::functions::highlightJustify(title); - trace += (*it).second->asString(); trace += "\n"; + + if(all) trace += (*it).second->asString(); + else trace += (*it).second->getName(); + + trace += "\n"; } } @@ -206,7 +176,7 @@ std::string anna::diameter::stack::Engine::asString(void) const throw() { //------------------------------------------------------------------------------ //------------------------------------------------- Engine::registerDictionary() //------------------------------------------------------------------------------ -anna::diameter::stack::Dictionary * anna::diameter::stack::Engine::registerDictionary(int stackId, Dictionary *dictionary) throw(anna::RuntimeException) { +anna::diameter::stack::Dictionary * anna::diameter::stack::Engine::registerDictionary(unsigned int stackId, Dictionary *dictionary) noexcept(false) { Dictionary * result = const_cast(getDictionary(stackId)); if(!dictionary) @@ -216,7 +186,7 @@ anna::diameter::stack::Dictionary * anna::diameter::stack::Engine::registerDicti throw anna::RuntimeException("Such provided stack id has already been created. Removes it before call this method", ANNA_FILE_LOCATION); } else { // new stack a_stacks[stackId] = dictionary; // no need for singleton destructor - const_stack_iterator it = a_stacks.find(stackId); + //const_stack_iterator it = a_stacks.find(stackId); //result = (Dictionary *)(*it).second; result = dictionary; } @@ -227,11 +197,11 @@ anna::diameter::stack::Dictionary * anna::diameter::stack::Engine::registerDicti //------------------------------------------------------------------------------ //--------------------------------------------------- Engine::createDictionary() //------------------------------------------------------------------------------ -anna::diameter::stack::Dictionary * anna::diameter::stack::Engine::createDictionary(int stackId, const std::string & xmlPathFile) throw(anna::RuntimeException) { +anna::diameter::stack::Dictionary * anna::diameter::stack::Engine::createDictionary(unsigned int stackId, const std::string & xmlPathFile) noexcept(false) { Dictionary * result = const_cast(getDictionary(stackId)); if(result) // if exists, launch exception - throw anna::RuntimeException("Such provided stack id has already been created. Removes it before call this method", ANNA_FILE_LOCATION); + throw anna::RuntimeException("Such provided stack id has already been created (note: API allows you to remove any registered stack)", ANNA_FILE_LOCATION); // Register a new dictionary: result = registerDictionary(stackId, new Dictionary()); @@ -249,8 +219,8 @@ anna::diameter::stack::Dictionary * anna::diameter::stack::Engine::createDictio } -void anna::diameter::stack::Engine::loadDictionary(const std::vector & stacks, const std::string & xmlPathFile) throw(anna::RuntimeException) { - std::vector::const_iterator it; +void anna::diameter::stack::Engine::loadDictionary(const std::vector & stacks, const std::string & xmlPathFile) noexcept(false) { + std::vector::const_iterator it; Dictionary *d; if(xmlPathFile == "") @@ -273,7 +243,7 @@ void anna::diameter::stack::Engine::loadDictionary(const std::vector & stac } } -void anna::diameter::stack::Engine::loadDictionary(const std::string & xmlPathFile) throw(anna::RuntimeException) { +void anna::diameter::stack::Engine::loadDictionary(const std::string & xmlPathFile) noexcept(false) { Dictionary *d; if(xmlPathFile == "") @@ -289,7 +259,7 @@ void anna::diameter::stack::Engine::loadDictionary(const std::string & xmlPathFi //------------------------------------------------------------------------------ //-------------------------------------------------------- Engine::removeStack() //------------------------------------------------------------------------------ -void anna::diameter::stack::Engine::removeStack(int stackId) throw() { +void anna::diameter::stack::Engine::removeStack(unsigned int stackId) { stack_iterator it = a_stacks.find(stackId); if(it != stack_end()) { // if exists, clear