Fixes and improvs. Basic DRA feature.

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

diff --git a/source/diameter/codec/functions.cpp b/source/diameter/codec/functions.cpp
index 3e8ce1f..8c5d350 100644 (file)
--- a/source/diameter/codec/functions.cpp
+++ b/source/diameter/codec/functions.cpp
@@ -80,14 +80,34 @@ anna::diameter::CommandId functions::getCommandId(const anna::DataBlock & db) th
   return (anna::diameter::CommandId(code, (flags & Message::RBitMask) != 0x00));
 }
 
-
-bool functions::isRequest(const anna::DataBlock & db) throw(anna::RuntimeException) {
+bool functions::requestBit(const anna::DataBlock & db) throw(anna::RuntimeException) {
   if(db.getSize() < Message::HeaderLength)
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
 
   return (((db.getData())[4] & Message::RBitMask) != 0x00);
 }
 
+bool functions::proxiableBit(const anna::DataBlock & db) throw(anna::RuntimeException) {
+  if(db.getSize() < Message::HeaderLength)
+    throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
+
+  return (((db.getData())[4] & Message::PBitMask) != 0x00);
+}
+
+bool functions::errorBit(const anna::DataBlock & db) throw(anna::RuntimeException) {
+  if(db.getSize() < Message::HeaderLength)
+    throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
+
+  return (((db.getData())[4] & Message::EBitMask) != 0x00);
+}
+
+bool functions::potentiallyReTransmittedMessageBit(const anna::DataBlock & db) throw(anna::RuntimeException) {
+  if(db.getSize() < Message::HeaderLength)
+    throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
+
+  return (((db.getData())[4] & Message::TBitMask) != 0x00);
+}
+
 anna::diameter::ApplicationId functions::getApplicationId(const anna::DataBlock & db) throw(anna::RuntimeException) {
   if(db.getSize() < Message::HeaderLength)
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
@@ -194,9 +214,11 @@ void functions::decodeAVP(const char *start, diameter::AvpId & id, char & flags,
   );
 }
 
-const char * functions::nextAVP(const anna::DataBlock & avpsDB, const char *start) throw(anna::RuntimeException) {
+const char * functions::nextAVP(const char *avpsDB, int avpsLen, const char *start) throw(anna::RuntimeException) {
   if(start == NULL)
     throw anna::RuntimeException("NULL provided start pointer", ANNA_FILE_LOCATION);
+  if(avpsDB == NULL)
+    throw anna::RuntimeException("NULL provided avpsDB pointer", ANNA_FILE_LOCATION);
 
   const char *result;
 //   LOGDEBUG(
@@ -207,18 +229,21 @@ const char * functions::nextAVP(const anna::DataBlock & avpsDB, const char *star
   //int avpLength = (start[5] << 16) + (start[6] << 8) + start[7]; // AVP Length
   int avpLength = DECODE3BYTES_INDX_VALUETYPE(start, 5, int);
   result = start + 4 * REQUIRED_WORDS(avpLength);
-  const char * first = avpsDB.getData();
-  int offset = (result - first);
+  int offset = (result - avpsDB);
 
-  if(offset > (avpsDB.getSize() - 1))
-    //throw anna::RuntimeException("Start pointer out of boundaries for DataBlock", ANNA_FILE_LOCATION);
+  if(offset > (avpsLen - 1))
+    //throw anna::RuntimeException("Start pointer out of boundaries for block(avpsDB, avpsLen)", ANNA_FILE_LOCATION);
     return NULL; // (*)
 
   return result;
 }
 
-const char * functions::findAVP(const anna::DataBlock & avpsDB, const diameter::AvpId & id, int n) throw(anna::RuntimeException) {
-  const char * result = avpsDB.getData(); // first avp
+//const char * functions::nextAVP(const anna::DataBlock & avpsDB, const char *start) throw(anna::RuntimeException) {
+//  return nextAVP(avpsDB.getData(), avpsDB.getSize(), start);
+//}
+
+const char * functions::findAVP(const char *avpsDB, int avpsLen, const diameter::AvpId & id, int n) throw(anna::RuntimeException) {
+  const char *result = avpsDB; // first avp
   int positives = 0;
   // Decoded avp information:
   diameter::AvpId _id;
@@ -230,7 +255,7 @@ const char * functions::findAVP(const anna::DataBlock & avpsDB, const diameter::
   if(_id == id) positives++;
 
   while((_id != id) || (positives != n)) {  // next search if not found or not ocurrence number reached
-    result = nextAVP(avpsDB, result);
+    result = nextAVP(avpsDB, avpsLen, result);
 
     if(result == NULL) {  // (*)
       LOGDEBUG(
@@ -250,6 +275,9 @@ const char * functions::findAVP(const anna::DataBlock & avpsDB, const diameter::
   return result;
 }
 
+//const char * functions::findAVP(const anna::DataBlock & avpsDB, const diameter::AvpId & id, int n) throw(anna::RuntimeException) {
+//  return findAVP(avpsDB.getData(), avpsDB.getSize(), id, n);
+//}
 
 // modifiers
 void functions::setHopByHop(anna::DataBlock & db, diameter::HopByHop hbh) throw(anna::RuntimeException) {
@@ -257,7 +285,7 @@ void functions::setHopByHop(anna::DataBlock & db, diameter::HopByHop hbh) throw(
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
   }
 
-  static char source[4];
+  char source[4];
   source[0] = (char)(hbh >> 24);
   source[1] = (char)(hbh >> 16);
   source[2] = (char)(hbh >> 8);
@@ -271,7 +299,7 @@ void functions::setEndToEnd(anna::DataBlock & db, diameter::EndToEnd ete) throw(
     throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
   }
 
-  static char source[4];
+  char source[4];
   source[0] = (char)(ete >> 24);
   source[1] = (char)(ete >> 16);
   source[2] = (char)(ete >> 8);
@@ -279,4 +307,15 @@ void functions::setEndToEnd(anna::DataBlock & db, diameter::EndToEnd ete) throw(
   memcpy((char *)(db.getData() + 16), source, 4);
 }
 
+void functions::setPotentiallyReTransmittedMessageBit(const anna::DataBlock & db, bool activate) throw(anna::RuntimeException) {
+  if(db.getSize() < Message::HeaderLength) {
+    throw anna::RuntimeException("Not enough bytes to cover command header length", ANNA_FILE_LOCATION);
+  }
+
+  char flags[1];
+  flags[0] = *(db.getData() + 4);
+  if(activate) flags[0] |= Message::TBitMask; else flags[0] &= (~Message::TBitMask);
+  memcpy((char *)(db.getData() + 4), flags, 1);
+}
+