X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fstack%2FDictionary.cpp;h=68f37c191646267a72bf7c27b876d5e73cd6f408;hb=78be86969d2f26a9084b0c4af6ce43d5fa4ed3fd;hp=821659cc592822a3d080cb629052f9965c4399ce;hpb=ad7fdc865803176f1dd1696960073f616cfa3fda;p=anna.git

diff --git a/source/diameter/stack/Dictionary.cpp b/source/diameter/stack/Dictionary.cpp
index 821659c..68f37c1 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));
 
 
 //------------------------------------------------------------------------------
@@ -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();
@@ -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);
@@ -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) throw(anna::RuntimeException) {
+  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: