X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=source%2Fdiameter.comm%2FMessage.cpp;fp=source%2Fdiameter.comm%2FMessage.cpp;h=43c4301dbca2cb78a82e7f94d4e7b9bf6e96e983;hp=a07de1a1717cd6293b9fb3afc784d5d901e7f49b;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hpb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4 diff --git a/source/diameter.comm/Message.cpp b/source/diameter.comm/Message.cpp index a07de1a..43c4301 100644 --- a/source/diameter.comm/Message.cpp +++ b/source/diameter.comm/Message.cpp @@ -26,13 +26,13 @@ using namespace anna::diameter::comm; const char* Message::asText(const OnExpiry::_v rc) -throw() { +{ static const char* text [] = { "Abandon", "Ignore", "Retransmit" }; return text [rc]; } string Message::asString() const -throw() { +{ string result("diameter::comm::Message { "); result += "ClassCode: "; result += ClassCode::asText(a_classCode); @@ -44,7 +44,7 @@ throw() { } anna::xml::Node* Message::asXML(anna::xml::Node* parent) const -throw() { +{ anna::xml::Node* result = parent->createChild("diameter.comm.Message"); result->createAttribute("ClassCode", ClassCode::asText(a_classCode)); result->createAttribute("OnExpiry", asText(a_onExpiry)); @@ -54,7 +54,7 @@ throw() { } //void Message::clear () -// throw () +// //{ // ::clear(); //// a_classCode = ClassCode::Undefined; @@ -62,7 +62,7 @@ throw() { //} -bool Message::fixRequestSequence(HopByHop hbh, EndToEnd ete) throw() { +bool Message::fixRequestSequence(HopByHop hbh, EndToEnd ete) { setRequestHopByHop(getHopByHop()); // original request hop-by-hop (backup) setRequestEndToEnd(getEndToEnd()); // original request end-to-end (backup) bool result = false; @@ -98,7 +98,7 @@ bool Message::fixRequestSequence(HopByHop hbh, EndToEnd ete) throw() { -void Message::restoreSequencesAfterFix() throw() { +void Message::restoreSequencesAfterFix() { LOGDEBUG( string msg("diameter::comm::restoreSequencesAfterFix { "); msg += "Hop by hop: "; @@ -119,7 +119,7 @@ void Message::restoreSequencesAfterFix() throw() { void Message::send(ClientSession& clientSession) const -throw(anna::RuntimeException) { +noexcept(false) { try { clientSession.getServer()->send((Message *)this); } catch(anna::RuntimeException&) { @@ -128,7 +128,7 @@ throw(anna::RuntimeException) { } void Message::send(ServerSession& serverSession) const -throw(anna::RuntimeException) { +noexcept(false) { try { serverSession.getClientSocket()->send((Message *)this); } catch(anna::RuntimeException&) { @@ -138,21 +138,21 @@ throw(anna::RuntimeException) { -anna::diameter::CommandId Message::getCommandId(bool &isRequest) const throw() { +anna::diameter::CommandId Message::getCommandId(bool &isRequest) const { diameter::CommandId result = diameter::codec::functions::getCommandId(getBody()); isRequest = result.second; // diameter::codec::functions::isRequest(result); return result; } -anna::diameter::ApplicationId Message::getApplicationId() const throw() { +anna::diameter::ApplicationId Message::getApplicationId() const { diameter::ApplicationId result = diameter::codec::functions::getApplicationId(getBody()); return result; } -HopByHop Message::getHopByHop() const throw() { +HopByHop Message::getHopByHop() const { return (diameter::codec::functions::getHopByHop(getBody())); } -EndToEnd Message::getEndToEnd() const throw() { +EndToEnd Message::getEndToEnd() const { return (diameter::codec::functions::getEndToEnd(getBody())); }