X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fcodec%2Ffunctions.cpp;h=f7a0060a3d494900d29bf9c5156d3d9e0525e831;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=93ee8e393e801c115bb067419f116c5208661f29;hpb=e80e62a5cf9aacad1a9551c68c432147ef98cd29;p=anna.git

diff --git a/source/diameter/codec/functions.cpp b/source/diameter/codec/functions.cpp
index 93ee8e3..f7a0060 100644
--- a/source/diameter/codec/functions.cpp
+++ b/source/diameter/codec/functions.cpp
@@ -34,7 +34,7 @@ anna::xml::DTDMemory MessageDTDMemory(MessageDTD);
 
 
 // Parent struct helper /////////////////////////////////////////////////////////////////////////////
-void anna::diameter::codec::parent::setMessage(const anna::diameter::CommandId & mid, const char *mname) throw() {
+void anna::diameter::codec::parent::setMessage(const anna::diameter::CommandId & mid, const char *mname) {
   MessageId = mid;
   if (mname) {
     MessageName = mname;
@@ -45,7 +45,7 @@ void anna::diameter::codec::parent::setMessage(const anna::diameter::CommandId &
   }
 }
 
-void anna::diameter::codec::parent::addAvp(const anna::diameter::AvpId & aid, const char *aname) throw() {
+void anna::diameter::codec::parent::addAvp(const anna::diameter::AvpId & aid, const char *aname) {
   AvpsId.push_back(aid);
   std::string name;
   if (aname) {
@@ -58,7 +58,7 @@ void anna::diameter::codec::parent::addAvp(const anna::diameter::AvpId & aid, co
   AvpsName.push_back(name);
 }
 
-std::string anna::diameter::codec::parent::asString() const throw() { // "<command><avp 1>-><avp 2>->...-><avp N>"
+std::string anna::diameter::codec::parent::asString() const { // "<command><avp 1>-><avp 2>->...-><avp N>"
   std::string result = MessageName;
   for (std::vector<std::string>::const_iterator it = AvpsName.begin(); it != AvpsName.end(); it++) {
     result += "->";
@@ -71,7 +71,7 @@ std::string anna::diameter::codec::parent::asString() const throw() { // "<comma
 
 
 // getters
-anna::diameter::CommandId anna::diameter::codec::functions::getCommandId(const anna::DataBlock & db) throw(anna::RuntimeException) {
+anna::diameter::CommandId anna::diameter::codec::functions::getCommandId(const anna::DataBlock & db) noexcept(false) {
   if(db.getSize() < Message::HeaderLength)
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
 
@@ -84,35 +84,35 @@ anna::diameter::CommandId anna::diameter::codec::functions::getCommandId(const a
   return (anna::diameter::CommandId(code, (flags & Message::RBitMask) != 0x00));
 }
 
-bool anna::diameter::codec::functions::requestBit(const anna::DataBlock & db) throw(anna::RuntimeException) {
+bool anna::diameter::codec::functions::requestBit(const anna::DataBlock & db) noexcept(false) {
   if(db.getSize() < Message::HeaderLength)
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
 
   return (((db.getData())[4] & Message::RBitMask) != 0x00);
 }
 
-bool anna::diameter::codec::functions::proxiableBit(const anna::DataBlock & db) throw(anna::RuntimeException) {
+bool anna::diameter::codec::functions::proxiableBit(const anna::DataBlock & db) noexcept(false) {
   if(db.getSize() < Message::HeaderLength)
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
 
   return (((db.getData())[4] & Message::PBitMask) != 0x00);
 }
 
-bool anna::diameter::codec::functions::errorBit(const anna::DataBlock & db) throw(anna::RuntimeException) {
+bool anna::diameter::codec::functions::errorBit(const anna::DataBlock & db) noexcept(false) {
   if(db.getSize() < Message::HeaderLength)
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
 
   return (((db.getData())[4] & Message::EBitMask) != 0x00);
 }
 
-bool anna::diameter::codec::functions::potentiallyReTransmittedMessageBit(const anna::DataBlock & db) throw(anna::RuntimeException) {
+bool anna::diameter::codec::functions::potentiallyReTransmittedMessageBit(const anna::DataBlock & db) noexcept(false) {
   if(db.getSize() < Message::HeaderLength)
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
 
   return (((db.getData())[4] & Message::TBitMask) != 0x00);
 }
 
-anna::diameter::ApplicationId anna::diameter::codec::functions::getApplicationId(const anna::DataBlock & db) throw(anna::RuntimeException) {
+anna::diameter::ApplicationId anna::diameter::codec::functions::getApplicationId(const anna::DataBlock & db) noexcept(false) {
   if(db.getSize() < Message::HeaderLength)
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
 
@@ -125,7 +125,7 @@ anna::diameter::ApplicationId anna::diameter::codec::functions::getApplicationId
   return result;
 }
 
-anna::diameter::HopByHop anna::diameter::codec::functions::getHopByHop(const anna::DataBlock & db) throw(anna::RuntimeException) {
+anna::diameter::HopByHop anna::diameter::codec::functions::getHopByHop(const anna::DataBlock & db) noexcept(false) {
   if(db.getSize() < Message::HeaderLength)
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
 
@@ -138,7 +138,7 @@ anna::diameter::HopByHop anna::diameter::codec::functions::getHopByHop(const ann
   return result;
 }
 
-anna::diameter::EndToEnd anna::diameter::codec::functions::getEndToEnd(const anna::DataBlock & db) throw(anna::RuntimeException) {
+anna::diameter::EndToEnd anna::diameter::codec::functions::getEndToEnd(const anna::DataBlock & db) noexcept(false) {
   if(db.getSize() < Message::HeaderLength)
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
 
@@ -151,7 +151,7 @@ anna::diameter::EndToEnd anna::diameter::codec::functions::getEndToEnd(const ann
   return result;
 }
 
-void anna::diameter::codec::functions::decodeCommandHeader(const char *start, char & version, U24 & length, char & flags, diameter::CommandId & id, int & appId, int & hbh, int & ete) throw(anna::RuntimeException) {
+void anna::diameter::codec::functions::decodeCommandHeader(const char *start, char & version, U24 & length, char & flags, diameter::CommandId & id, int & appId, int & hbh, int & ete) noexcept(false) {
   if(start == NULL)
     throw anna::RuntimeException("NULL provided start pointer", ANNA_FILE_LOCATION);
 
@@ -185,7 +185,7 @@ void anna::diameter::codec::functions::decodeCommandHeader(const char *start, ch
   ete = DECODE4BYTES_INDX_VALUETYPE(start, 16, U32);
 }
 
-void anna::diameter::codec::functions::decodeAVP(const char *start, diameter::AvpId & id, char & flags, int & length, std::string & data) throw(anna::RuntimeException) {
+void anna::diameter::codec::functions::decodeAVP(const char *start, diameter::AvpId & id, char & flags, int & length, std::string & data) noexcept(false) {
   if(start == NULL)
     throw anna::RuntimeException("NULL provided start pointer", ANNA_FILE_LOCATION);
 
@@ -218,7 +218,7 @@ void anna::diameter::codec::functions::decodeAVP(const char *start, diameter::Av
   );
 }
 
-const char * anna::diameter::codec::functions::nextAVP(const char *avpsDB, int avpsLen, const char *start) throw(anna::RuntimeException) {
+const char * anna::diameter::codec::functions::nextAVP(const char *avpsDB, int avpsLen, const char *start) noexcept(false) {
   if(start == NULL)
     throw anna::RuntimeException("NULL provided start pointer", ANNA_FILE_LOCATION);
   if(avpsDB == NULL)
@@ -242,11 +242,11 @@ const char * anna::diameter::codec::functions::nextAVP(const char *avpsDB, int a
   return result;
 }
 
-//const char * functions::nextAVP(const anna::DataBlock & avpsDB, const char *start) throw(anna::RuntimeException) {
+//const char * functions::nextAVP(const anna::DataBlock & avpsDB, const char *start) noexcept(false) {
 //  return nextAVP(avpsDB.getData(), avpsDB.getSize(), start);
 //}
 
-const char * anna::diameter::codec::functions::findAVP(const char *avpsDB, int avpsLen, const diameter::AvpId & id, int n) throw(anna::RuntimeException) {
+const char * anna::diameter::codec::functions::findAVP(const char *avpsDB, int avpsLen, const diameter::AvpId & id, int n) noexcept(false) {
   const char *result = avpsDB; // first avp
   int positives = 0;
   // Decoded avp information:
@@ -279,12 +279,12 @@ const char * anna::diameter::codec::functions::findAVP(const char *avpsDB, int a
   return result;
 }
 
-//const char * functions::findAVP(const anna::DataBlock & avpsDB, const diameter::AvpId & id, int n) throw(anna::RuntimeException) {
+//const char * functions::findAVP(const anna::DataBlock & avpsDB, const diameter::AvpId & id, int n) noexcept(false) {
 //  return findAVP(avpsDB.getData(), avpsDB.getSize(), id, n);
 //}
 
 // modifiers
-void anna::diameter::codec::functions::setHopByHop(anna::DataBlock & db, diameter::HopByHop hbh) throw(anna::RuntimeException) {
+void anna::diameter::codec::functions::setHopByHop(anna::DataBlock & db, diameter::HopByHop hbh) noexcept(false) {
   if(db.getSize() < Message::HeaderLength) {
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
   }
@@ -298,7 +298,7 @@ void anna::diameter::codec::functions::setHopByHop(anna::DataBlock & db, diamete
 }
 
 
-void anna::diameter::codec::functions::setEndToEnd(anna::DataBlock & db, diameter::EndToEnd ete) throw(anna::RuntimeException) {
+void anna::diameter::codec::functions::setEndToEnd(anna::DataBlock & db, diameter::EndToEnd ete) noexcept(false) {
   if(db.getSize() < Message::HeaderLength) {
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
   }
@@ -311,7 +311,7 @@ void anna::diameter::codec::functions::setEndToEnd(anna::DataBlock & db, diamete
   memcpy((char *)(db.getData() + 16), source, 4);
 }
 
-void anna::diameter::codec::functions::setPotentiallyReTransmittedMessageBit(const anna::DataBlock & db, bool activate) throw(anna::RuntimeException) {
+void anna::diameter::codec::functions::setPotentiallyReTransmittedMessageBit(const anna::DataBlock & db, bool activate) noexcept(false) {
   if(db.getSize() < Message::HeaderLength) {
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
   }
@@ -323,7 +323,7 @@ void anna::diameter::codec::functions::setPotentiallyReTransmittedMessageBit(con
 }
 
 // XML parsers for diameter messages ///////////////////////////////////////////////////////////////////////////
-void anna::diameter::codec::functions::messageXmlDocumentFromXmlFile(anna::xml::DocumentFile &xmlDocument, const std::string & xmlPathFile) throw(anna::RuntimeException) {
+void anna::diameter::codec::functions::messageXmlDocumentFromXmlFile(anna::xml::DocumentFile &xmlDocument, const std::string & xmlPathFile) noexcept(false) {
   LOGDEBUG(anna::Logger::debug(anna::functions::asString("Parsing diameter message from xml file '%s' into xml document", xmlPathFile.c_str()), ANNA_FILE_LOCATION));
   xmlDocument.initialize(xmlPathFile.c_str()); // fail here is i/o error
   const anna::xml::Node *rootNode = xmlDocument.parse(MessageDTDMemory); // Parsing: fail here if xml violates dtd
@@ -336,9 +336,15 @@ void anna::diameter::codec::functions::messageXmlDocumentFromXmlFile(anna::xml::
   );
 }
 
-void anna::diameter::codec::functions::messageXmlDocumentFromXmlString(anna::xml::DocumentFile &xmlDocument, const std::string &xmlString) throw(anna::RuntimeException) {
+void anna::diameter::codec::functions::messageXmlDocumentFromXmlString(anna::xml::DocumentMemory &xmlDocument, const std::string &xmlString) noexcept(false) {
   LOGDEBUG(anna::Logger::debug("Parsing diameter message from xml string representation into xml document", ANNA_FILE_LOCATION));
   xmlDocument.initialize(xmlString.c_str());
-  xmlDocument.parse(MessageDTDMemory); // Parsing: fail here if xml violates dtd
-  LOGDEBUG(anna::Logger::debug("Parsing OK from XML string representation", ANNA_FILE_LOCATION));
+  const anna::xml::Node *rootNode = xmlDocument.parse(MessageDTDMemory); // Parsing: fail here if xml violates dtd
+  LOGDEBUG(
+      std::string trace = "Parsing OK from XML string representation '";
+  trace += xmlString;
+  trace += "':\n";
+  trace += anna::xml::Compiler().apply(rootNode);
+  anna::Logger::debug(trace, ANNA_FILE_LOCATION);
+  );
 }