X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fcodec%2FMessage.cpp;h=35db12908c35dc8e49a023095ac1c9b14be9f9c1;hb=e3f60b6b4a178c63ebd6f8915431bfa485a2e601;hp=1d41374b6fc1441777bda854d4538222522f191a;hpb=b105cc8fc16f1d9bf26969a209e3bf1d506a2ef3;p=anna.git diff --git a/source/diameter/codec/Message.cpp b/source/diameter/codec/Message.cpp index 1d41374..35db129 100644 --- a/source/diameter/codec/Message.cpp +++ b/source/diameter/codec/Message.cpp @@ -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