X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fstack%2FDictionary.cpp;h=0f7826af1d4b00c754d8578f5dabf7f584af4e49;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=0d48b5dae9d1566ef5099da21b3f082cc0a73821;hpb=5256cb543a9d35b610df19bd227cde977186aef0;p=anna.git diff --git a/source/diameter/stack/Dictionary.cpp b/source/diameter/stack/Dictionary.cpp index 0d48b5d..0f7826a 100644 --- a/source/diameter/stack/Dictionary.cpp +++ b/source/diameter/stack/Dictionary.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 @@ -69,8 +41,9 @@ LOGNOTICE(\ trace += "\n";\ anna::Logger::notice(trace, ANNA_FILE_LOCATION);\ );\ +std::string name = found->getName();\ pool.erase(pool.find(found->getId()));\ -poolNames.erase(poolNames.find(found->getName())); +poolNames.erase(poolNames.find(name)); //------------------------------------------------------------------------------ @@ -85,7 +58,7 @@ Dictionary::Dictionary(void) { //------------------------------------------------------------------------------ //----------------------------------------------------- Dictionary::initialize() //------------------------------------------------------------------------------ -void Dictionary::initialize() throw() { +void Dictionary::initialize() { a_formats.clear(); a_vendors.clear(); a_avps.clear(); @@ -151,7 +124,7 @@ void Dictionary::initialize() throw() { //------------------------------------------------------------------------------ //------------------------------------------------------ Dictionary::addFormat() //------------------------------------------------------------------------------ -void Dictionary::addFormat(const Format & format, bool reserved) throw(anna::RuntimeException) { +void Dictionary::addFormat(const Format & format, bool reserved) noexcept(false) { if(!reserved && format.isReserved()) { std::string s_ex = anna::functions::asString("Format type '%s' is reserved for internal use", format.getName().c_str()); throw anna::RuntimeException(s_ex, ANNA_FILE_LOCATION); @@ -184,7 +157,7 @@ void Dictionary::addFormat(const Format & format, bool reserved) throw(anna::Run //------------------------------------------------------------------------------ //------------------------------------------------------ Dictionary::addVendor() //------------------------------------------------------------------------------ -void Dictionary::addVendor(const Vendor & vendor) throw(anna::RuntimeException) { +void Dictionary::addVendor(const Vendor & vendor) noexcept(false) { const Vendor * found = getVendor(vendor.getId()); if(found) { @@ -216,7 +189,7 @@ void Dictionary::addVendor(const Vendor & vendor) throw(anna::RuntimeException) //------------------------------------------------------------------------------ //--------------------------------------------------------- Dictionary::addAvp() //------------------------------------------------------------------------------ -void Dictionary::addAvp(const Avp & avp) throw(anna::RuntimeException) { +void Dictionary::addAvp(const Avp & avp) noexcept(false) { const Avp * found = getAvp(avp.getId()); if (found) { @@ -229,7 +202,7 @@ void Dictionary::addAvp(const Avp & avp) throw(anna::RuntimeException) { ITEM_OVERWRITE("avp", avp, a_avps, a_avpNames); } - if(found = getAvp(avp.getName())) { + if((found = getAvp(avp.getName()))) { if(!a_allowUpdates) { std::string s_ex = "Cannot add an avp with an existing name:\n"; s_ex += avp.asString(); @@ -247,12 +220,12 @@ void Dictionary::addAvp(const Avp & avp) throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //----------------------------------------------------- Dictionary::addCommand() //------------------------------------------------------------------------------ -void Dictionary::addCommand(const Command & command) throw(anna::RuntimeException) { +void Dictionary::addCommand(const Command & command) noexcept(false) { const Command * found = getCommand(command.getId()); if(found) { if(!a_allowUpdates) { - std::string s_ex = "Cannot add a command with an existing identifier (code,request):\n"; + std::string s_ex = "Cannot add a command with an existing identifier:\n"; s_ex += command.asString(); throw anna::RuntimeException(s_ex, ANNA_FILE_LOCATION); } @@ -282,7 +255,7 @@ void Dictionary::addCommand(const Command & command) throw(anna::RuntimeExceptio //------------------------------------------------------------------------------ //------------------------------------------------------ Dictionary::getFormat() //------------------------------------------------------------------------------ -const Format * Dictionary::getFormat(const std::string & formatName) const throw() { +const Format * Dictionary::getFormat(const std::string & formatName) const { const_format_iterator it = a_formats.find(formatName); if(it != format_end()) return ((const Format *) & ((*it).second)); @@ -294,7 +267,7 @@ const Format * Dictionary::getFormat(const std::string & formatName) const throw //------------------------------------------------------------------------------ //------------------------------------------------------ Dictionary::getVendor() //------------------------------------------------------------------------------ -const Vendor * Dictionary::getVendor(S32 vendorId) const throw() { +const Vendor * Dictionary::getVendor(S32 vendorId) const { const_vendor_iterator it = a_vendors.find(vendorId); if(it != vendor_end()) return ((const Vendor *) & ((*it).second)); @@ -306,7 +279,7 @@ const Vendor * Dictionary::getVendor(S32 vendorId) const throw() { //------------------------------------------------------------------------------ //------------------------------------------------------ Dictionary::getVendor() //------------------------------------------------------------------------------ -const Vendor * Dictionary::getVendor(const std::string & vendorName) const throw() { +const Vendor * Dictionary::getVendor(const std::string & vendorName) const { const_vendorNames_iterator v_it = a_vendorNames.find(vendorName); if(v_it != a_vendorNames.end()) return ((*v_it).second); @@ -318,7 +291,7 @@ const Vendor * Dictionary::getVendor(const std::string & vendorName) const throw //------------------------------------------------------------------------------ //--------------------------------------------------------- Dictionary::getAvp() //------------------------------------------------------------------------------ -const Avp * Dictionary::getAvp(const AvpId & avpId) const throw() { +const Avp * Dictionary::getAvp(const AvpId & avpId) const { const_avp_iterator it = a_avps.find(avpId); if(it != avp_end()) return ((const Avp *) & ((*it).second)); @@ -330,7 +303,7 @@ const Avp * Dictionary::getAvp(const AvpId & avpId) const throw() { //------------------------------------------------------------------------------ //--------------------------------------------------------- Dictionary::getAvp() //------------------------------------------------------------------------------ -const Avp * Dictionary::getAvp(const std::string & avpName) const throw() { +const Avp * Dictionary::getAvp(const std::string & avpName) const { const_avpNames_iterator a_it = a_avpNames.find(avpName); if(a_it != a_avpNames.end()) return ((*a_it).second); @@ -342,7 +315,7 @@ const Avp * Dictionary::getAvp(const std::string & avpName) const throw() { //------------------------------------------------------------------------------ //----------------------------------------------------- Dictionary::getCommand() //------------------------------------------------------------------------------ -const Command * Dictionary::getCommand(const CommandId & commandId) const throw() { +const Command * Dictionary::getCommand(const CommandId & commandId) const { const_command_iterator it = a_commands.find(commandId); if(it != command_end()) return ((const Command *) & ((*it).second)); @@ -354,7 +327,7 @@ const Command * Dictionary::getCommand(const CommandId & commandId) const throw( //------------------------------------------------------------------------------ //----------------------------------------------------- Dictionary::getCommand() //------------------------------------------------------------------------------ -const Command * Dictionary::getCommand(const std::string & commandName) const throw() { +const Command * Dictionary::getCommand(const std::string & commandName) const { const_commandNames_iterator c_it = a_commandNames.find(commandName); if(c_it != a_commandNames.end()) return ((*c_it).second); @@ -366,7 +339,7 @@ const Command * Dictionary::getCommand(const std::string & commandName) const th //------------------------------------------------------------------------------ //------------------------------------------------------- Dictionary::asString() //------------------------------------------------------------------------------ -std::string Dictionary::asString(void) const throw() { +std::string Dictionary::asString(void) const { std::string trace, title; trace += "\n"; anna::functions::TextHighlightMode::_v thm = anna::functions::TextHighlightMode::LeftAndRightline; @@ -440,7 +413,7 @@ std::string Dictionary::asString(void) const throw() { //------------------------------------------------------------------------------ //---------------------------------------------------------- Dictionary::asXML() //------------------------------------------------------------------------------ -anna::xml::Node* Dictionary::asXML(anna::xml::Node* parent) const throw() { +anna::xml::Node* Dictionary::asXML(anna::xml::Node* parent) const { // // anna::xml::Node* result = parent->createChild("dictionary"); @@ -478,7 +451,7 @@ anna::xml::Node* Dictionary::asXML(anna::xml::Node* parent) const throw() { //------------------------------------------------------------------------------ //---------------------------------------------------- Dictionary::asXMLString() //------------------------------------------------------------------------------ -std::string Dictionary::asXMLString() const throw() { +std::string Dictionary::asXMLString() const { anna::xml::Node root("root"); return anna::xml::Compiler().apply(asXML(&root)); } @@ -488,7 +461,7 @@ std::string Dictionary::asXMLString() const throw() { ////------------------------------------------------------------------------------ ////----------------------------------------- Dictionary::checkUniqueIdentifiers() ////------------------------------------------------------------------------------ -//void Dictionary::checkUniqueIdentifiers(const anna::xml::Node *rootNode) const throw(anna::RuntimeException) { +//void Dictionary::checkUniqueIdentifiers(const anna::xml::Node *rootNode) const noexcept(false) { // std::map < std::string/*xml ref*/, int/*dummy*/ > formats; // std::map < std::string/*xml ref*/, int/*dummy*/ > vendors; // std::map < std::string/*xml ref*/, int/*dummy*/ > avps; @@ -538,7 +511,7 @@ std::string Dictionary::asXMLString() const throw() { //------------------------------------------------------------------------------ //------------------------------------------------- Dictionary::extractFormats() //------------------------------------------------------------------------------ -void Dictionary::extractFormats(const anna::xml::Node *rootNode) throw(anna::RuntimeException) { +void Dictionary::extractFormats(const anna::xml::Node *rootNode) noexcept(false) { Format aux; for(anna::xml::Node::const_child_iterator it = rootNode->child_begin(); it != rootNode->child_end(); it++) { @@ -563,7 +536,7 @@ void Dictionary::extractFormats(const anna::xml::Node *rootNode) throw(anna::Run //------------------------------------------------------------------------------ //------------------------------------------------- Dictionary::extractVendors() //------------------------------------------------------------------------------ -void Dictionary::extractVendors(const anna::xml::Node *rootNode) throw(anna::RuntimeException) { +void Dictionary::extractVendors(const anna::xml::Node *rootNode) noexcept(false) { Vendor aux; for(anna::xml::Node::const_child_iterator it = rootNode->child_begin(); it != rootNode->child_end(); it++) { @@ -586,7 +559,7 @@ void Dictionary::extractVendors(const anna::xml::Node *rootNode) throw(anna::Run //------------------------------------------------------------------------------ //---------------------------------------------------- Dictionary::extractAvps() //------------------------------------------------------------------------------ -void Dictionary::extractAvps(const anna::xml::Node *rootNode) throw(anna::RuntimeException) { +void Dictionary::extractAvps(const anna::xml::Node *rootNode) noexcept(false) { Avp auxAvp; const anna::xml::Node *singleNode, *groupedNode; @@ -721,7 +694,7 @@ void Dictionary::extractAvps(const anna::xml::Node *rootNode) throw(anna::Runtim throw anna::RuntimeException(s_ex, ANNA_FILE_LOCATION); } - auxAvpRule.setAvpName(id); + auxAvpRule.setAvpId(avp->getId()); auxAvpRule.setPresence(AvpRule::Presence::asEnum(type)); auxAvpRule.setQual(qual ? (qual->getValue()) : ""); gavp->addAvpRule(auxAvpRule); @@ -790,7 +763,7 @@ void Dictionary::extractAvps(const anna::xml::Node *rootNode) throw(anna::Runtim //------------------------------------------------------------------------------ //------------------------------------------------ Dictionary::extractCommands() //------------------------------------------------------------------------------ -void Dictionary::extractCommands(const anna::xml::Node *rootNode) throw(anna::RuntimeException) { +void Dictionary::extractCommands(const anna::xml::Node *rootNode) noexcept(false) { Command auxCommand; // (*) Avp rules adding: @@ -823,7 +796,7 @@ void Dictionary::extractCommands(const anna::xml::Node *rootNode) throw(anna::Ru throw anna::RuntimeException(s_ex, ANNA_FILE_LOCATION); } - auxAvpRule.setAvpName(id); + auxAvpRule.setAvpId(avp->getId()); auxAvpRule.setPresence(AvpRule::Presence::asEnum(type)); auxAvpRule.setQual(qual ? (qual->getValue()) : ""); auxCommand.addAvpRule(auxAvpRule); @@ -839,13 +812,13 @@ void Dictionary::extractCommands(const anna::xml::Node *rootNode) throw(anna::Ru //------------------------------------------------------------------------------ //----------------------------------------------------------- Dictionary::load() //------------------------------------------------------------------------------ -void Dictionary::load(const std::string & xmlPathFile) throw(anna::RuntimeException) { - if(xmlPathFile == "") +void Dictionary::load(const std::string & pathFile) noexcept(false) { + if(pathFile == "") throw anna::RuntimeException("Empty xml path file provided", ANNA_FILE_LOCATION); LOGDEBUG( std::string trace = "Loading diameter dictionary from '"; - trace += xmlPathFile; + trace += pathFile; trace += "' ..."; anna::Logger::debug(trace, ANNA_FILE_LOCATION); ); @@ -853,7 +826,7 @@ void Dictionary::load(const std::string & xmlPathFile) throw(anna::RuntimeExcept try { anna::xml::DocumentFile xmlDocument; // has private copy constructor defined but not implemented to avoid inhenrit/copy (is very heavy) const anna::xml::Node *rootNode; - xmlDocument.initialize(xmlPathFile.c_str()); // fail here is i/o error + xmlDocument.initialize(pathFile.c_str()); // fail here is i/o error rootNode = xmlDocument.parse(*a_dtd); // Parsing: fail here if xml violates dtd a_name = rootNode->getAttribute("name")->getValue(); //checkUniqueIdentifiers(rootNode); // Check unique id within xml, for vendor, avp and command nodes: