Hard refactoring. CodecEngine is associated to a unique stack.

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

diff --git a/example/diameter/launcher/MyLocalServer.cpp b/example/diameter/launcher/MyLocalServer.cpp
index 8127d84..110efdc 100644 (file)
--- a/example/diameter/launcher/MyLocalServer.cpp
+++ b/example/diameter/launcher/MyLocalServer.cpp
@@ -30,9 +30,7 @@ throw(anna::RuntimeException) {
   // Performance stats:
   Launcher& my_app = static_cast <Launcher&>(anna::app::functions::getApp());
   RealmNode * my_node = my_app.getRealmNode(getEngine()->getRealm());
-
-  // Testing:
-  TestManager::instantiate().receiveMessage(message, serverSession);
+  anna::diameter::codec::Engine *codecEngine = my_node->getCodecEngine();
 
   // CommandId:
   anna::diameter::CommandId cid = anna::diameter::codec::functions::getCommandId(message);
@@ -71,14 +69,18 @@ throw(anna::RuntimeException) {
       my_node->writeLogFile(message, (success ? "fwd2e" : "fwd2eError"), detail); // forwarded
     }
 
+
+    // Testing:
+    TestManager::instantiate().receiveMessage(message, my_node, serverSession);
+
     return;
   }
 
   // Error analisys:
   bool analysisOK = true; // by default
   anna::diameter::codec::Message *answer_message = NULL;
-  anna::diameter::codec::Message codecMsg(a_codecEngine);
-  anna::diameter::codec::Message codecAnsMsg(a_codecEngine);
+  anna::diameter::codec::Message codecMsg;
+  anna::diameter::codec::Message codecAnsMsg;
 
   CommandLine& cl(anna::CommandLine::instantiate());
   if(!cl.exists("ignoreErrors")) {  // Error analysis
@@ -98,13 +100,19 @@ throw(anna::RuntimeException) {
       answer_message = programmed_answer;
       // Prepare answer:
       my_app.getCommunicator()->prepareAnswer(answer_message, message);
-    } else return; // nothing done
+    } else {
+
+      // Testing:
+      TestManager::instantiate().receiveMessage(message, my_node, serverSession);
+
+      return; // nothing done
+    }
   }
 
-  anna::diameter::codec::Engine::ValidationMode::_v backupVM = a_codecEngine->getValidationMode();
+  anna::diameter::codec::Engine::ValidationMode::_v backupVM = codecEngine->getValidationMode();
 
   if(!analysisOK)
-    a_codecEngine->setValidationMode(anna::diameter::codec::Engine::ValidationMode::Never);
+    codecEngine->setValidationMode(anna::diameter::codec::Engine::ValidationMode::Never);
 
   anna::diameter::comm::Message *msg;
   try {
@@ -122,10 +130,13 @@ throw(anna::RuntimeException) {
   my_node->releaseCommMessage(msg);
 
   // Restore validation mode
-  a_codecEngine->setValidationMode(backupVM);
+  codecEngine->setValidationMode(backupVM);
 
   // Pop front the reacting answer:
   if(analysisOK && programmed) a_reactingAnswers.nextMessage(code);
+
+  // Testing:
+  TestManager::instantiate().receiveMessage(message, my_node, serverSession);
 }
 
 void MyLocalServer::eventResponse(const anna::diameter::comm::Response &response)
@@ -144,9 +155,6 @@ throw(anna::RuntimeException) {
   bool isUnavailable = (result == anna::diameter::comm::Response::ResultCode::DiameterUnavailable);
   bool isOK = (result == anna::diameter::comm::Response::ResultCode::Success);
 
-  // Testing:
-  TestManager::instantiate().receiveMessage(*message, serverSession);
-
   // CommandId:
   anna::diameter::CommandId request_cid = request->getCommandId();
   LOGDEBUG
@@ -219,6 +227,9 @@ throw(anna::RuntimeException) {
       my_node->releaseCommMessage(request);
     }
   }
+
+  // Testing:
+  TestManager::instantiate().receiveMessage(*message, my_node, serverSession);
 }
 
 void MyLocalServer::eventUnknownResponse(anna::diameter::comm::ServerSession *serverSession, const anna::DataBlock &message)