X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fcodec%2FMessage.cpp;h=6f906f85fe6750a00cd38070efba59475c093a51;hb=0c646b4aa99a84ef6976a51b6d4554aea11ded35;hp=7fc92e8682745a502692bc07588443714eb1a2bc;hpb=8da04b5c6567907540a54d440aecc2b7d70e079b;p=anna.git diff --git a/source/diameter/codec/Message.cpp b/source/diameter/codec/Message.cpp index 7fc92e8..6f906f8 100644 --- a/source/diameter/codec/Message.cpp +++ b/source/diameter/codec/Message.cpp @@ -59,6 +59,7 @@ // STL #include +#include using namespace anna; @@ -369,16 +370,17 @@ void Message::decode(const anna::DataBlock &db, Message *ptrAnswer) throw(anna:: Avp* avp; anna::DataBlock db_aux; + // Parent information: + parent_t parent; + parent.setMessage(a_id); + + while(avpPos < dataBytes) { try { avp = getEngine()->allocateAvp(); db_aux.assign(startData + avpPos, dataBytes - avpPos /* is valid to pass total length (indeed i don't know the real avp length) because it will be limited and this has deep copy disabled (no memory is reserved) */); - avp -> decode(db_aux, answer); + avp -> decode(db_aux, parent, answer); } catch(anna::RuntimeException &ex) { - if(answer) { - //answer->setResultCode(helpers::base::AVPVALUES__Result_Code::DIAMETER_INVALID_AVP_VALUE); // unspecified error ... - answer->setFailedAvp(avp->getId()); - } getEngine()->releaseAvp(avp); LOGWARNING( anna::Logger::warning(ex.getText(), ANNA_FILE_LOCATION); @@ -455,25 +457,12 @@ int Message::getResultCode() const throw() { } -//------------------------------------------------------------------------------ -//--------------------------------------------------- Message::addTheFailedAVP() -//------------------------------------------------------------------------------ -Avp * Message::addTheFailedAVP() throw() { - Avp *result = getAvp(helpers::base::AVPID__Failed_AVP, 1, anna::Exception::Mode::Ignore); - - // Section 7.5 RFC 6733: A Diameter message SHOULD contain one Failed-AVP AVP - if(!result) result = addAvp(helpers::base::AVPID__Failed_AVP); - - return result; -} - - //------------------------------------------------------------------------------ //------------------------------------------------------ Message::setFailedAvp() //------------------------------------------------------------------------------ -Avp * Message::setFailedAvp(AvpId id) throw(anna::RuntimeException) { +void Message::setFailedAvp(const parent_t &parent, AvpId wrong, const char *wrongName) throw(anna::RuntimeException) { - if(isRequest()) return NULL; + if(isRequest()) return; // RFC 6733: // @@ -494,44 +483,30 @@ Avp * Message::setFailedAvp(AvpId id) throw(anna::RuntimeException) { // 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 (*). - Avp *theFailedAvp = addTheFailedAVP(); - LOGDEBUG( - std::string msg = "Adding wrong avp "; - msg += anna::diameter::functions::avpIdAsPairString(id); - msg += " within the message Failed-AVP ..."; - anna::Logger::debug(msg, ANNA_FILE_LOCATION); - ); - - if (theFailedAvp->countChilds()) { // (*) - LOGDEBUG(anna::Logger::debug("Discarding wrong avp. A previous wrong avp was already added into the Failed-AVP. RFC 6733 Section 7.5 recommends to store only the first.", ANNA_FILE_LOCATION)); - return NULL; + 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; } - return (theFailedAvp->addAvp(id)); -} - - -//------------------------------------------------------------------------------ -//------------------------------------------------------ Message::setFailedAvp() -//------------------------------------------------------------------------------ -Avp * Message::setFailedAvp(Avp *avp) throw(anna::RuntimeException) { - - if(!avp || isRequest()) return NULL; + // Section 7.5 RFC 6733: A Diameter message SHOULD contain one Failed-AVP AVP + theFailedAvp = addAvp(helpers::base::AVPID__Failed_AVP); + Avp *leaf = theFailedAvp; - Avp *theFailedAvp = addTheFailedAVP(); LOGDEBUG( - std::string msg = "Adding wrong avp "; - msg += anna::diameter::functions::avpIdAsPairString(avp->getId()); - msg += " within the message Failed-AVP ..."; + std::string msg = "Adding to Failed-AVP, the wrong avp "; + msg += wrongName ? wrongName : (anna::diameter::functions::avpIdAsPairString(wrong)); + msg += " found inside "; + msg += parent.asString(); + anna::Logger::debug(msg, ANNA_FILE_LOCATION); ); - if (theFailedAvp->countChilds()) { // (*) - LOGDEBUG(anna::Logger::debug("Discarding wrong avp. A previous wrong avp was already added into the Failed-AVP. RFC 6733 Section 7.5 recommends to store only the first.", ANNA_FILE_LOCATION)); - return NULL; - } + std::vector::const_iterator it; + for(it = parent.AvpsId.begin(); it != parent.AvpsId.end(); it++) + leaf = leaf->addAvp(*it); - return (theFailedAvp->addAvp(avp)); + leaf->addAvp(wrong); } @@ -611,7 +586,6 @@ bool Message::valid(Message *ptrAnswer) const throw(anna::RuntimeException) { OamModule &oamModule = OamModule::instantiate(); // Dictionary stack command: const stack::Command *stackCommand = getStackCommand(); - std::string me; // Only build answer for a request: Message *answer = isRequest() ? ptrAnswer : NULL; @@ -619,7 +593,7 @@ bool Message::valid(Message *ptrAnswer) const throw(anna::RuntimeException) { if(!stackCommand) { // OAM - me = anna::diameter::functions::commandIdAsPairString(a_id); + std::string me = anna::diameter::functions::commandIdAsPairString(a_id); oamModule.activateAlarm(OamModule::Alarm::MessageValidation__UnknownOperation__s__UnableToValidate, STRING_WITH_QUOTATION_MARKS__C_STR(me)); oamModule.count(OamModule::Counter::MessageValidation__UnknownOperationUnableToValidate); @@ -629,7 +603,10 @@ bool Message::valid(Message *ptrAnswer) const throw(anna::RuntimeException) { return false; } - me = stackCommand->getName(); + // Parent information: + parent_t me; + me.setMessage(a_id, stackCommand->getName().c_str()); + ////////////////////////////// // Flags coherence checking // ////////////////////////////// @@ -638,12 +615,12 @@ bool Message::valid(Message *ptrAnswer) const throw(anna::RuntimeException) { if(!result) { // OAM & Depth management - oamModule.activateAlarm(OamModule::Alarm::MessageValidation__Operation__s__HaveIncoherentFlags__d__, STRING_WITH_QUOTATION_MARKS__C_STR(me), (int)a_flags); + oamModule.activateAlarm(OamModule::Alarm::MessageValidation__Operation__s__HaveIncoherentFlags__d__, STRING_WITH_QUOTATION_MARKS__C_STR(me.asString()), (int)a_flags); oamModule.count(OamModule::Counter::MessageValidation__OperationHaveIncoherentFlags); if(answer) answer->setResultCode(rc); - getEngine()->validationAnomaly(anna::functions::asString("Operation %s have incoherent flags (%d)", STRING_WITH_QUOTATION_MARKS__C_STR(me), (int)a_flags)); + getEngine()->validationAnomaly(anna::functions::asString("Operation %s have incoherent flags (%d)", STRING_WITH_QUOTATION_MARKS__C_STR(me.asString()), (int)a_flags)); } ////////////////////