Changeset 83 for trunk/src/dataFlowSet.c

Timestamp:

11/06/08 16:37:23 (14 years ago)

Author:

andreu

Message:

release tag 0.0.13beta ; beginning of multisampling implementation

Files:

• trunk/src/dataFlowSet.c (modified) (4 diffs)

trunk/src/dataFlowSet.c

@@ -672 +672 @@
               if ( myPtrs->currentRouterPtr->snmpIndexList[agCache.inputSnmp] == 1  ) {       
 #endif
+
+                /* OUT ("traffic from the prefix/subnet")  */
+#if defined(MULTISAMPLING)
+                if (myPtrs->currentRouterPtr->sampled != res->sampling ){
+                  res->bytesNbOUT += agCache.bytes*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  res->pktsNbOUT += agCache.pkts*myPtrs->currentRouterPtr->sampled/res->sampling;
+                  /* (res->flowNbOUT)++; FIXME : FIND SOMETHING*/
+                }else{
+                  res->bytesNbOUT += agCache.bytes;
+                  res->pktsNbOUT += agCache.pkts;
+                  (res->flowNbOUT)++;             
+                }
+#else
                 if (myPtrs->currentRouterPtr->sampled != 0 ){
-                  /* OUT ("traffic from the prefix/subnet")  */
                   res->bytesNbOUT += agCache.bytes;
                   res->pktsNbOUT += agCache.pkts;
@@ -682 +694 @@
                   res->sampling = myPtrs->currentRouterPtr->sampled;
                 }
+#endif
 #if defined(IPV4AGGIDSNMP)
                 prefixKey.beginning = agCache.v4AdD>>(32-agCache.maskD)<<(32-agCache.maskD);
@@ -697 +710 @@
                     }
                   }
+#if defined(MULTISAMPLING)
+                  if (myPtrs->currentRouterPtr->sampled != res3->sampling ){
+                    res3->bytesNbIN += agCache.bytes*myPtrs->currentRouterPtr->sampled/res3->sampling;
+                    res3->pktsNbIN += agCache.pkts*myPtrs->currentRouterPtr->sampled/res3->sampling;
+                    /* (res3->flowNbIN)++;  FIXME : FIND SOMETHING */
+                  }else{
+                    res3->bytesNbIN += agCache.bytes;
+                    res3->pktsNbIN += agCache.pkts;
+                    (res3->flowNbIN)++;
+                  }
+#else
                   if (myPtrs->currentRouterPtr->sampled != 0 ){
                     /* IN ("traffic to the prefix/subnet")  */
@@ -707 +731 @@
                     res3->sampling = myPtrs->currentRouterPtr->sampled;
                   }
+#endif
                 }
 #endif