Base protocol codec for comm::Engine. Supported retransmissions

[anna.git] / source / diameter / codec / Message.cpp

diff --git a/source/diameter/codec/Message.cpp b/source/diameter/codec/Message.cpp
index 51a5218..b9c4fbd 100644 (file)
--- a/source/diameter/codec/Message.cpp
+++ b/source/diameter/codec/Message.cpp
@@ -56,7 +56,7 @@ const U8 Message::TBitMask(0x10);
 //------------------------------------------------------------------------------
 //----------------------------------------------------------- Message::Message()
 //------------------------------------------------------------------------------
-Message::Message() : a_forCode(true) {
+Message::Message(Engine *engine) : a_engine(engine), a_forCode(true) {
   initialize();
 }
 
@@ -64,7 +64,7 @@ Message::Message() : a_forCode(true) {
 //------------------------------------------------------------------------------
 //----------------------------------------------------------- Message::Message()
 //------------------------------------------------------------------------------
-Message::Message(CommandId id) : a_forCode(true) {
+Message::Message(CommandId id, Engine *engine) : a_engine(engine), a_forCode(true) {
   initialize();
   setId(id);
 }
@@ -205,7 +205,7 @@ void Message::setId(const char *name) throw(anna::RuntimeException) {
 //------------------------------------------------------------------------------
 //-------------------------------------------------- Message::setApplicationId()
 //------------------------------------------------------------------------------
-void Message::setApplicationId(U32 aid) throw() {
+void Message::setApplicationId(U32 aid) throw(anna::RuntimeException) {
   a_applicationId = aid;
 
   // Default behaviour:
@@ -366,7 +366,7 @@ void Message::decode(const anna::DataBlock &db, Message *ptrAnswer) throw(anna::
 
   while(avpPos < dataBytes) {
     try {
-      avp =  getEngine()->allocateAvp();
+      avp =  getEngine()->createAvp(NULL);
       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, parent, answer);
     } catch(anna::RuntimeException &ex) {
@@ -891,7 +891,7 @@ void Message::fromXML(const anna::xml::Node* messageNode) throw(anna::RuntimeExc
     }
 
     try {
-      avp =  getEngine()->allocateAvp();
+      avp =  getEngine()->createAvp(NULL);
       avp -> fromXML(*it);
     } catch(anna::RuntimeException &ex) {
       getEngine()->releaseAvp(avp);