Changeset 93 for trunk/src

Timestamp:

12/08/08 11:53:10 (14 years ago)

Author:

andreu

Message:

ticket #32 CdS

Location:

trunk/src

Files:

• dataFlowSet.c (modified) (7 diffs)
• renetcolParam.h (modified) (4 diffs)

trunk/src/dataFlowSet.c

@@ -765 +765 @@
                   res->pktsNbOUT += agCache.pkts*myPtrs->currentRouterPtr->sampled/res->sampling;
                   /* (res->flowNbOUT)++; FIXME : FIND SOMETHING*/
+                  if (agCache.dscp>>2 == FIRST_CoS) {
+                    res->firstCoSOUT += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  } else if (agCache.dscp>>2 == SECOND_CoS) {
+                    res->secondCoSOUT += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  } else if (agCache.dscp>>2 == THIRD_CoS) {
+                    res->thirdCoSOUT += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  } else {
+                    res->fourthCoSOUT += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  }
                 }else{
                   res->bytesNbOUT += agCache.bytes;
                   res->pktsNbOUT += agCache.pkts;
-                  (res->flowNbOUT)++;             
+                  (res->flowNbOUT)++;
+                  if (agCache.dscp>>2 == FIRST_CoS) {
+                    res->firstCoSOUT += agCache.bytes;
+                  } else if (agCache.dscp>>2 == SECOND_CoS) {
+                    res->secondCoSOUT += agCache.bytes;
+                  } else if (agCache.dscp>>2 == THIRD_CoS) {
+                    res->thirdCoSOUT += agCache.bytes;
+                  } else {
+                    res->fourthCoSOUT += agCache.bytes;
+                  }
                 }
 #else
@@ -775 +793 @@
                   res->pktsNbOUT += agCache.pkts;
                   (res->flowNbOUT)++;
+                  if (agCache.dscp>>2 == FIRST_CoS) {
+                    res->firstCoSOUT += agCache.bytes;
+                  } else if (agCache.dscp>>2 == SECOND_CoS) {
+                    res->secondCoSOUT += agCache.bytes;
+                  } else if (agCache.dscp>>2 == THIRD_CoS) {
+                    res->thirdCoSOUT += agCache.bytes;
+                  } else {
+                    res->fourthCoSOUT += agCache.bytes;
+                  }
                 }
                 if (res->sampling == 0 
@@ -817 +844 @@
                     res3->pktsNbIN += agCache.pkts*myPtrs->currentRouterPtr->sampled/res3->sampling;
                     /* (res3->flowNbIN)++;  FIXME : FIND SOMETHING */
+                    if (agCache.dscp>>2 == FIRST_CoS) {
+                      res3->firstCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res3->sampling;
+                    } else if (agCache.dscp>>2 == SECOND_CoS) {
+                      res3->secondCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res3->sampling;
+                    } else if (agCache.dscp>>2 == THIRD_CoS) {
+                      res3->thirdCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res3->sampling;
+                    } else {
+                      res3->fourthCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res3->sampling;
+                    }
                   }else{
                     res3->bytesNbIN += agCache.bytes;
                     res3->pktsNbIN += agCache.pkts;
                     (res3->flowNbIN)++;
+                    if (agCache.dscp>>2 == FIRST_CoS) {
+                      res3->firstCoSIN += agCache.bytes;
+                    } else if (agCache.dscp>>2 == SECOND_CoS) {
+                      res3->secondCoSIN += agCache.bytes;
+                    } else if (agCache.dscp>>2 == THIRD_CoS) {
+                      res3->thirdCoSIN += agCache.bytes;
+                    } else {
+                      res3->fourthCoSIN += agCache.bytes;
+                    }
                   }
 #else
@@ -828 +873 @@
                     res3->pktsNbIN += agCache.pkts;
                     (res3->flowNbIN)++;
+                    if (agCache.dscp>>2 == FIRST_CoS) {
+                      res3->firstCoSIN += agCache.bytes;
+                    } else if (agCache.dscp>>2 == SECOND_CoS) {
+                      res3->secondCoSIN += agCache.bytes;
+                    } else if (agCache.dscp>>2 == THIRD_CoS) {
+                      res3->thirdCoSIN += agCache.bytes;
+                    } else {
+                      res3->fourthCoSIN += agCache.bytes;
+                    }
                   }
                   if (res3->sampling == 0 
@@ -915 +969 @@
                   res->bytesNbIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
                   res->pktsNbIN += agCache.pkts*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  if (agCache.dscp>>2 == FIRST_CoS) {
+                    res->firstCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  } else if (agCache.dscp>>2 == SECOND_CoS) {
+                    res->secondCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  } else if (agCache.dscp>>2 == THIRD_CoS) {
+                    res->thirdCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  } else {
+                    res->fourthCoSIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  }
                 }else{
                   res->bytesNbIN += agCache.bytes;
                   res->pktsNbIN += agCache.pkts;
                   (res->flowNbIN)++;
+                  if (agCache.dscp>>2 == FIRST_CoS) {
+                    res->firstCoSIN += agCache.bytes;
+                  } else if (agCache.dscp>>2 == SECOND_CoS) {
+                    res->secondCoSIN += agCache.bytes;
+                  } else if (agCache.dscp>>2 == THIRD_CoS) {
+                    res->thirdCoSIN += agCache.bytes;
+                  } else {
+                    res->fourthCoSIN += agCache.bytes;
+                  }
                 }
 #else
@@ -926 +998 @@
                   res->pktsNbIN += agCache.pkts;
                   (res->flowNbIN)++;
+                  if (agCache.dscp>>2 == FIRST_CoS) {
+                    res->firstCoSIN += agCache.bytes;
+                  } else if (agCache.dscp>>2 == SECOND_CoS) {
+                    res->secondCoSIN += agCache.bytes;
+                  } else if (agCache.dscp>>2 == THIRD_CoS) {
+                    res->thirdCoSIN += agCache.bytes;
+                  } else {
+                    res->fourthCoSIN += agCache.bytes;
+                  }
                 }
 #endif
@@ -937 +1018 @@
                   res->pktsNbIN += agCache.pkts;
                   (res->flowNbIN)++;
+                  if (agCache.dscp>>2 == FIRST_CoS) {
+                    res->firstCoSIN += agCache.bytes;
+                  } else if (agCache.dscp>>2 == SECOND_CoS) {
+                    res->secondCoSIN += agCache.bytes;
+                  } else if (agCache.dscp>>2 == THIRD_CoS) {
+                    res->thirdCoSIN += agCache.bytes;
+                  } else {
+                    res->fourthCoSIN += agCache.bytes;
+                  }
                 }
               }

trunk/src/renetcolParam.h

@@ -38 +38 @@
 #define RECEPTION_PORT 1111
 /* 
- * routers index max + 1 
+ * routers index max + 1 (index of the beginning of the lines, and not number of routers)
  */
 #define ROUTER_INDEX_MAX 55
@@ -44 +44 @@
  * FILE with your routers IP address 
 */ 
-#define ROUTERS_LIST "<path to renetcol>/renetcol-0.0.12beta/conf/routers.txt"
+#define ROUTERS_LIST "<path to renetcol>/renetcol-0.0.14beta/conf/routers.txt"
 /* 
  * FILE with your prefix/subnet 
  */
-#define SUBNETS_LIST "<path to renetcol>/renetcol-0.0.12beta/conf/IPv4_Subnet_Aggregation_based_on_SNMP_index.txt"
+#define SUBNETS_LIST "<path to renetcol>/renetcol-0.0.14beta/conf/IPv4_Subnet_Aggregation_based_on_SNMP_index.txt"
 /* 
  * FILE with the list of AS with accounting
  */
-#define AS_LIST "<path to renetcol>/renetcol-0.0.12beta/conf/AS.txt"
+#define AS_LIST "<path to renetcol>/renetcol-0.0.14beta/conf/AS.txt"
 /* 
  * constants, here a subnet is include in a prefix 
@@ -62 +62 @@
  * FILE for the rules 
  */
-#define RULES_FILE "<path to renetcol>/renetcol-0.0.12beta/conf/rules.txt"
+#define RULES_FILE "<path to renetcol>/renetcol-0.0.14beta/conf/rules.txt"
 /* 
  * FILE with SNMP index of the interfaces
  * tagged "C"ustomers or "B"ackbone 
  */
-#define INTERFACES_TYPE_LIST "<path to renetcol>/renetcol-0.0.12beta/conf/SNMP_INDEX.txt"
+#define INTERFACES_TYPE_LIST "<path to renetcol>/renetcol-0.0.14beta/conf/SNMP_INDEX.txt"
 /* 
  * maximum SNMP index 
@@ -79 +79 @@
 #define AS_RRD_LOCATION "/mnt/data/RRD/RENATER/AS/"
 
+/*
+ * Your CoS - DSCP field in decimal notation, EF PHB 101110 (46) == ToS 10111000 (184)
+ */
+#define FIRST_CoS 46  /* EF, Premium - dec 46, bin 101110 - ToS 10111000 */
+#define SECOND_CoS 34 /* AF41, Best than BE - dec 34, bin 100010 - ToS 10001000*/
+#define THIRD_CoS 8   /* CS1, Less than BE - dec 8, bin 001000 - 00100000 */
+#define FOURTH_CoS 0  /* Best Effort or All flows if not in the 3 others class */
+
 /****************************************************************
  * the following parameters CAN be changed but it's NOT REQUIRED
  ***************************************************************/
 #define STEP 5
-#define FIELD_TYPE_NUMBER 89
+#define FIELD_TYPE_NUMBER 216
 #define MAX_RULES_PER_FIELD 10
 #define SHMSIZE 33554432