X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Ftme%2Fmain.cpp;h=fdfe996bbbbdaf8e9aebe15bf2e968ddb517c09c;hb=d0be3fbcfb2bc0eb27d7c3d0b630ab657ff8f222;hp=2994e5ff7a8b7692681b7df3a16ee0ceb0b6d142;hpb=17d687f1070485b0b4d7038b7104cb3ab0f45349;p=anna.git

diff --git a/example/diameter/tme/main.cpp b/example/diameter/tme/main.cpp
index 2994e5f..fdfe996 100644
--- a/example/diameter/tme/main.cpp
+++ b/example/diameter/tme/main.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// http://redmine.teslayout.com/projects/anna-suite
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     *  Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 // Standard
@@ -47,7 +19,7 @@
 #include <anna/time/functions.hpp>
 #include <anna/time/Date.hpp>
 
-#include <anna/diameter/codec/tme/Engine.hpp>
+#include <anna/diameter/codec/Engine.hpp>
 #include <anna/diameter/codec/tme/Message.hpp>
 
 
@@ -85,7 +57,6 @@ int main(int argc, char** argv) {
   anna::time::functions::setControlPoint(); // start control point (application lifetime)
   anna::diameter::stack::Engine & stackEngine = anna::diameter::stack::Engine::instantiate();
   anna::diameter::stack::Dictionary *dictionary;
-  anna::diameter::codec::tme::Engine *codecEngine = new anna::diameter::codec::tme::Engine();
   std::string exec = argv[0];
   std::string param = argv[1] ? argv[1] : "";
 
@@ -121,18 +92,18 @@ int main(int argc, char** argv) {
     dictionary->load(param + "/avps_tgpp.xml");
     dictionary->load(param + "/avps_tme.xml");
     dictionary->load(param + "/commands_dccaOCS-CS_HuaweiNGIN_de-es.xml");
-    codecEngine->setDictionary(dictionary);
     // Trace:
     LOGINFORMATION(Logger::information(stackEngine.asString(), ANNA_FILE_LOCATION));
     LOGDEBUG(Logger::debug(dictionary->asString(), ANNA_FILE_LOCATION));
-    LOGDEBUG(Logger::debug(codecEngine->asString(), ANNA_FILE_LOCATION));
   } catch(anna::RuntimeException &ex) {
     ex.trace();
     std::cout << ex.getText() << std::endl;
   }
 
   // Build CCA
-  tmeMessage cca;
+  anna::diameter::codec::Engine *codecEngine = new anna::diameter::codec::Engine("TME Engine", dictionary);
+  LOGDEBUG(Logger::debug(codecEngine->asString(), ANNA_FILE_LOCATION));
+  tmeMessage cca(codecEngine);
   cca.setId("Credit-Control-Answer");
   tmeAvp *sid = (tmeAvp*)cca.addAvp("Session-Id");
   tmeAvp *ohst = (tmeAvp*)cca.addAvp("Origin-Host");