Remove global variables. Factory for comm/codec messages in application class (Launcher)

[anna.git] / example / diameter / launcher / MyDiameterEntity.cpp

diff --git a/example/diameter/launcher/MyDiameterEntity.cpp b/example/diameter/launcher/MyDiameterEntity.cpp
index c69290d..0535160 100644 (file)
--- a/example/diameter/launcher/MyDiameterEntity.cpp
+++ b/example/diameter/launcher/MyDiameterEntity.cpp
@@ -16,11 +16,6 @@
 #include "MyDiameterEntity.hpp"
 #include "Launcher.hpp"
 
-// Auxiliary message for sendings
-extern anna::diameter::comm::Message G_commMsgSent2e, G_commMsgFwd2c;
-extern anna::diameter::codec::Message G_codecMsg, G_codecAnsMsg;
-extern anna::Recycler<anna::diameter::comm::Message> G_commMessages; // create on requests forwards without programmed answer / release in answers forward
-
 
 void MyDiameterEntity::eventRequest(anna::diameter::comm::ClientSession *clientSession, const anna::DataBlock &message)
 throw(anna::RuntimeException) {
@@ -52,8 +47,10 @@ throw(anna::RuntimeException) {
     my_app.getCommunicator()->prepareAnswer(answer_message, message);
 
     try {
-      G_commMsgSent2e.setBody(answer_message->code());
-      /* response = NULL =*/clientSession->send(&G_commMsgSent2e);
+      anna::diameter::comm::Message *msg = my_app.createCommMessage();
+      msg->setBody(answer_message->code());
+      /* response = NULL =*/clientSession->send(msg);
+      my_app.releaseCommMessage(msg);
 
       if(my_app.logEnabled()) my_app.writeLogFile(*answer_message, "sent2e", clientSession->asString());
     } catch(anna::RuntimeException &ex) {
@@ -80,7 +77,7 @@ throw(anna::RuntimeException) {
 
   if(localServer && (cid != anna::diameter::helpers::base::COMMANDID__Capabilities_Exchange_Request) /* don't forward CER */) {
     try {
-      anna::diameter::comm::Message *msg = G_commMessages.create();
+      anna::diameter::comm::Message *msg = my_app.createCommMessage();
       msg->updateEndToEnd(false); // end-to-end will be kept
       msg->setBody(message);
       msg->setRequestClientSessionKey(clientSession->getKey());
@@ -149,12 +146,9 @@ throw(anna::RuntimeException) {
       anna::Logger::debug(msg, ANNA_FILE_LOCATION);
     );
     // Write reception
-    bool alreadyDecodedOnG_codecMsg = false;
-
     if(request_cid != anna::diameter::helpers::base::COMMANDID__Capabilities_Exchange_Request) {  // don't trace CEA
       if(my_app.logEnabled()) {
         my_app.writeLogFile(*message, "recvfe", clientSession->asString());
-        alreadyDecodedOnG_codecMsg = true;
       }
     }
 
@@ -163,19 +157,19 @@ throw(anna::RuntimeException) {
 
     if(localServer && (request_cid != anna::diameter::helpers::base::COMMANDID__Capabilities_Exchange_Request) /* don't forward CEA */) {
       try {
-        G_commMsgFwd2c.updateEndToEnd(false); // end-to-end will be kept
-        G_commMsgFwd2c.setBody(*message);
-        bool success = localServer->send(&G_commMsgFwd2c, request->getRequestServerSessionKey());
-        G_commMessages.release(request);
+        anna::diameter::comm::Message *msg = my_app.createCommMessage();
+        msg->updateEndToEnd(false); // end-to-end will be kept
+        msg->setBody(*message);
+        bool success = localServer->send(msg, request->getRequestServerSessionKey());
+        my_app.releaseCommMessage(msg);
+        my_app.releaseCommMessage(request);
+
         // Detailed log:
         anna::diameter::comm::ServerSession *usedServerSession = my_app.getMyDiameterEngine()->findServerSession(request->getRequestServerSessionKey());
         std::string detail = usedServerSession ? usedServerSession->asString() : "<null server session>"; // esto no deberia ocurrir
 
         if(my_app.logEnabled()) {
-          if(alreadyDecodedOnG_codecMsg)
-            my_app.writeLogFile(G_codecMsg, (success ? "fwd2c" : "fwd2cError"), detail);
-          else
-            my_app.writeLogFile(*message, (success ? "fwd2c" : "fwd2cError"), detail);
+          my_app.writeLogFile(*message, (success ? "fwd2c" : "fwd2cError"), detail);
         }
       } catch(anna::RuntimeException &ex) {
         ex.trace();