X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fdiameter%2Fstack%2FAvpRule.hpp;h=ead1dc66097e00a234fc818ad3470c443863f903;hb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4;hp=1eab17eb19530975814fdb6159f9fcd714f79b69;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/include/anna/diameter/stack/AvpRule.hpp b/include/anna/diameter/stack/AvpRule.hpp
index 1eab17e..ead1dc6 100644
--- a/include/anna/diameter/stack/AvpRule.hpp
+++ b/include/anna/diameter/stack/AvpRule.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_stack_AvpRule_hpp
@@ -103,13 +75,12 @@ public:
 private:
 
   const Dictionary *a_dictionary;
-  std::string a_avpName; // reference
+  AvpId a_avpId; // reference
   Presence::_v a_presence;
   std::string a_qual;
 
   void _initialize(const Dictionary *d) throw() {
     a_dictionary = d;
-    a_avpName = "";
     a_presence = Presence::None;
     a_qual = "";
   }
@@ -122,12 +93,12 @@ public:
 
 
   // get
-  const std::string & getAvpName(void) const throw() { return a_avpName; }
+  std::string getAvpName(void) const throw();
   const Presence::_v & getPresence(void) const throw() { return a_presence; }
   const std::string & getQual(void) const throw() { return a_qual; }
 
   // helpers
-  AvpId getId(void) const throw();
+  AvpId getId(void) const throw() { return a_avpId; }
   bool isAny(void) const throw(); // generic Avp
   bool isFixed(void) const throw() { return (a_presence == Presence::Fixed); }
   bool isMandatory(void) const throw() { return (a_presence == Presence::Mandatory); }
@@ -142,7 +113,7 @@ public:
 
   // set
   void initialize(const Dictionary *d = NULL) throw() { _initialize(d); }
-  void setAvpName(const std::string & an) throw() { a_avpName = an; }
+  void setAvpId(const AvpId & ai) throw() { a_avpId = ai; }
   void setPresence(const Presence::_v & p) throw() { a_presence = p; }
   void setQual(const std::string & q) throw(anna::RuntimeException);
 };