//------------------------------------------------------------------------------
//--------------------------------------------------------- Message::setEngine()
//------------------------------------------------------------------------------
-void Message::setEngine(Engine *engine) throw() {
+void Message::setEngine(Engine *engine) {
- if (a_engine && engine != a_engine) {
+ if (!engine) {
+ LOGWARNING(anna::Logger::warning("Ignored: you must assign a valid codec engine. If you want to set NULL engine, clear the message", ANNA_FILE_LOCATION));
+ return;
+ }
+
+ if (a_engine && (engine != a_engine)) {
LOGWARNING(anna::Logger::warning("Ignored: it is not a good practice to change the codec engine once assigned. Clear the message first to set the engine again.", ANNA_FILE_LOCATION));
return;
}
//------------------------------------------------------------------------------
//--------------------------------------------------------- Message::getEngine()
//------------------------------------------------------------------------------
-Engine * Message::getEngine() const throw(anna::RuntimeException) {
+Engine * Message::getEngine() const noexcept(false) {
if(!a_engine)
throw anna::RuntimeException("Invalid codec engine reference (NULL). Use setEngine() to set the corresponding codec engine", ANNA_FILE_LOCATION);
//------------------------------------------------------------------------------
//-------------------------------------------------------- Message::initialize()
//------------------------------------------------------------------------------
-void Message::initialize() throw() {
+void Message::initialize() {
a_version = 1;
a_id = CommandId(0, false);
a_flags = 0x00;
//------------------------------------------------------------------------------
//------------------------------------------------------------- Message::clear()
//------------------------------------------------------------------------------
-void Message::clear() throw(anna::RuntimeException) {
+void Message::clear(bool resetEngine) noexcept(false) {
for(avp_iterator it = avp_begin(); it != avp_end(); it++) { /*avp(it)->clear(); */getEngine()->releaseAvp(Avp::avp(it)); }
a_avps.clear();
a_finds.clear();
// Initialize:
initialize();
+ if (resetEngine) a_engine = NULL;
}
//------------------------------------------------------------------------------
//----------------------------------------------------------- Message::flagsOK()
//------------------------------------------------------------------------------
-bool Message::flagsOK(int &rc) const throw() {
+bool Message::flagsOK(int &rc) const {
// Dictionary stack command:
const stack::Command *stackCommand = getStackCommand();
if(!stackCommand) {
- anna::Logger::error("Impossible to decide if flags are correct because stack command is not identified. Assume flags ok", ANNA_FILE_LOCATION);
+ std::string msg = "Impossible to decide if flags are correct because stack command is not identified. Assume flags ok for Message ";
+ msg += anna::diameter::functions::commandIdAsPairString(a_id);
+ anna::Logger::error(msg, ANNA_FILE_LOCATION);
//rc = helpers::base::AVPVALUES__Result_Code::?????;
return true;
};
if(stackCommand->isRequest() != isRequest()) ok = false; // en teoria es imposible salir por aqui: blindado en la dtd
if(isRequest() && errorBit()) {
- anna::Logger::error("E(rror) bit is not allowed at diameter requests", ANNA_FILE_LOCATION);
+ std::string msg = "E(rror) bit is not allowed at diameter requests as ";
+ msg += stackCommand->getName();
+ anna::Logger::error(msg, ANNA_FILE_LOCATION);
ok = false;
}
if(isAnswer() && potentiallyReTransmittedMessageBit()) {
- anna::Logger::error("T(Potentially re-transmitted message) bit is not allowed at diameter answers", ANNA_FILE_LOCATION);
+ std::string msg = "T(Potentially re-transmitted message) bit is not allowed at diameter answers as ";
+ msg += stackCommand->getName();
+ anna::Logger::error(msg, ANNA_FILE_LOCATION);
ok = false;
}
// is set to one (1) or the bits in the Diameter header are set
// incorrectly.
if((a_flags & 0x0f) != 0x00) {
- anna::Logger::error("Any (or more than one) of the reserved message flags bit has been activated. Reserved bits must be null", ANNA_FILE_LOCATION);
+ std::string msg = "Any (or more than one) of the reserved message flags bit has been activated. Reserved bits must be null. Message is ";
+ msg += stackCommand->getName();
+ anna::Logger::error(msg, ANNA_FILE_LOCATION);
rc = helpers::base::AVPVALUES__Result_Code::DIAMETER_INVALID_BIT_IN_HEADER;
return false;
}
//------------------------------------------------------------------------------
//------------------------------------------------------------- Message::setId()
//------------------------------------------------------------------------------
-void Message::setId(CommandId id, bool _clear) throw(anna::RuntimeException) {
- // Clear class content:
- if(_clear) clear();
+void Message::setId(CommandId id) noexcept(false) {
// Id assignment:
a_id = id;
//------------------------------------------------------------------------------
//------------------------------------------------------------- Message::setId()
//------------------------------------------------------------------------------
-void Message::setId(const char *name) throw(anna::RuntimeException) {
+void Message::setId(const char *name) noexcept(false) {
setId(getEngine()->commandIdForName(name));
}
//------------------------------------------------------------------------------
//-------------------------------------------------- Message::setApplicationId()
//------------------------------------------------------------------------------
-void Message::setApplicationId(U32 aid) throw(anna::RuntimeException) {
+void Message::setApplicationId(U32 aid) noexcept(false) {
a_applicationId = aid;
// Automatic engine configuration:
// Codec engine manager (a multithreaded application, normally does not achieve this point, because
// messages are prepared for each interface with the corresponding codec engine)
anna::diameter::codec::EngineManager &em = anna::diameter::codec::EngineManager::instantiate();
+ if (em.size() == 0) return;
if (em.selectFromApplicationId()) {
Engine *monostackEngine = em.getMonoStackCodecEngine();
if (monostackEngine) { a_engine = monostackEngine; return; }
//------------------------------------------------------------------------------
//------------------------------------------------------------ Message::addAvp()
//------------------------------------------------------------------------------
-Avp * Message::addAvp(const char *name) throw(anna::RuntimeException) {
+Avp * Message::addAvp(const char *name) noexcept(false) {
return addAvp(getEngine()->avpIdForName(name));
}
//------------------------------------------------------------------------------
//------------------------------------------------------------ Message::addAvp()
//------------------------------------------------------------------------------
-Avp * Message::addAvp(Avp * avp) throw() {
+Avp * Message::addAvp(Avp * avp) {
if(!avp) return NULL;
if (avp->getEngine() != getEngine()) return NULL;
addChild(avp);
//------------------------------------------------------------------------------
//--------------------------------------------------------- Message::removeAvp()
//------------------------------------------------------------------------------
-bool Message::removeAvp(const char *name, int ocurrence) throw(anna::RuntimeException) {
+bool Message::removeAvp(const char *name, int ocurrence) noexcept(false) {
return removeAvp(getEngine()->avpIdForName(name), ocurrence);
}
//------------------------------------------------------------------------------
//----------------------------------------------------------- Message::_getAvp()
//------------------------------------------------------------------------------
-const Avp * Message::_getAvp(const char *name, int ocurrence, anna::Exception::Mode::_v emode) const throw(anna::RuntimeException) {
+const Avp * Message::_getAvp(const char *name, int ocurrence, anna::Exception::Mode::_v emode) const noexcept(false) {
return getAvp(getEngine()->avpIdForName(name), ocurrence, emode);
}
//------------------------------------------------------------------------------
//---------------------------------------------------------- Message::countAvp()
//------------------------------------------------------------------------------
-int Message::countAvp(const char *name) const throw(anna::RuntimeException) {
+int Message::countAvp(const char *name) const noexcept(false) {
return countAvp(getEngine()->avpIdForName(name));
}
//------------------------------------------------------------------------------
//--------------------------------------------------------- Message::getLength()
//------------------------------------------------------------------------------
-U24 Message::getLength() const throw() {
+U24 Message::getLength() const {
U24 result;
// Header length:
result = HeaderLength;
//------------------------------------------------------------------------------
//------------------------------------------------------------ Message::decode()
//------------------------------------------------------------------------------
-void Message::decode(const anna::DataBlock &db, Message *ptrAnswer) throw(anna::RuntimeException) {
+void Message::decode(const anna::DataBlock &db, Message *ptrAnswer) noexcept(false) {
// Trace
LOGDEBUG(
anna::xml::Node root("Message::decode");
trace += db.asString();
anna::Logger::debug(trace, ANNA_FILE_LOCATION);
);
- clear();
+ clear(false /* respect engine */);
// EXCEPTION MANAGEMENT IN THIS METHOD
// ===================================
// DECODE PHASE
//------------------------------------------------------------------------------
//--------------------------------------------------- Message::getStackCommand()
//------------------------------------------------------------------------------
-const anna::diameter::stack::Command *Message::getStackCommand(CommandId id) const throw(anna::RuntimeException) {
+const anna::diameter::stack::Command *Message::getStackCommand(CommandId id) const noexcept(false) {
const stack::Dictionary * dictionary = getEngine()->getDictionary();
return (dictionary ? (dictionary->getCommand(id)) : NULL);
}
//------------------------------------------------------------------------------
//----------------------------------------------------- Message::setResultCode()
//------------------------------------------------------------------------------
-void Message::setResultCode(int rc) throw(anna::RuntimeException) {
+void Message::setResultCode(int rc) noexcept(false) {
if(isRequest()) return;
// Add Result-Code if not yet added. Even if validation depth is set to 'Complete',
//------------------------------------------------------------------------------
//----------------------------------------------------- Message::getResultCode()
//------------------------------------------------------------------------------
-int Message::getResultCode() const throw() {
+int Message::getResultCode() const {
if(isAnswer()) {
const Avp *resultCodeAvp = getAvp(helpers::base::AVPID__Result_Code, 1, anna::Exception::Mode::Ignore);
//------------------------------------------------------------------------------
//------------------------------------------------------ Message::setFailedAvp()
//------------------------------------------------------------------------------
-void Message::setFailedAvp(const parent_t &parent, AvpId wrong, const char *wrongName) throw(anna::RuntimeException) {
+void Message::setFailedAvp(const parent_t &parent, AvpId wrong, const char *wrongName) noexcept(false) {
if(isRequest()) return;
//------------------------------------------------------------------------------
//----------------------------------------------- Message::setStandardToAnswer()
//------------------------------------------------------------------------------
-void Message::setStandardToAnswer(const Message &request, const std::string &originHost, const std::string &originRealm, int resultCode) throw(anna::RuntimeException) {
+void Message::setStandardToAnswer(const Message &request, const std::string &originHost, const std::string &originRealm, int resultCode) noexcept(false) {
if(!request.getId().second) return;
// Message header:
// Session-Id if exists:
const Avp *reqSessionId = request.getAvp(helpers::base::AVPID__Session_Id, 1, anna::Exception::Mode::Ignore);
+ LOGDEBUG(anna::Logger::debug("Check answer message AVPs Session-Id, Origin-Host and Origin-Realm => replace them if missing, with request session-id & node configuration:", ANNA_FILE_LOCATION));
+
if(reqSessionId)
if(!getAvp(helpers::base::AVPID__Session_Id, 1, anna::Exception::Mode::Ignore))
addAvp(helpers::base::AVPID__Session_Id)->getUTF8String()->setValue(reqSessionId->getUTF8String()->getValue());
//------------------------------------------------------------------------------
//--------------------------------------------------------------- Message::fix()
//------------------------------------------------------------------------------
-void Message::fix() throw() {
+void Message::fix() {
// Dictionary stack command:
const stack::Command *stackCommand = getStackCommand();
//------------------------------------------------------------------------------
//------------------------------------------------------------- Message::valid()
//------------------------------------------------------------------------------
-bool Message::valid(Message *ptrAnswer) const throw(anna::RuntimeException) {
+bool Message::valid(Message *ptrAnswer) const noexcept(false) {
// OAM
OamModule &oamModule = OamModule::instantiate();
// Dictionary stack command:
//------------------------------------------------------------------------------
//-------------------------------------------------------------- Message::code()
//------------------------------------------------------------------------------
-const anna::DataBlock & Message::code() throw(anna::RuntimeException) {
+const anna::DataBlock & Message::code() noexcept(false) {
// Pre-Validation
Engine::ValidationMode::_v vmode = getEngine()->getValidationMode();
}
//------------------------------------------------------------------------------
-//----------------------------------------------------------- Message::loadXML()
+//------------------------------------------------------- Message::loadXMLFile()
//------------------------------------------------------------------------------
-void Message::loadXML(const std::string &xmlPathFile) throw(anna::RuntimeException) {
+void Message::loadXMLFile(const std::string &xmlPathFile) noexcept(false) {
anna::xml::DocumentFile xmlDocument;
anna::diameter::codec::functions::messageXmlDocumentFromXmlFile(xmlDocument, xmlPathFile);
fromXML(xmlDocument.getRootNode());
}
+//------------------------------------------------------------------------------
+//----------------------------------------------------- Message::loadXMLString()
+//------------------------------------------------------------------------------
+void Message::loadXMLString(const std::string &xmlString) noexcept(false) {
+
+ anna::xml::DocumentMemory xmlDocument;
+ anna::diameter::codec::functions::messageXmlDocumentFromXmlString(xmlDocument, xmlString);
+ fromXML(xmlDocument.getRootNode());
+}
+
//------------------------------------------------------------------------------
//----------------------------------------------------------- Message::fromXML()
//------------------------------------------------------------------------------
-void Message::fromXML(const anna::xml::Node* messageNode) throw(anna::RuntimeException) {
- // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-by-end-id CDATA #IMPLIED>
+void Message::fromXML(const anna::xml::Node* messageNode) noexcept(false) {
+ // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED p-bit (yes | no) #IMPLIED e-bit (yes | no) #IMPLIED t-bit (yes | no) #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-to-end-id CDATA #IMPLIED>
const anna::xml::Attribute *version, *name, *code, *flags, *pbit, *ebit, *tbit, *appid, *hbh, *ete;
version = messageNode->getAttribute("version", false /* no exception */);
name = messageNode->getAttribute("name", false /* no exception */);
tbit = messageNode->getAttribute("t-bit", false /* no exception */);
appid = messageNode->getAttribute("application-id"); // required
hbh = messageNode->getAttribute("hop-by-hop-id", false /* no exception */);
- ete = messageNode->getAttribute("end-by-end-id", false /* no exception */);
+ ete = messageNode->getAttribute("end-to-end-id", false /* no exception */);
int i_aux;
unsigned int u_aux;
// Clear the message
- clear();
+ clear(false /* respect engine */);
if(version) {
i_aux = version->getIntegerValue();
throw anna::RuntimeException(msg, ANNA_FILE_LOCATION);
}
- setId(stackCommand->getId(), false /* don't clear */);
+ setId(stackCommand->getId());
+
// 'P', 'E' and 'T' flags:
bool activateP = pbit ? (pbit->getValue() == "yes") : false;
bool activateE = ebit ? (ebit->getValue() == "yes") : false;
//------------------------------------------------------------------------------
//------------------------------------------------------------- Message::asXML()
//------------------------------------------------------------------------------
-anna::xml::Node* Message::asXML(anna::xml::Node* parent) const throw() {
- // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-by-end-id CDATA #IMPLIED>
+anna::xml::Node* Message::asXML(anna::xml::Node* parent) const {
+ // <!ATTLIST message version CDATA #IMPLIED name CDATA #IMPLIED code CDATA #IMPLIED flags CDATA #IMPLIED application-id CDATA #REQUIRED hop-by-hop-id CDATA #IMPLIED end-to-end-id CDATA #IMPLIED>
anna::xml::Node* result = parent->createChild("message");
// Dictionary stack command:
const stack::Command *stackCommand = getStackCommand();
result->createAttribute("application-id", anna::functions::asString(a_applicationId));
result->createAttribute("hop-by-hop-id", anna::functions::asString(a_hopByHop));
- result->createAttribute("end-by-end-id", anna::functions::asString(a_endToEnd));
+ result->createAttribute("end-to-end-id", anna::functions::asString(a_endToEnd));
// Avps:
for(const_avp_iterator it = avp_begin(); it != avp_end(); it++) {
//------------------------------------------------------------------------------
//------------------------------------------------------- Message::asXMLString()
//------------------------------------------------------------------------------
-std::string Message::asXMLString() const throw() {
+std::string Message::asXMLString(bool normalize) const {
anna::xml::Node root("root");
- return anna::xml::Compiler().apply(asXML(&root));
+
+ anna::xml::Compiler::Mode::_v mode = normalize ? anna::xml::Compiler::Mode::Sort : anna::xml::Compiler::Mode::Visual;
+ std::string result = anna::xml::Compiler().apply(asXML(&root), mode);
+
+ if (normalize)
+ result.erase(std::remove(result.begin(), result.end(), '\n'), result.end());
+
+ return result;
}
//------------------------------------------------------------------------------
//------------------------------------------------------------ Message::isLike()
//------------------------------------------------------------------------------
-bool Message::isLike(const std::string &pattern) const throw() {
+bool Message::isLike(const std::string &pattern) const {
anna::RegularExpression re(pattern);
- return re.isLike(asXMLString());
+ return re.isLike(asXMLString(true /* normalize by mean sorting attribute names and removing new lines */));
}
+
projects / anna.git / blobdiff