X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fcodec%2FEngineImpl.cpp;h=c25bec02f3e958adaa55d5611343be67f1b3e0cd;hb=431d322261ecfd6ef354abb392edbf8987e2407a;hp=44047fb1c33940d41b29fbc48f7f89dac09061fa;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git

diff --git a/source/diameter/codec/EngineImpl.cpp b/source/diameter/codec/EngineImpl.cpp
index 44047fb..c25bec0 100644
--- a/source/diameter/codec/EngineImpl.cpp
+++ b/source/diameter/codec/EngineImpl.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// 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 Google Inc. 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 //
 
 
 // Local
@@ -144,8 +116,10 @@ EngineImpl::EngineImpl(const char* className) :
   a_dictionary(NULL),
   a_validationDepth(ValidationDepth::FirstError),
   a_validationMode(ValidationMode::AfterDecoding),
+  a_singleFailedAVP(true),
   a_ignoreFlags(false),
-  a_fixMode(FixMode::BeforeCoding) {
+  a_selectStackWithApplicationId(false),
+  a_fixMode(FixMode::BeforeEncoding) {
   anna::diameter::sccs::activate();
   anna::xml::functions::initialize();
   a_dtd.initialize(MessageDTD);
@@ -155,7 +129,7 @@ EngineImpl::EngineImpl(const char* className) :
 //------------------------------------------------------------------------------
 //-------------------------------------------------- EngineImpl::setDictionary()
 //------------------------------------------------------------------------------
-const anna::diameter::stack::Dictionary *EngineImpl::setDictionary(int stackId) throw() {
+const anna::diameter::stack::Dictionary *EngineImpl::setDictionary(unsigned int stackId) throw() {
   a_dictionary = (stack::Engine::instantiate()).getDictionary(stackId);
   return a_dictionary;
 }
@@ -171,6 +145,9 @@ Avp* EngineImpl::createAvp(const AvpId *id) throw(anna::RuntimeException) {
   if((result = allocateAvp()) == NULL)
     throw anna::RuntimeException("diameter::codec::EngineImpl::allocateAvp returns NULL", ANNA_FILE_LOCATION);
 
+  // Sets engine
+  result->setEngine((Engine*)this);
+
   //result->clear(); better clear this at releaseAvp(), see class-help implementation example
   if(id) result->setId(*id);
 
@@ -188,6 +165,9 @@ Message* EngineImpl::createMessage(const CommandId *id) throw(anna::RuntimeExcep
   if((result = allocateMessage()) == NULL)
     throw anna::RuntimeException("diameter::codec::EngineImpl::allocateMessage returns NULL", ANNA_FILE_LOCATION);
 
+  // Sets engine
+  result->setEngine((Engine*)this);
+
   //result->clear(); better clear this at releaseMessage(), see class-help implementation example
   if(id) result->setId(*id);
 
@@ -212,6 +192,8 @@ std::string EngineImpl::asString(void) const throw() {
   result += asText(a_validationDepth);
   result += "\nValidationMode: ";
   result += asText(a_validationMode);
+  result += "\nSingle Failed-AVP: ";
+  result += a_singleFailedAVP ? "yes" : "no";
   result += "\nIgnore flags: ";
   result += a_ignoreFlags ? "yes" : "no";
   result += "\nFixMode: ";
@@ -230,6 +212,7 @@ throw() {
   anna::xml::Node* result = parent->createChild("diameter.codec.EngineImpl");
   result->createAttribute("ValidationDepth", asText(a_validationDepth));
   result->createAttribute("ValidationMode", asText(a_validationMode));
+  result->createAttribute("SingleFailedAVP", a_singleFailedAVP ? "yes" : "no");
   result->createAttribute("IgnoreFlags", a_ignoreFlags ? "yes" : "no");
   result->createAttribute("FixMode", asText(a_fixMode));
   anna::xml::Node* dictionary = result->createChild("EngineImpl.ActivatedDictionary");
@@ -253,7 +236,7 @@ throw() {
 //------------------------------------------------------------------------------
 const char* EngineImpl::asText(const ValidationMode::_v vm)
 throw() {
-  static const char* text [] = { "BeforeCoding", "AfterDecoding", "Always", "Never" };
+  static const char* text [] = { "BeforeEncoding", "AfterDecoding", "Always", "Never" };
   return text [vm];
 }
 
@@ -262,7 +245,7 @@ throw() {
 //------------------------------------------------------------------------------
 const char* EngineImpl::asText(const FixMode::_v fm)
 throw() {
-  static const char* text [] = { "BeforeCoding", "AfterDecoding", "Always", "Never" };
+  static const char* text [] = { "BeforeEncoding", "AfterDecoding", "Always", "Never" };
   return text [fm];
 }