X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fcodec%2Ffunctions.cpp;h=3e8ce1fa5ca5c4722de671f823ace0a09ddf1599;hb=93366a0bda79e6fd6e7dad6316bfcf8cc82f5731;hp=88749a07017e54cf282bdcb7aacceca923fe6e66;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git

diff --git a/source/diameter/codec/functions.cpp b/source/diameter/codec/functions.cpp
index 88749a0..3e8ce1f 100644
--- a/source/diameter/codec/functions.cpp
+++ b/source/diameter/codec/functions.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 //
 
 
 // Local
@@ -53,6 +25,47 @@
 using namespace anna::diameter::codec;
 
 
+
+
+// Parent struct helper /////////////////////////////////////////////////////////////////////////////
+void parent::setMessage(const anna::diameter::CommandId & mid, const char *mname) throw() {
+  MessageId = mid;
+  if (mname) {
+    MessageName = mname;
+  }
+  else {
+	MessageName = "Message";
+    MessageName += anna::diameter::functions::commandIdAsPairString(mid);
+  }
+}
+
+void parent::addAvp(const anna::diameter::AvpId & aid, const char *aname) throw() {
+  AvpsId.push_back(aid);
+  std::string name;
+  if (aname) {
+	name = aname;
+  }
+  else {
+    name = "Avp";
+	name += anna::diameter::functions::avpIdAsPairString(aid);
+  }
+  AvpsName.push_back(name);
+}
+
+std::string parent::asString() const throw() { // "<command><avp 1>-><avp 2>->...-><avp N>"
+  std::string result = MessageName;
+  for (std::vector<std::string>::const_iterator it = AvpsName.begin(); it != AvpsName.end(); it++) {
+	result += "->";
+	result += (*it);
+  }
+
+  return result;
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+
+
 // getters
 anna::diameter::CommandId functions::getCommandId(const anna::DataBlock & db) throw(anna::RuntimeException) {
   if(db.getSize() < Message::HeaderLength)