X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fcodec%2FAvp.cpp;h=3a2c9b0732e9cd8335556adc61436d75b430de22;hb=ad7fdc865803176f1dd1696960073f616cfa3fda;hp=aa52c5ff8cb518bf26ca3e338b46e1d725eb83bb;hpb=8808902f3d5e768a02f3936c4a1a8732da682895;p=anna.git

diff --git a/source/diameter/codec/Avp.cpp b/source/diameter/codec/Avp.cpp
index aa52c5f..3a2c9b0 100644
--- a/source/diameter/codec/Avp.cpp
+++ b/source/diameter/codec/Avp.cpp
@@ -50,6 +50,7 @@
 #include <anna/diameter/stack/Engine.hpp>
 #include <anna/diameter/codec/Engine.hpp>
 #include <anna/core/functions.hpp>
+#include <anna/core/util/RegularExpression.hpp>
 
 #include <anna/core/tracing/Logger.hpp>
 #include <anna/core/functions.hpp>
@@ -686,7 +687,6 @@ void Avp::decodeDataPart(const char * buffer, int size, const parent_t & parent,
     int avpPos = 0;
     Avp* avp;
     anna::DataBlock db;
-
     // Me as parent:
     parent_t me = parent;
     me.addAvp(a_id);
@@ -785,13 +785,12 @@ void Avp::decode(const anna::DataBlock &db, const parent_t & parent, Message *an
   //   a Diameter client, server, proxy, or translation agent and either the AVP or its value is unrecognized, the message MUST be rejected.
   //   Diameter Relay and redirect agents MUST NOT reject messages with unrecognized AVPs.
   if(!getStackAvp() && mandatoryBit()) {
+    if(answer) {
+      answer->setResultCode(helpers::base::AVPVALUES__Result_Code::DIAMETER_AVP_UNSUPPORTED);
+      answer->setFailedAvp(parent, a_id);
+    }
 
-	if(answer) {
-	  answer->setResultCode(helpers::base::AVPVALUES__Result_Code::DIAMETER_AVP_UNSUPPORTED);
-	  answer->setFailedAvp(parent, a_id);
-	}
-
-	unknownAvpWithMandatoryBit();
+    unknownAvpWithMandatoryBit();
   }
 
   // Avp Length
@@ -1115,7 +1114,7 @@ bool Avp::valid(const parent_t & parent, Message *answer) const throw(anna::Runt
 
     if(answer) {
       answer->setResultCode(helpers::base::AVPVALUES__Result_Code::DIAMETER_INVALID_AVP_BITS);
-      answer->setFailedAvp(parent, a_id); // RFC 6733 says nothing about Failed-AVP in this case...
+      answer->setFailedAvp(parent, a_id, stackAvp->getName().c_str()); // RFC 6733 says nothing about Failed-AVP in this case...
     }
 
     getEngine()->validationAnomaly(anna::functions::asString("The AVP %s flags (%d) does not fulfill the defined flag rules: %s", STRING_WITH_QUOTATION_MARKS__C_STR(me.asString()), (int)a_flags, STRING_WITH_QUOTATION_MARKS__C_STR(stackAvp->getFlagRulesDescription())));
@@ -1133,7 +1132,7 @@ bool Avp::valid(const parent_t & parent, Message *answer) const throw(anna::Runt
 
       if(answer) {
         answer->setResultCode(helpers::base::AVPVALUES__Result_Code::DIAMETER_INVALID_AVP_VALUE);
-        answer->setFailedAvp(parent, a_id);
+        answer->setFailedAvp(parent, a_id, stackAvp->getName().c_str());
       }
 
       getEngine()->validationAnomaly(anna::functions::asString("Enumerated AVP %s with value %d does not comply to restriction: %s", STRING_WITH_QUOTATION_MARKS__C_STR(me.asString()), a_Enumerated->getValue(), stackAvp->getEnums()));
@@ -1313,6 +1312,16 @@ std::string Avp::getXMLdata(bool & isHex, const stack::Format *stackFormat) cons
 }
 
 
+//------------------------------------------------------------------------------
+//---------------------------------------------------------------- Avp::decode()
+//------------------------------------------------------------------------------
+void Avp::decode(const anna::DataBlock &db) throw(anna::RuntimeException) {
+  parent_t parent;
+  parent.setMessage(CommandId(0, false), "No-Parent");
+  decode(db, parent, NULL);
+}
+
+
 //------------------------------------------------------------------------------
 //--------------------------------------------------------------- Avp::fromXML()
 //------------------------------------------------------------------------------
@@ -1585,6 +1594,7 @@ anna::xml::Node* Avp::asXML(anna::xml::Node* parent) const throw() {
   return result;
 }
 
+
 //------------------------------------------------------------------------------
 //----------------------------------------------------------- Avp::asXMLString()
 //------------------------------------------------------------------------------
@@ -1593,3 +1603,11 @@ std::string Avp::asXMLString() const throw() {
   return anna::xml::Compiler().apply(asXML(&root));
 }
 
+
+//------------------------------------------------------------------------------
+//---------------------------------------------------------------- Avp::isLike()
+//------------------------------------------------------------------------------
+bool Avp::isLike(const std::string &pattern) const throw() {
+  anna::RegularExpression re(pattern);
+  return re.isLike(asXMLString());
+}