X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fdiameter%2Fcodec%2Ftme%2FAvp.hpp;h=0b25df767342a9896f3b31a15acc70644d413923;hb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4;hp=e6d560403e5651032d1cc3e5ed3bd6594cb107a0;hpb=884501d2411bc4fdfafae65948262c959e068d7d;p=anna.git

diff --git a/include/anna/diameter/codec/tme/Avp.hpp b/include/anna/diameter/codec/tme/Avp.hpp
index e6d5604..0b25df7 100644
--- a/include/anna/diameter/codec/tme/Avp.hpp
+++ b/include/anna/diameter/codec/tme/Avp.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not 'N' 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 //
 
 
 #ifndef anna_diameter_codec_tme_Avp_hpp
@@ -69,11 +41,13 @@ class ISDNAddress;
 
 namespace codec {
 
+class Engine;
+
 namespace tme {
 
 class Avp;
 class Message;
-class Engine;
+//class Engine;
 
 
 using namespace helpers::tme::codectypes;
@@ -98,24 +72,27 @@ class Avp : public anna::diameter::codec::Avp {
   virtual void allocationByFormat(const anna::diameter::stack::Format *stackFormat) throw();
   virtual void clearByFormat() throw();
 
-protected:
+//protected:
 
-  /** Codec Engine getter: avoids have to create base engine when using its child */
-  virtual anna::diameter::codec::Engine * getEngine() const throw(anna::RuntimeException);
+//  /** Codec Engine getter: avoids have to create base engine when using its child */
+//  virtual anna::diameter::codec::Engine * getEngine() const throw(anna::RuntimeException);
 
 
 public:
 
   /**
   * Default constructor
+  * @param engine Codec engine used
   */
-  Avp();
+  Avp(Engine *engine = NULL) : anna::diameter::codec::Avp(engine) {;}
 
   /**
   * Identified constructor
-  * @param id Avp identifier as pair (code,vendorID).
+  * @param id Avp identifier as pair (code,vendor-id).
+  * @param engine Codec engine used
   */
-  Avp(AvpId id);
+  Avp(AvpId id, Engine *engine = NULL) : anna::diameter::codec::Avp(id, engine) {;}
+
 
   /**
   * Destructor
@@ -142,7 +119,7 @@ public:
 
 
   friend class Message;
-  friend class Engine;
+  friend class anna::diameter::codec::Engine;
 };
 
 }