X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=source%2Fdiameter%2Fcodec%2FMessage.cpp;fp=source%2Fdiameter%2Fcodec%2FMessage.cpp;h=a049e1b7064504c23459a9a1f6a9697563c4f162;hp=a686c71dcf33e327eaaa840ed7704395032f1f85;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hpb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4 diff --git a/source/diameter/codec/Message.cpp b/source/diameter/codec/Message.cpp index a686c71..a049e1b 100644 --- a/source/diameter/codec/Message.cpp +++ b/source/diameter/codec/Message.cpp @@ -82,7 +82,7 @@ Message::~Message() { //------------------------------------------------------------------------------ //--------------------------------------------------------- Message::setEngine() //------------------------------------------------------------------------------ -void Message::setEngine(Engine *engine) throw() { +void Message::setEngine(Engine *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)); @@ -101,7 +101,7 @@ void Message::setEngine(Engine *engine) throw() { //------------------------------------------------------------------------------ //--------------------------------------------------------- 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); @@ -113,7 +113,7 @@ Engine * Message::getEngine() const throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //-------------------------------------------------------- Message::initialize() //------------------------------------------------------------------------------ -void Message::initialize() throw() { +void Message::initialize() { a_version = 1; a_id = CommandId(0, false); a_flags = 0x00; @@ -129,7 +129,7 @@ void Message::initialize() throw() { //------------------------------------------------------------------------------ //------------------------------------------------------------- Message::clear() //------------------------------------------------------------------------------ -void Message::clear(bool resetEngine) 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(); @@ -145,7 +145,7 @@ void Message::clear(bool resetEngine) throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //----------------------------------------------------------- Message::flagsOK() //------------------------------------------------------------------------------ -bool Message::flagsOK(int &rc) const throw() { +bool Message::flagsOK(int &rc) const { // Dictionary stack command: const stack::Command *stackCommand = getStackCommand(); @@ -205,7 +205,7 @@ bool Message::flagsOK(int &rc) const throw() { //------------------------------------------------------------------------------ //------------------------------------------------------------- Message::setId() //------------------------------------------------------------------------------ -void Message::setId(CommandId id) throw(anna::RuntimeException) { +void Message::setId(CommandId id) noexcept(false) { // Id assignment: a_id = id; @@ -224,7 +224,7 @@ void Message::setId(CommandId id) throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //------------------------------------------------------------- Message::setId() //------------------------------------------------------------------------------ -void Message::setId(const char *name) throw(anna::RuntimeException) { +void Message::setId(const char *name) noexcept(false) { setId(getEngine()->commandIdForName(name)); } @@ -232,7 +232,7 @@ void Message::setId(const char *name) throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //-------------------------------------------------- Message::setApplicationId() //------------------------------------------------------------------------------ -void Message::setApplicationId(U32 aid) throw(anna::RuntimeException) { +void Message::setApplicationId(U32 aid) noexcept(false) { a_applicationId = aid; // Automatic engine configuration: @@ -253,7 +253,7 @@ void Message::setApplicationId(U32 aid) throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //------------------------------------------------------------ Message::addAvp() //------------------------------------------------------------------------------ -Avp * Message::addAvp(const char *name) throw(anna::RuntimeException) { +Avp * Message::addAvp(const char *name) noexcept(false) { return addAvp(getEngine()->avpIdForName(name)); } @@ -261,7 +261,7 @@ Avp * Message::addAvp(const char *name) throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //------------------------------------------------------------ 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); @@ -272,7 +272,7 @@ Avp * Message::addAvp(Avp * avp) throw() { //------------------------------------------------------------------------------ //--------------------------------------------------------- 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); } @@ -280,7 +280,7 @@ bool Message::removeAvp(const char *name, int ocurrence) throw(anna::RuntimeExce //------------------------------------------------------------------------------ //----------------------------------------------------------- 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); } @@ -288,7 +288,7 @@ const Avp * Message::_getAvp(const char *name, int ocurrence, anna::Exception::M //------------------------------------------------------------------------------ //---------------------------------------------------------- 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)); } @@ -296,7 +296,7 @@ int Message::countAvp(const char *name) const throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //--------------------------------------------------------- Message::getLength() //------------------------------------------------------------------------------ -U24 Message::getLength() const throw() { +U24 Message::getLength() const { U24 result; // Header length: result = HeaderLength; @@ -310,7 +310,7 @@ U24 Message::getLength() const throw() { //------------------------------------------------------------------------------ //------------------------------------------------------------ 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"); @@ -450,7 +450,7 @@ void Message::decode(const anna::DataBlock &db, Message *ptrAnswer) throw(anna:: //------------------------------------------------------------------------------ //--------------------------------------------------- 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); } @@ -459,7 +459,7 @@ const anna::diameter::stack::Command *Message::getStackCommand(CommandId id) con //------------------------------------------------------------------------------ //----------------------------------------------------- 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', @@ -479,7 +479,7 @@ void Message::setResultCode(int rc) throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //----------------------------------------------------- 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); @@ -494,7 +494,7 @@ int Message::getResultCode() const throw() { //------------------------------------------------------------------------------ //------------------------------------------------------ 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; @@ -549,7 +549,7 @@ void Message::setFailedAvp(const parent_t &parent, AvpId wrong, const char *wron //------------------------------------------------------------------------------ //----------------------------------------------- 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: @@ -590,7 +590,7 @@ void Message::setStandardToAnswer(const Message &request, const std::string &ori //------------------------------------------------------------------------------ //--------------------------------------------------------------- Message::fix() //------------------------------------------------------------------------------ -void Message::fix() throw() { +void Message::fix() { // Dictionary stack command: const stack::Command *stackCommand = getStackCommand(); @@ -619,7 +619,7 @@ void Message::fix() throw() { //------------------------------------------------------------------------------ //------------------------------------------------------------- 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: @@ -679,7 +679,7 @@ bool Message::valid(Message *ptrAnswer) const throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //-------------------------------------------------------------- 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(); @@ -763,7 +763,7 @@ const anna::DataBlock & Message::code() throw(anna::RuntimeException) { //------------------------------------------------------------------------------ //------------------------------------------------------- Message::loadXMLFile() //------------------------------------------------------------------------------ -void Message::loadXMLFile(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); @@ -773,7 +773,7 @@ void Message::loadXMLFile(const std::string &xmlPathFile) throw(anna::RuntimeExc //------------------------------------------------------------------------------ //----------------------------------------------------- Message::loadXMLString() //------------------------------------------------------------------------------ -void Message::loadXMLString(const std::string &xmlString) throw(anna::RuntimeException) { +void Message::loadXMLString(const std::string &xmlString) noexcept(false) { anna::xml::DocumentMemory xmlDocument; anna::diameter::codec::functions::messageXmlDocumentFromXmlString(xmlDocument, xmlString); @@ -783,7 +783,7 @@ void Message::loadXMLString(const std::string &xmlString) throw(anna::RuntimeExc //------------------------------------------------------------------------------ //----------------------------------------------------------- Message::fromXML() //------------------------------------------------------------------------------ -void Message::fromXML(const anna::xml::Node* messageNode) throw(anna::RuntimeException) { +void Message::fromXML(const anna::xml::Node* messageNode) noexcept(false) { // const anna::xml::Attribute *version, *name, *code, *flags, *pbit, *ebit, *tbit, *appid, *hbh, *ete; version = messageNode->getAttribute("version", false /* no exception */); @@ -961,7 +961,7 @@ void Message::fromXML(const anna::xml::Node* messageNode) throw(anna::RuntimeExc //------------------------------------------------------------------------------ //------------------------------------------------------------- Message::asXML() //------------------------------------------------------------------------------ -anna::xml::Node* Message::asXML(anna::xml::Node* parent) const throw() { +anna::xml::Node* Message::asXML(anna::xml::Node* parent) const { // anna::xml::Node* result = parent->createChild("message"); // Dictionary stack command: @@ -998,7 +998,7 @@ anna::xml::Node* Message::asXML(anna::xml::Node* parent) const throw() { //------------------------------------------------------------------------------ //------------------------------------------------------- Message::asXMLString() //------------------------------------------------------------------------------ -std::string Message::asXMLString(bool normalize) const throw() { +std::string Message::asXMLString(bool normalize) const { anna::xml::Node root("root"); anna::xml::Compiler::Mode::_v mode = normalize ? anna::xml::Compiler::Mode::Sort : anna::xml::Compiler::Mode::Visual; @@ -1014,7 +1014,7 @@ std::string Message::asXMLString(bool normalize) const throw() { //------------------------------------------------------------------------------ //------------------------------------------------------------ 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(true /* normalize by mean sorting attribute names and removing new lines */)); }