Identify Avp Rule by AvpId to avoid name collision for avps renamed. Fix 3GPP-Rat...

[anna.git] / source / diameter / stack / AvpRule.cpp

diff --git a/source/diameter/stack/AvpRule.cpp b/source/diameter/stack/AvpRule.cpp
index 68ba88b..bec3ec9 100644 (file)
--- a/source/diameter/stack/AvpRule.cpp
+++ b/source/diameter/stack/AvpRule.cpp
@@ -41,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();
 }
@@ -106,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;
@@ -119,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;
@@ -147,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";