Multistack launcher

[anna.git] / source / diameter / codec / Message.cpp

diff --git a/source/diameter/codec/Message.cpp b/source/diameter/codec/Message.cpp
index 2726992..35db129 100644 (file)
--- a/source/diameter/codec/Message.cpp
+++ b/source/diameter/codec/Message.cpp
@@ -56,7 +56,7 @@ const U8 Message::TBitMask(0x10);
 //------------------------------------------------------------------------------
 //----------------------------------------------------------- Message::Message()
 //------------------------------------------------------------------------------
-Message::Message() : a_forCode(true) {
+Message::Message(Engine *engine) : a_engine(engine), a_forCode(true) {
   initialize();
 }
 
@@ -64,7 +64,7 @@ Message::Message() : a_forCode(true) {
 //------------------------------------------------------------------------------
 //----------------------------------------------------------- Message::Message()
 //------------------------------------------------------------------------------
-Message::Message(CommandId id) : a_forCode(true) {
+Message::Message(CommandId id, Engine *engine) : a_engine(engine), a_forCode(true) {
   initialize();
   setId(id);
 }
@@ -205,7 +205,7 @@ void Message::setId(const char *name) throw(anna::RuntimeException) {
 //------------------------------------------------------------------------------
 //-------------------------------------------------- Message::setApplicationId()
 //------------------------------------------------------------------------------
-void Message::setApplicationId(U32 aid) throw() {
+void Message::setApplicationId(U32 aid) throw(anna::RuntimeException) {
   a_applicationId = aid;
 
   // Default behaviour:
@@ -471,11 +471,13 @@ void Message::setFailedAvp(const parent_t &parent, AvpId wrong, const char *wron
   // most of the command codes as *[Failed-AVP], i think this is not a deliberate ambiguity.
   // Probably the RFC wants to give freedom to the application layer, but it is recommended to
   // have only one child (wrong avp) inside a unique message Failed-AVP to ease the Result-Code
-  // correspondence. Anyway, this behaviour could be easily  opened commenting condition block (*).
+  // correspondence. Anyway, this behaviour could be easily  opened by mean 'setSingleFailedAVP(false)'
   Avp *theFailedAvp = getAvp(helpers::base::AVPID__Failed_AVP, 1, anna::Exception::Mode::Ignore);
   if (theFailedAvp) {
-       LOGDEBUG(anna::Logger::debug("Failed-AVP has already been added. RFC 6733 Section 7.5 recommends to store only the first error found", ANNA_FILE_LOCATION));
-    return;
+    if (getEngine()->getSingleFailedAVP()) {
+      LOGDEBUG(anna::Logger::debug("Failed-AVP has already been added. RFC 6733 Section 7.5 recommends to store only the first error found", ANNA_FILE_LOCATION));
+      return;
+    }
   }
 
   // Section 7.5 RFC 6733: A Diameter message SHOULD contain one Failed-AVP AVP