X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fstack%2FAvpRule.cpp;h=bec3ec9bf96ad5dd50c87efd4ca569fdc7430998;hb=d723d5bf571eb48c641b092058eaa38bb6c4fcc8;hp=466a35ccc6c4a03e28144ddaf7a851a15f95e92b;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/source/diameter/stack/AvpRule.cpp b/source/diameter/stack/AvpRule.cpp
index 466a35c..bec3ec9 100644
--- a/source/diameter/stack/AvpRule.cpp
+++ b/source/diameter/stack/AvpRule.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 //
 
 
 //------------------------------------------------------------------------------
@@ -69,18 +41,18 @@ void anna::diameter::stack::AvpRule::setQual(const std::string & q) throw(anna::
 
 
 //------------------------------------------------------------------------------
-//------------------------------------------------------------- AvpRule::getId()
+//-------------------------------------------------------- AvpRule::getAvpName()
 //------------------------------------------------------------------------------
-anna::diameter::AvpId anna::diameter::stack::AvpRule::getId(void) const throw() {
-  const Avp * avp = a_dictionary->getAvp(a_avpName);
-  return avp->getId();
+std::string anna::diameter::stack::AvpRule::getAvpName(void) const throw() {
+  const Avp * avp = a_dictionary->getAvp(a_avpId);
+  return avp->getName();
 }
 
 //------------------------------------------------------------------------------
 //------------------------------------------------------------- AvpRule::isAny()
 //------------------------------------------------------------------------------
 bool anna::diameter::stack::AvpRule::isAny(void) const throw() {
-  const Avp * avp = a_dictionary->getAvp(a_avpName);
+  const Avp * avp = a_dictionary->getAvp(a_avpId);
   const Format * format = a_dictionary->getFormat(avp->getFormatName());
   return format->isAny();
 }
@@ -134,7 +106,7 @@ int anna::diameter::stack::AvpRule::getQualMax(void) const throw() {
 //------------------------------------------------------------------------------
 std::string anna::diameter::stack::AvpRule::asString(bool showPair) const throw() {
   std::string trace = "No Avp rule defined";
-  const Avp * avp = a_dictionary->getAvp(a_avpName);
+  const Avp * avp = a_dictionary->getAvp(a_avpId);
 
   if(avp) {
     trace = a_qual;
@@ -147,7 +119,7 @@ std::string anna::diameter::stack::AvpRule::asString(bool showPair) const throw(
     if(isOptional()) { s_open = "["; s_close = "]"; }
 
     trace += s_open;
-    trace += a_avpName;
+    trace += getAvpName(); // anna::diameter::functions::avpIdAsPairString(a_avpId);;
     trace += s_close;
 
     if(!showPair) return trace;
@@ -159,7 +131,7 @@ std::string anna::diameter::stack::AvpRule::asString(bool showPair) const throw(
                                         /* max expected avp description size */   48 -
                                         /* current trace length */                trace.size();
 
-    for(register int k = 0; k < NumberOfDots; k++) trace += ".";
+    for(int k = 0; k < NumberOfDots; k++) trace += ".";
 
     trace += anna::diameter::functions::avpIdAsPairString(avp->getId());
   }
@@ -175,7 +147,7 @@ anna::xml::Node* anna::diameter::stack::AvpRule::asXML(anna::xml::Node* parent)
 //   <!ELEMENT avprule EMPTY>
 //   <!ATTLIST avprule id CDATA #REQUIRED type (Fixed | Mandatory | Optional) #REQUIRED qual CDATA #IMPLIED>
   anna::xml::Node* result = parent->createChild("avprule");
-  result->createAttribute("id", a_avpName);
+  result->createAttribute("id", getAvpName());
   std::string type;
 
   if(isFixed()) type = "Fixed";