New Batch Converter. Fix flags problem regarding may/shouldnot uncertainty

[anna.git] / source / diameter / codec / Avp.cpp

diff --git a/source/diameter/codec/Avp.cpp b/source/diameter/codec/Avp.cpp
index 3a2c9b0..17ba005 100644 (file)
--- a/source/diameter/codec/Avp.cpp
+++ b/source/diameter/codec/Avp.cpp
@@ -1360,13 +1360,33 @@ void Avp::fromXML(const anna::xml::Node* avpNode) throw(anna::RuntimeException)
 
   // Check attributes exclusiveness
   if(name) {  // compact mode
-    if(code || flags || vendorCode) {
+    bool allowFlagsField = ( stackAvp->getVbit() == anna::diameter::stack::Avp::FlagRule::may || stackAvp->getVbit() == anna::diameter::stack::Avp::FlagRule::shouldnot
+                             || stackAvp->getMbit() == anna::diameter::stack::Avp::FlagRule::may || stackAvp->getMbit() == anna::diameter::stack::Avp::FlagRule::shouldnot
+                             /* umm, perhaps we could omit for bit P, whic is deprecated ... */
+                             /* || stackAvp->getPbit() == anna::diameter::stack::Avp::FlagRule::may || stackAvp->getPbit() == anna::diameter::stack::Avp::FlagRule::shouldnot*/ );
+    if(code || (flags && !allowFlagsField) || vendorCode) {
       std::string msg = "Error processing avp <name '"; msg += name->getValue();
-      msg += "'>: avp attributes <'code' + 'flags' + 'vendorCode'> are not allowed if <'name'> is provided";
+      if (flags) msg += "'>: avp attributes <'code' + 'flags' + 'vendorCode'> are not allowed if <'name'> is provided (also flags is not permitted: no may, no shouldnot)";
+      else msg += "'>: avp attributes <'code' + 'vendorCode'> are not allowed if <'name'> is provided";
       throw anna::RuntimeException(msg, ANNA_FILE_LOCATION);
     }
 
     setId(stackAvp->getId());
+
+    if (flags && allowFlagsField) {
+      // Flags check
+      int i_aux = flags->getIntegerValue();
+
+      if(i_aux < 0 || i_aux > 256) {
+        std::string msg = "Error processing avp <flags '"; msg += flags->getValue();
+        msg += "': out of range [0,256]";
+        throw anna::RuntimeException(msg, ANNA_FILE_LOCATION);
+      }
+
+      a_flags = i_aux;
+    }
+
+
   } else {
     if(!code || !flags || !vendorCode) {
       std::string s_code = code ? code->getValue() : "?";
@@ -1565,6 +1585,12 @@ anna::xml::Node* Avp::asXML(anna::xml::Node* parent) const throw() {
 
   if(compactMode) {
     result->createAttribute("name", stackAvp->getName());
+    // If may or shouldnot is present in AVP definition, we have to show flags to avoid uncertainty
+    if ( stackAvp->getVbit() == anna::diameter::stack::Avp::FlagRule::may || stackAvp->getVbit() == anna::diameter::stack::Avp::FlagRule::shouldnot
+         || stackAvp->getMbit() == anna::diameter::stack::Avp::FlagRule::may || stackAvp->getMbit() == anna::diameter::stack::Avp::FlagRule::shouldnot
+         /* umm, perhaps we could omit for bit P, whic is deprecated ... */
+         /* || stackAvp->getPbit() == anna::diameter::stack::Avp::FlagRule::may || stackAvp->getPbit() == anna::diameter::stack::Avp::FlagRule::shouldnot*/ )
+      result->createAttribute("flags", (int)a_flags);
   } else {
     result->createAttribute("code", a_id.first);
     result->createAttribute("vendor-code", a_id.second);