X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdiameter%2Fstack%2FAvpRule.cpp;h=5d13488950bfba04606ca04c0896749e6c27a376;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=b2c572113f046ed45c98af5c045d7faf028e1b46;hpb=39033fd99e58e994a5e98c1060dcc79e0d81f9c9;p=anna.git diff --git a/source/diameter/stack/AvpRule.cpp b/source/diameter/stack/AvpRule.cpp index b2c5721..5d13488 100644 --- a/source/diameter/stack/AvpRule.cpp +++ b/source/diameter/stack/AvpRule.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 // //------------------------------------------------------------------------------ @@ -58,7 +30,7 @@ anna_assign_enum(anna::diameter::stack::AvpRule::Presence) = { "Fixed", "Mandato //------------------------------------------------------------------------------ //----------------------------------------------------------- AvpRule::setQual() //------------------------------------------------------------------------------ -void anna::diameter::stack::AvpRule::setQual(const std::string & q) throw(anna::RuntimeException) { +void anna::diameter::stack::AvpRule::setQual(const std::string & q) noexcept(false) { const char *asterisk = strstr(q.c_str(), "*"); if((q != "") && (asterisk == NULL)) @@ -69,18 +41,18 @@ void anna::diameter::stack::AvpRule::setQual(const std::string & q) throw(anna:: //------------------------------------------------------------------------------ -//------------------------------------------------------------- AvpRule::getId() +//-------------------------------------------------------- AvpRule::getAvpName() //------------------------------------------------------------------------------ -anna::diameter::AvpId anna::diameter::stack::AvpRule::getId(void) const throw() { - const Avp * avp = a_dictionary->getAvp(a_avpName); - return avp->getId(); +std::string anna::diameter::stack::AvpRule::getAvpName(void) const { + const Avp * avp = a_dictionary->getAvp(a_avpId); + return avp->getName(); } //------------------------------------------------------------------------------ //------------------------------------------------------------- AvpRule::isAny() //------------------------------------------------------------------------------ -bool anna::diameter::stack::AvpRule::isAny(void) const throw() { - const Avp * avp = a_dictionary->getAvp(a_avpName); +bool anna::diameter::stack::AvpRule::isAny(void) const { + const Avp * avp = a_dictionary->getAvp(a_avpId); const Format * format = a_dictionary->getFormat(avp->getFormatName()); return format->isAny(); } @@ -89,7 +61,7 @@ bool anna::diameter::stack::AvpRule::isAny(void) const throw() { //------------------------------------------------------------------------------ //-------------------------------------------------------- AvpRule::getQualMin() //------------------------------------------------------------------------------ -int anna::diameter::stack::AvpRule::getQualMin(void) const throw() { +int anna::diameter::stack::AvpRule::getQualMin(void) const { if(a_qual == "") { if(isFixed() || isMandatory()) return 1; @@ -113,7 +85,7 @@ int anna::diameter::stack::AvpRule::getQualMin(void) const throw() { //------------------------------------------------------------------------------ //-------------------------------------------------------- AvpRule::getQualMax() //------------------------------------------------------------------------------ -int anna::diameter::stack::AvpRule::getQualMax(void) const throw() { +int anna::diameter::stack::AvpRule::getQualMax(void) const { if(a_qual == "") return 1; // Asterisk location @@ -132,9 +104,9 @@ int anna::diameter::stack::AvpRule::getQualMax(void) const throw() { //------------------------------------------------------------------------------ //---------------------------------------------------------- AvpRule::asString() //------------------------------------------------------------------------------ -std::string anna::diameter::stack::AvpRule::asString(bool showPair) const throw() { +std::string anna::diameter::stack::AvpRule::asString(bool showPair) const { std::string trace = "No Avp rule defined"; - const Avp * avp = a_dictionary->getAvp(a_avpName); + const Avp * avp = a_dictionary->getAvp(a_avpId); if(avp) { trace = a_qual; @@ -147,7 +119,7 @@ std::string anna::diameter::stack::AvpRule::asString(bool showPair) const throw( if(isOptional()) { s_open = "["; s_close = "]"; } trace += s_open; - trace += a_avpName; + trace += getAvpName(); // anna::diameter::functions::avpIdAsPairString(a_avpId);; trace += s_close; if(!showPair) return trace; @@ -159,7 +131,7 @@ std::string anna::diameter::stack::AvpRule::asString(bool showPair) const throw( /* max expected avp description size */ 48 - /* current trace length */ trace.size(); - for(register int k = 0; k < NumberOfDots; k++) trace += "."; + for(int k = 0; k < NumberOfDots; k++) trace += "."; trace += anna::diameter::functions::avpIdAsPairString(avp->getId()); } @@ -171,11 +143,11 @@ std::string anna::diameter::stack::AvpRule::asString(bool showPair) const throw( //------------------------------------------------------------------------------ //------------------------------------------------------------- AvpRule::asXML() //------------------------------------------------------------------------------ -anna::xml::Node* anna::diameter::stack::AvpRule::asXML(anna::xml::Node* parent) const throw() { +anna::xml::Node* anna::diameter::stack::AvpRule::asXML(anna::xml::Node* parent) const { // // anna::xml::Node* result = parent->createChild("avprule"); - result->createAttribute("id", a_avpName); + result->createAttribute("id", getAvpName()); std::string type; if(isFixed()) type = "Fixed";